Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devops/tester-compatibility-speed' into 'dev'

Browse Source 
Remove dind from tests and retag runners

See merge request crafty-controller/crafty-commander!218
This commit is contained in:
Iain Powrie 2022-03-19 20:00:11 +00:00
commit d234f51bab
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -10,10 +10,8 @@ variables:
pylint: pylint:
stage: test stage: test
image: python:3.7-slim image: python:3.7-slim
services:
- name: docker:dind
tags: tags:
- 'docker_testers' - 'docker'
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS' - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
@ -43,7 +41,7 @@ docker-build-dev:
- name: docker:dind - name: docker:dind
stage: dev-deployment stage: dev-deployment
tags: tags:
- docker - 'docker_priv'
rules: rules:
- if: $CI_COMMIT_BRANCH == 'dev' - if: $CI_COMMIT_BRANCH == 'dev'
environment: environment:
@ -86,7 +84,7 @@ docker-build-prod:
- name: docker:dind - name: docker:dind
stage: prod-deployment stage: prod-deployment
tags: tags:
- docker - 'docker_priv'
rules: rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
environment: environment: