Commit 0b312223 authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

Heptapod CI: getting rid of duplicate pipeline warnings

We'll actually have the flake8 job that'll keep on being
duplicated, but that's the price to pay for manual jobs
on regular pushes.

Also deduplicating the rules and preparing for future
cross project triggering.
parent 56961c493a41
Pipeline #11168 passed with stage
in 36 minutes and 49 seconds
......@@ -14,6 +14,14 @@ flake8:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- if: '$CI_PIPELINE_SOURCE == "push"'
.rules:test-heptapod:
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- if: '$CI_PIPELINE_SOURCE == "cross_project_pipeline"'
- if: '$CI_PIPELINE_SOURCE == "web"'
- if: '$CI_PIPELINE_SOURCE =~ /.*/'
when: manual
.docker-remote:
stage: test-heptapod
services:
......@@ -36,6 +44,8 @@ flake8:
docker-inside:
stage: test-heptapod
extends:
- .rules:test-heptapod
image: octobus/heptapod:$TARGET_HEPTAPOD_IMAGE
script:
- apt-get update
......@@ -53,21 +63,20 @@ docker-inside:
- log/gitlab-rails/production_json.log
- log/hgserve/mercurial.log
- log/hgserve/gunicorn.log
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- when: manual # default case
docker-remote-0:
variables:
PYTEST_SHARD_ID: 0
extends:
- .docker-remote
- .rules:test-heptapod
docker-remote-1:
variables:
PYTEST_SHARD_ID: 1
extends:
- .docker-remote
- .rules:test-heptapod
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment