From a8d1bdb4d73570d67039cbc6f7fdaa46bf16a0a7 Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Thu, 20 Feb 2025 22:55:12 +0100 Subject: [PATCH] Try workaround for CI_REGISTRY --- .gitlab-ci.yml | 3 +++ conan-el6-gcc44-x86/.gitlab-ci.yml | 2 +- conan-el6-gcc44/.gitlab-ci.yml | 2 +- conan-el6-gcc91-x86/.gitlab-ci.yml | 2 +- conan-el6-gcc91/.gitlab-ci.yml | 2 +- conan-el7-gcc112/.gitlab-ci.yml | 2 +- conan-el7-gcc114-conda-forge/.gitlab-ci.yml | 2 +- conan-el7-gcc115/.gitlab-ci.yml | 2 +- conan-el7-gcc48-x86/.gitlab-ci.yml | 2 +- conan-el7-gcc48/.gitlab-ci.yml | 2 +- conan-el7-gcc93-x86/.gitlab-ci.yml | 2 +- conan-el7-gcc93/.gitlab-ci.yml | 2 +- conan-el9-gcc115/.gitlab-ci.yml | 2 +- 13 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 089e4dd..d5955a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,9 @@ stages: - triggers +variables: + CI_REGISTRY_EXT: "gitlab-registry.synchrotron-soleil.fr" + workflow: rules: - if: $CI_PIPELINE_SOURCE == "schedule" diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml index 9661f2b..47f25aa 100644 --- a/conan-el6-gcc44-x86/.gitlab-ci.yml +++ b/conan-el6-gcc44-x86/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml index 456b1ba..83be0e3 100644 --- a/conan-el6-gcc44/.gitlab-ci.yml +++ b/conan-el6-gcc44/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml index 8da5704..eee5d4f 100644 --- a/conan-el6-gcc91-x86/.gitlab-ci.yml +++ b/conan-el6-gcc91-x86/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml index addb5a9..97870b2 100644 --- a/conan-el6-gcc91/.gitlab-ci.yml +++ b/conan-el6-gcc91/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc112/.gitlab-ci.yml b/conan-el7-gcc112/.gitlab-ci.yml index e84141d..77a8664 100644 --- a/conan-el7-gcc112/.gitlab-ci.yml +++ b/conan-el7-gcc112/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc114-conda-forge/.gitlab-ci.yml b/conan-el7-gcc114-conda-forge/.gitlab-ci.yml index 0d74aa4..4ce594b 100644 --- a/conan-el7-gcc114-conda-forge/.gitlab-ci.yml +++ b/conan-el7-gcc114-conda-forge/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc115/.gitlab-ci.yml b/conan-el7-gcc115/.gitlab-ci.yml index 3eb8335..d4fed5a 100644 --- a/conan-el7-gcc115/.gitlab-ci.yml +++ b/conan-el7-gcc115/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml index e58d0d8..411f49e 100644 --- a/conan-el7-gcc48-x86/.gitlab-ci.yml +++ b/conan-el7-gcc48-x86/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml index 2d61a00..3b945f3 100644 --- a/conan-el7-gcc48/.gitlab-ci.yml +++ b/conan-el7-gcc48/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml index 7d30984..b07696a 100644 --- a/conan-el7-gcc93-x86/.gitlab-ci.yml +++ b/conan-el7-gcc93-x86/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml index 34b351d..498fa29 100644 --- a/conan-el7-gcc93/.gitlab-ci.yml +++ b/conan-el7-gcc93/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el9-gcc115/.gitlab-ci.yml b/conan-el9-gcc115/.gitlab-ci.yml index 72a4363..a6d53da 100644 --- a/conan-el9-gcc115/.gitlab-ci.yml +++ b/conan-el9-gcc115/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build -- GitLab