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

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.
parent c41a5a8bfd27
No related branches found
No related tags found
No related merge requests found
Pipeline #16818 failed
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
variables: variables:
BASE_IMAGES_TAG: $CI_COMMIT_HG_BRANCH 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: install:
stage: compat stage: compat
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
extends: extends:
- .tests - .tests
stage: main stage: main
image: ${BASE_IMAGES_COLLECTION}/hg-current:${BASE_IMAGES_TAG} image: ${BASE_IMAGES_MERCURIAL}/hg-current:${BASE_IMAGES_TAG}
tests-py3-hg-stable: tests-py3-hg-stable:
...@@ -44,7 +45,7 @@ ...@@ -44,7 +45,7 @@
- .tests-no-lint - .tests-no-lint
- .only_py_heptapod_default - .only_py_heptapod_default
stage: compat stage: compat
image: ${BASE_IMAGES_COLLECTION}/hg-stable:${BASE_IMAGES_TAG} image: ${BASE_IMAGES_MERCURIAL}/hg-stable:${BASE_IMAGES_TAG}
tests-py3-hg-default: tests-py3-hg-default:
extends: extends:
...@@ -52,7 +53,7 @@ ...@@ -52,7 +53,7 @@
- .only_py_heptapod_default - .only_py_heptapod_default
allow_failure: true allow_failure: true
stage: compat stage: compat
image: ${BASE_IMAGES_COLLECTION}/hg-default:${BASE_IMAGES_TAG} image: ${BASE_IMAGES_MERCURIAL}/hg-default:${BASE_IMAGES_TAG}
tests-hg-git-default: tests-hg-git-default:
allow_failure: true allow_failure: true
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
- .tests-no-lint - .tests-no-lint
- .only_py_heptapod_default - .only_py_heptapod_default
stage: compat stage: compat
image: ${BASE_IMAGES_COLLECTION}/hg-stable:${BASE_IMAGES_TAG} image: ${BASE_IMAGES_MERCURIAL}/hg-stable:${BASE_IMAGES_TAG}
hgitaly: hgitaly:
rules: rules:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment