# HG changeset patch # User Georges Racinet <georges.racinet@octobus.net> # Date 1609860725 -3600 # Tue Jan 05 16:32:05 2021 +0100 # Node ID 070adf351bd76f5b2faa9aaaae34cb018b07d8f6 # Parent c41a5a8bfd27c472e18634db693beac3160b7b29 Fixing triggered HGitaly pipelines The `BASE_IMAGE_COLLECTION` variable for the pipeling of py-heptapod masks the one defined in the pipeline of HGitaly, which changed with the introduction of the comparison tests with Gitaly. Decided arbitrarily to have the variables in the py-heptapod pipeline as in the HGitaly pipeline. Could have gone the other way. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,8 @@ variables: BASE_IMAGES_TAG: $CI_COMMIT_HG_BRANCH - BASE_IMAGES_COLLECTION: registry.heptapod.net:443/heptapod/ci-images/mercurial + BASE_IMAGES_COLLECTION: registry.heptapod.net:443/heptapod/ci-images + BASE_IMAGES_MERCURIAL: $BASE_IMAGES_COLLECTION/mercurial install: stage: compat @@ -36,7 +37,7 @@ extends: - .tests stage: main - image: ${BASE_IMAGES_COLLECTION}/hg-current:${BASE_IMAGES_TAG} + image: ${BASE_IMAGES_MERCURIAL}/hg-current:${BASE_IMAGES_TAG} tests-py3-hg-stable: @@ -44,7 +45,7 @@ - .tests-no-lint - .only_py_heptapod_default stage: compat - image: ${BASE_IMAGES_COLLECTION}/hg-stable:${BASE_IMAGES_TAG} + image: ${BASE_IMAGES_MERCURIAL}/hg-stable:${BASE_IMAGES_TAG} tests-py3-hg-default: extends: @@ -52,7 +53,7 @@ - .only_py_heptapod_default allow_failure: true stage: compat - image: ${BASE_IMAGES_COLLECTION}/hg-default:${BASE_IMAGES_TAG} + image: ${BASE_IMAGES_MERCURIAL}/hg-default:${BASE_IMAGES_TAG} tests-hg-git-default: allow_failure: true @@ -62,7 +63,7 @@ - .tests-no-lint - .only_py_heptapod_default stage: compat - image: ${BASE_IMAGES_COLLECTION}/hg-stable:${BASE_IMAGES_TAG} + image: ${BASE_IMAGES_MERCURIAL}/hg-stable:${BASE_IMAGES_TAG} hgitaly: rules: