From ccf8d8d148172fca33c3348ae45e06904a461dd5 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sat, 19 Mar 2022 16:43:05 +0000
Subject: [PATCH] Remove dind from tests and retag

This should make tests faster as dind not required,
retagging tests to docker so if someone forks, tests should still run
on shared runners.
---
 .gitlab-ci.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19b94a44..6d0a4212 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,10 +10,8 @@ variables:
 pylint:
   stage: test
   image: python:3.7-slim
-  services:
-    - name: docker:dind
   tags:
-    - 'docker_testers'
+    - 'docker'
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
     - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
@@ -43,7 +41,7 @@ docker-build-dev:
     - name: docker:dind
   stage: dev-deployment
   tags:
-    - docker
+    - 'docker_priv'
   rules:
     - if: $CI_COMMIT_BRANCH == 'dev'
   environment:
@@ -86,7 +84,7 @@ docker-build-prod:
     - name: docker:dind
   stage: prod-deployment
   tags:
-    - docker
+    - 'docker_priv'
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   environment: