Skip to content
Snippets Groups Projects
Commit 7e8e6205 authored by Georges Racinet's avatar Georges Racinet
Browse files

Heptapod CI: proper base image for stable, and less jobs

We need to use the `stable` tag of the base image for the `hg-current`
job. Indeed too bad we can't just propagate the hg branch name, maybe it's
time to do something about (uniformity makes the stable branch mergeable
into the default branch without fear)

It doesn't make much sense to run the `hg-default` and `hg-stable`
jobs for the stable branch of py-heptapod, which won't change Mercurial
versions, unless hg-stable is for the same hg x.y as hg-current (currently
not the case).
parent 5bfeeac1
No related branches found
No related tags found
No related merge requests found
Pipeline #13935 failed
......@@ -6,7 +6,7 @@
variables:
# has to be "stable" in the stable branch, and actually we should rename
# "latest" as "default": this would let us just use $CI_COMMIT_HG_BRANCH
BASE_IMAGES_TAG: latest
BASE_IMAGES_TAG: stable
BASE_IMAGES_COLLECTION: registry.heptapod.net:443/heptapod/ci-images/mercurial
install:
......@@ -29,6 +29,11 @@
variables:
HEPTAPOD_CI_SKIP_LINT: "yes"
.only_py_heptapod_default:
rules:
- if: '$CI_COMMIT_HG_BRANCH == "default"'
- when: never
tests-py3:
extends:
- .tests
......@@ -39,9 +44,10 @@
tests-py3-hg-stable:
extends:
- .tests-no-lint
- .only_py_heptapod_default
stage: compat
image: ${BASE_IMAGES_COLLECTION}/hg-stable:${BASE_IMAGES_TAG}
tests-py3-hg-default:
extends:
- .tests-no-lint
......@@ -42,9 +48,10 @@
stage: compat
image: ${BASE_IMAGES_COLLECTION}/hg-stable:${BASE_IMAGES_TAG}
tests-py3-hg-default:
extends:
- .tests-no-lint
- .only_py_heptapod_default
allow_failure: true
stage: compat
image: ${BASE_IMAGES_COLLECTION}/hg-default:${BASE_IMAGES_TAG}
......@@ -55,6 +62,7 @@
HEPTAPOD_CI_HG_GIT_REVISION: default
extends:
- .tests-no-lint
- .only_py_heptapod_default
stage: compat
image: ${BASE_IMAGES_COLLECTION}/hg-stable:${BASE_IMAGES_TAG}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment