From 19139d364b36b39dd3067686f024690e7122efd4 Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Thu, 20 Feb 2025 21:32:15 +0100 Subject: [PATCH] Add tag to use internal build docker --- .gitlab-ci.yml | 6 ------ conan-el6-gcc44-x86/.gitlab-ci.yml | 4 ++++ conan-el6-gcc44/.gitlab-ci.yml | 4 ++++ conan-el6-gcc91-x86/.gitlab-ci.yml | 4 ++++ conan-el6-gcc91/.gitlab-ci.yml | 6 ++++++ conan-el7-gcc112/.gitlab-ci.yml | 4 ++++ conan-el7-gcc114-conda-forge/.gitlab-ci.yml | 4 ++++ conan-el7-gcc115/.gitlab-ci.yml | 4 ++++ conan-el7-gcc48-x86/.gitlab-ci.yml | 4 ++++ conan-el7-gcc48/.gitlab-ci.yml | 4 ++++ conan-el7-gcc93-x86/.gitlab-ci.yml | 4 ++++ conan-el7-gcc93/.gitlab-ci.yml | 4 ++++ conan-el9-gcc115/.gitlab-ci.yml | 4 ++++ 13 files changed, 50 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a725d63..089e4dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,6 @@ stages: - triggers -default: - tags: - - isac - - linux - - docker - 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 701bcd7..f1ce1b0 100644 --- a/conan-el6-gcc44-x86/.gitlab-ci.yml +++ b/conan-el6-gcc44-x86/.gitlab-ci.yml @@ -2,6 +2,10 @@ image: docker:latest services: - docker:dind +default: + tags: + - docker + variables: NAME: conan-el6-gcc44-x86 CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml index 3eed67a..40ee209 100644 --- a/conan-el6-gcc44/.gitlab-ci.yml +++ b/conan-el6-gcc44/.gitlab-ci.yml @@ -2,6 +2,10 @@ image: docker:latest services: - docker:dind +default: + tags: + - docker + variables: NAME: conan-el6-gcc44 CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml index d6c9b6b..57c6d18 100644 --- a/conan-el6-gcc91-x86/.gitlab-ci.yml +++ b/conan-el6-gcc91-x86/.gitlab-ci.yml @@ -2,6 +2,10 @@ image: docker:latest services: - docker:dind +default: + tags: + - docker + variables: NAME: conan-el6-gcc91-x86 CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml index 2b720c1..addb5a9 100644 --- a/conan-el6-gcc91/.gitlab-ci.yml +++ b/conan-el6-gcc91/.gitlab-ci.yml @@ -2,6 +2,12 @@ image: docker:latest services: - docker:dind +default: + tags: + - isac + - linux + - docker + variables: NAME: conan-el6-gcc91 CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG diff --git a/conan-el7-gcc112/.gitlab-ci.yml b/conan-el7-gcc112/.gitlab-ci.yml index 1999ddb..d2c8f85 100644 --- a/conan-el7-gcc112/.gitlab-ci.yml +++ b/conan-el7-gcc112/.gitlab-ci.yml @@ -2,6 +2,10 @@ image: docker:latest services: - docker:dind +default: + tags: + - docker + variables: NAME: conan-el7-gcc112 CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG diff --git a/conan-el7-gcc114-conda-forge/.gitlab-ci.yml b/conan-el7-gcc114-conda-forge/.gitlab-ci.yml index 8e979f9..eec675f 100644 --- a/conan-el7-gcc114-conda-forge/.gitlab-ci.yml +++ b/conan-el7-gcc114-conda-forge/.gitlab-ci.yml @@ -2,6 +2,10 @@ image: docker:latest services: - docker:dind +default: + tags: + - docker + variables: NAME: conan-el7-gcc114-conda-forge CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG diff --git a/conan-el7-gcc115/.gitlab-ci.yml b/conan-el7-gcc115/.gitlab-ci.yml index ffc74d8..a825aca 100644 --- a/conan-el7-gcc115/.gitlab-ci.yml +++ b/conan-el7-gcc115/.gitlab-ci.yml @@ -2,6 +2,10 @@ image: docker:latest services: - docker:dind +default: + tags: + - docker + variables: NAME: conan-el7-gcc115 CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml index b227948..d258d4f 100644 --- a/conan-el7-gcc48-x86/.gitlab-ci.yml +++ b/conan-el7-gcc48-x86/.gitlab-ci.yml @@ -2,6 +2,10 @@ image: docker:latest services: - docker:dind +default: + tags: + - docker + variables: NAME: conan-el7-gcc48-x86 CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml index a8238b3..8639440 100644 --- a/conan-el7-gcc48/.gitlab-ci.yml +++ b/conan-el7-gcc48/.gitlab-ci.yml @@ -2,6 +2,10 @@ image: docker:latest services: - docker:dind +default: + tags: + - docker + variables: NAME: conan-el7-gcc48 CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml index f441913..72ffaeb 100644 --- a/conan-el7-gcc93-x86/.gitlab-ci.yml +++ b/conan-el7-gcc93-x86/.gitlab-ci.yml @@ -2,6 +2,10 @@ image: docker:latest services: - docker:dind +default: + tags: + - docker + variables: NAME: conan-el7-gcc93-x86 CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml index f623c3a..7a15d17 100644 --- a/conan-el7-gcc93/.gitlab-ci.yml +++ b/conan-el7-gcc93/.gitlab-ci.yml @@ -2,6 +2,10 @@ image: docker:latest services: - docker:dind +default: + tags: + - docker + variables: NAME: conan-el7-gcc93 CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG diff --git a/conan-el9-gcc115/.gitlab-ci.yml b/conan-el9-gcc115/.gitlab-ci.yml index 6c9b57e..07aa8a8 100644 --- a/conan-el9-gcc115/.gitlab-ci.yml +++ b/conan-el9-gcc115/.gitlab-ci.yml @@ -2,6 +2,10 @@ image: docker:latest services: - docker:dind +default: + tags: + - docker + variables: NAME: conan-el9-gcc115 CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG -- GitLab