From 4afc2557649b51677dd125ba48f7bd18ff18e3bc Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Thu, 20 Feb 2025 23:01:39 +0100
Subject: [PATCH 1/7] Test
---
.gitlab-ci.yml | 110 ++++++++++++++++----------------
conan-el7-gcc115/.gitlab-ci.yml | 2 +
2 files changed, 57 insertions(+), 55 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5955a7..a63fbf8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,65 +10,65 @@ workflow:
- if: $CI_PIPELINE_SOURCE == "web"
- if: $CI_COMMIT_TAG
-conan-el6-gcc44:
- stage: triggers
- trigger:
- include: conan-el6-gcc44/.gitlab-ci.yml
- strategy: depend
+# conan-el6-gcc44:
+# stage: triggers
+# trigger:
+# include: conan-el6-gcc44/.gitlab-ci.yml
+# strategy: depend
-conan-el6-gcc91:
- stage: triggers
- trigger:
- include: conan-el6-gcc91/.gitlab-ci.yml
- strategy: depend
+# conan-el6-gcc91:
+# stage: triggers
+# trigger:
+# include: conan-el6-gcc91/.gitlab-ci.yml
+# strategy: depend
-conan-el6-gcc44-x86:
- stage: triggers
- trigger:
- include: conan-el6-gcc44-x86/.gitlab-ci.yml
- strategy: depend
+# conan-el6-gcc44-x86:
+# stage: triggers
+# trigger:
+# include: conan-el6-gcc44-x86/.gitlab-ci.yml
+# strategy: depend
-conan-el6-gcc91-x86:
- stage: triggers
- trigger:
- include: conan-el6-gcc91-x86/.gitlab-ci.yml
- strategy: depend
+# conan-el6-gcc91-x86:
+# stage: triggers
+# trigger:
+# include: conan-el6-gcc91-x86/.gitlab-ci.yml
+# strategy: depend
-conan-el7-gcc48:
- stage: triggers
- trigger:
- include: conan-el7-gcc48/.gitlab-ci.yml
- strategy: depend
+# conan-el7-gcc48:
+# stage: triggers
+# trigger:
+# include: conan-el7-gcc48/.gitlab-ci.yml
+# strategy: depend
-conan-el7-gcc93:
- stage: triggers
- trigger:
- include: conan-el7-gcc93/.gitlab-ci.yml
- strategy: depend
+# conan-el7-gcc93:
+# stage: triggers
+# trigger:
+# include: conan-el7-gcc93/.gitlab-ci.yml
+# strategy: depend
-conan-el7-gcc48-x86:
- stage: triggers
- trigger:
- include: conan-el7-gcc48-x86/.gitlab-ci.yml
- strategy: depend
+# conan-el7-gcc48-x86:
+# stage: triggers
+# trigger:
+# include: conan-el7-gcc48-x86/.gitlab-ci.yml
+# strategy: depend
-conan-el7-gcc93-x86:
- stage: triggers
- trigger:
- include: conan-el7-gcc93-x86/.gitlab-ci.yml
- strategy: depend
+# conan-el7-gcc93-x86:
+# stage: triggers
+# trigger:
+# include: conan-el7-gcc93-x86/.gitlab-ci.yml
+# strategy: depend
-conan-el7-gcc112:
- stage: triggers
- trigger:
- include: conan-el7-gcc112/.gitlab-ci.yml
- strategy: depend
+# conan-el7-gcc112:
+# stage: triggers
+# trigger:
+# include: conan-el7-gcc112/.gitlab-ci.yml
+# strategy: depend
-conan-el7-gcc114:
- stage: triggers
- trigger:
- include: conan-el7-gcc114-conda-forge/.gitlab-ci.yml
- strategy: depend
+# conan-el7-gcc114:
+# stage: triggers
+# trigger:
+# include: conan-el7-gcc114-conda-forge/.gitlab-ci.yml
+# strategy: depend
conan-el7-gcc115:
stage: triggers
@@ -76,8 +76,8 @@ conan-el7-gcc115:
include: conan-el7-gcc115/.gitlab-ci.yml
strategy: depend
-conan-el9-gcc115:
- stage: triggers
- trigger:
- include: conan-el9-gcc115/.gitlab-ci.yml
- strategy: depend
\ No newline at end of file
+# conan-el9-gcc115:
+# stage: triggers
+# trigger:
+# include: conan-el9-gcc115/.gitlab-ci.yml
+# strategy: depend
\ No newline at end of file
diff --git a/conan-el7-gcc115/.gitlab-ci.yml b/conan-el7-gcc115/.gitlab-ci.yml
index d4fed5a..590e07b 100644
--- a/conan-el7-gcc115/.gitlab-ci.yml
+++ b/conan-el7-gcc115/.gitlab-ci.yml
@@ -19,6 +19,8 @@ stages:
- release
before_script:
+ - echo "${CI_REGISTRY}"
+ - echo "${CI_REGISTRY_EXT}"
- echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
build:
--
GitLab
From 11d3801ce2b01a5e2fb8b1e61f3b8c4bd2cfe4cb Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Thu, 20 Feb 2025 23:17:46 +0100
Subject: [PATCH 2/7] Revert change
---
conan-el6-gcc44-x86/.gitlab-ci.yml | 3 ++-
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 | 3 +--
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 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml
index 47f25aa..a06a0a3 100644
--- a/conan-el6-gcc44-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc44-x86/.gitlab-ci.yml
@@ -19,11 +19,12 @@ stages:
- release
before_script:
- - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+ - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
build:
stage: build
script:
+ - echo "DOCKER_HOST=$DOCKER_HOST"
- docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml
index 83be0e3..456b1ba 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_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+ - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -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 eee5d4f..8da5704 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_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+ - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -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 97870b2..addb5a9 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_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+ - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -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 77a8664..e84141d 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_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+ - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -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 4ce594b..0d74aa4 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_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+ - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -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 590e07b..67c1ca8 100644
--- a/conan-el7-gcc115/.gitlab-ci.yml
+++ b/conan-el7-gcc115/.gitlab-ci.yml
@@ -20,8 +20,7 @@ stages:
before_script:
- echo "${CI_REGISTRY}"
- - echo "${CI_REGISTRY_EXT}"
- - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+ - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -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 411f49e..e58d0d8 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_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+ - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -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 3b945f3..2d61a00 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_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+ - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -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 b07696a..7d30984 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_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+ - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -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 498fa29..34b351d 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_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+ - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -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 a6d53da..72a4363 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_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+ - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
build:
stage: build
--
GitLab
From 74a9280765e7eb3eeadee2abae52b6112867cbeb Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Thu, 20 Feb 2025 23:21:13 +0100
Subject: [PATCH 3/7] Put log in good file
---
conan-el6-gcc44-x86/.gitlab-ci.yml | 1 -
conan-el7-gcc115/.gitlab-ci.yml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml
index a06a0a3..9661f2b 100644
--- a/conan-el6-gcc44-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc44-x86/.gitlab-ci.yml
@@ -24,7 +24,6 @@ before_script:
build:
stage: build
script:
- - echo "DOCKER_HOST=$DOCKER_HOST"
- docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
diff --git a/conan-el7-gcc115/.gitlab-ci.yml b/conan-el7-gcc115/.gitlab-ci.yml
index 67c1ca8..038bd1a 100644
--- a/conan-el7-gcc115/.gitlab-ci.yml
+++ b/conan-el7-gcc115/.gitlab-ci.yml
@@ -19,12 +19,12 @@ stages:
- release
before_script:
- - echo "${CI_REGISTRY}"
- echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
build:
stage: build
script:
+ - echo "DOCKER_HOST=$DOCKER_HOST"
- docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
--
GitLab
From 03d4777ca1cfda0192cb6e95748bc58c96a7efce Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Thu, 20 Feb 2025 23:35:42 +0100
Subject: [PATCH 4/7] Try to set proxy for pull
---
conan-el7-gcc115/.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/conan-el7-gcc115/.gitlab-ci.yml b/conan-el7-gcc115/.gitlab-ci.yml
index 038bd1a..de41496 100644
--- a/conan-el7-gcc115/.gitlab-ci.yml
+++ b/conan-el7-gcc115/.gitlab-ci.yml
@@ -24,8 +24,7 @@ before_script:
build:
stage: build
script:
- - echo "DOCKER_HOST=$DOCKER_HOST"
- - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
--
GitLab
From 7ba39300318333f9098a7b8e1c4ef5f16852832e Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Thu, 20 Feb 2025 23:46:55 +0100
Subject: [PATCH 5/7] Add proxy to docker run
---
conan-el7-gcc115/.gitlab-ci.yml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/conan-el7-gcc115/.gitlab-ci.yml b/conan-el7-gcc115/.gitlab-ci.yml
index de41496..ec4e1a3 100644
--- a/conan-el7-gcc115/.gitlab-ci.yml
+++ b/conan-el7-gcc115/.gitlab-ci.yml
@@ -30,15 +30,15 @@ build:
test:
stage: test
script:
- - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.5"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
+ - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
+ - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
+ - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.5"
+ - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+ - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} jq --version
+ - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} yq --version
release:
stage: release
--
GitLab
From f6f0968b6939e3d9c155deb20347304aaea58bc8 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Fri, 21 Feb 2025 08:48:36 +0100
Subject: [PATCH 6/7] Add extra options for proxy
---
.gitlab-ci.yml | 3 ++-
conan-el6-gcc44-x86/.gitlab-ci.yml | 20 ++++++++++----------
conan-el6-gcc44/.gitlab-ci.yml | 20 ++++++++++----------
conan-el6-gcc91-x86/.gitlab-ci.yml | 20 ++++++++++----------
conan-el6-gcc91/.gitlab-ci.yml | 20 ++++++++++----------
conan-el7-gcc112/.gitlab-ci.yml | 20 ++++++++++----------
conan-el7-gcc114-conda-forge/.gitlab-ci.yml | 20 ++++++++++----------
conan-el7-gcc115/.gitlab-ci.yml | 20 ++++++++++----------
conan-el7-gcc48-x86/.gitlab-ci.yml | 20 ++++++++++----------
conan-el7-gcc48/.gitlab-ci.yml | 20 ++++++++++----------
conan-el7-gcc93-x86/.gitlab-ci.yml | 20 ++++++++++----------
conan-el7-gcc93/.gitlab-ci.yml | 20 ++++++++++----------
conan-el9-gcc115/.gitlab-ci.yml | 20 ++++++++++----------
13 files changed, 122 insertions(+), 121 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a63fbf8..150fec2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,8 @@ stages:
- triggers
variables:
- CI_REGISTRY_EXT: "gitlab-registry.synchrotron-soleil.fr"
+ DOCKER_RUN_EXTRA_OPTIONS: "-e http_proxy -e https_proxy -e no_proxy"
+ DOCKER_BUILD_EXTRA_OPTIONS: "--build-arg http_proxy --build-arg https_proxy --build-arg no_proxy"
workflow:
rules:
diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml
index 9661f2b..e349c08 100644
--- a/conan-el6-gcc44-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc44-x86/.gitlab-ci.yml
@@ -24,21 +24,21 @@ before_script:
build:
stage: build
script:
- - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
stage: test
script:
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
release:
stage: release
diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml
index 456b1ba..57fb320 100644
--- a/conan-el6-gcc44/.gitlab-ci.yml
+++ b/conan-el6-gcc44/.gitlab-ci.yml
@@ -24,21 +24,21 @@ before_script:
build:
stage: build
script:
- - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
stage: test
script:
- - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} jq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} yq --version
release:
stage: release
diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml
index 8da5704..e6fb86a 100644
--- a/conan-el6-gcc91-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc91-x86/.gitlab-ci.yml
@@ -24,21 +24,21 @@ before_script:
build:
stage: build
script:
- - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
stage: test
script:
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
release:
stage: release
diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml
index addb5a9..f4b9080 100644
--- a/conan-el6-gcc91/.gitlab-ci.yml
+++ b/conan-el6-gcc91/.gitlab-ci.yml
@@ -24,21 +24,21 @@ before_script:
build:
stage: build
script:
- - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
stage: test
script:
- - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} jq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} yq --version
release:
stage: release
diff --git a/conan-el7-gcc112/.gitlab-ci.yml b/conan-el7-gcc112/.gitlab-ci.yml
index e84141d..33c746e 100644
--- a/conan-el7-gcc112/.gitlab-ci.yml
+++ b/conan-el7-gcc112/.gitlab-ci.yml
@@ -24,21 +24,21 @@ before_script:
build:
stage: build
script:
- - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
stage: test
script:
- - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.2"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} jq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} yq --version
release:
stage: release
diff --git a/conan-el7-gcc114-conda-forge/.gitlab-ci.yml b/conan-el7-gcc114-conda-forge/.gitlab-ci.yml
index 0d74aa4..8f45f27 100644
--- a/conan-el7-gcc114-conda-forge/.gitlab-ci.yml
+++ b/conan-el7-gcc114-conda-forge/.gitlab-ci.yml
@@ -24,21 +24,21 @@ before_script:
build:
stage: build
script:
- - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
stage: test
script:
- - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "11.4.0"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.47.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.13.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version | grep "1.7.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version | grep "3.4.3"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "11.4.0"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.47.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.13.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} jq --version | grep "1.7.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} yq --version | grep "3.4.3"
release:
stage: release
diff --git a/conan-el7-gcc115/.gitlab-ci.yml b/conan-el7-gcc115/.gitlab-ci.yml
index ec4e1a3..7d4d88e 100644
--- a/conan-el7-gcc115/.gitlab-ci.yml
+++ b/conan-el7-gcc115/.gitlab-ci.yml
@@ -24,21 +24,21 @@ before_script:
build:
stage: build
script:
- - docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
stage: test
script:
- - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.5"
- - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} jq --version
- - docker run --rm -e http_proxy -e https_proxy -e no_proxy ${CONTAINER_TEST_IMAGE} yq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} jq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} yq --version
release:
stage: release
diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml
index e58d0d8..cf64056 100644
--- a/conan-el7-gcc48-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc48-x86/.gitlab-ci.yml
@@ -24,21 +24,21 @@ before_script:
build:
stage: build
script:
- - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
stage: test
script:
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
release:
stage: release
diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml
index 2d61a00..fd1185e 100644
--- a/conan-el7-gcc48/.gitlab-ci.yml
+++ b/conan-el7-gcc48/.gitlab-ci.yml
@@ -24,21 +24,21 @@ before_script:
build:
stage: build
script:
- - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
stage: test
script:
- - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} jq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} yq --version
release:
stage: release
diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml
index 7d30984..b02f874 100644
--- a/conan-el7-gcc93-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc93-x86/.gitlab-ci.yml
@@ -24,21 +24,21 @@ before_script:
build:
stage: build
script:
- - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
stage: test
script:
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
release:
stage: release
diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml
index 34b351d..c6b4463 100644
--- a/conan-el7-gcc93/.gitlab-ci.yml
+++ b/conan-el7-gcc93/.gitlab-ci.yml
@@ -24,21 +24,21 @@ before_script:
build:
stage: build
script:
- - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
stage: test
script:
- - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} jq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} yq --version
release:
stage: release
diff --git a/conan-el9-gcc115/.gitlab-ci.yml b/conan-el9-gcc115/.gitlab-ci.yml
index 72a4363..6cb4f08 100644
--- a/conan-el9-gcc115/.gitlab-ci.yml
+++ b/conan-el9-gcc115/.gitlab-ci.yml
@@ -24,21 +24,21 @@ before_script:
build:
stage: build
script:
- - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+ - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
- docker push ${CONTAINER_TEST_IMAGE}
test:
stage: test
script:
- - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/rocky-release | grep "Rocky Linux release 9"
- - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.5"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cat /etc/rocky-release | grep "Rocky Linux release 9"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} jq --version
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} yq --version
release:
stage: release
--
GitLab
From d9d6be82f325542c730593962d96742974da677b Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Fri, 21 Feb 2025 08:57:34 +0100
Subject: [PATCH 7/7] Uncomment to enable build of all image
---
.gitlab-ci.yml | 110 ++++++++++++++++++++++++-------------------------
1 file changed, 55 insertions(+), 55 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 150fec2..fc7b4f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,65 +11,65 @@ workflow:
- if: $CI_PIPELINE_SOURCE == "web"
- if: $CI_COMMIT_TAG
-# conan-el6-gcc44:
-# stage: triggers
-# trigger:
-# include: conan-el6-gcc44/.gitlab-ci.yml
-# strategy: depend
+conan-el6-gcc44:
+ stage: triggers
+ trigger:
+ include: conan-el6-gcc44/.gitlab-ci.yml
+ strategy: depend
-# conan-el6-gcc91:
-# stage: triggers
-# trigger:
-# include: conan-el6-gcc91/.gitlab-ci.yml
-# strategy: depend
+conan-el6-gcc91:
+ stage: triggers
+ trigger:
+ include: conan-el6-gcc91/.gitlab-ci.yml
+ strategy: depend
-# conan-el6-gcc44-x86:
-# stage: triggers
-# trigger:
-# include: conan-el6-gcc44-x86/.gitlab-ci.yml
-# strategy: depend
+conan-el6-gcc44-x86:
+ stage: triggers
+ trigger:
+ include: conan-el6-gcc44-x86/.gitlab-ci.yml
+ strategy: depend
-# conan-el6-gcc91-x86:
-# stage: triggers
-# trigger:
-# include: conan-el6-gcc91-x86/.gitlab-ci.yml
-# strategy: depend
+conan-el6-gcc91-x86:
+ stage: triggers
+ trigger:
+ include: conan-el6-gcc91-x86/.gitlab-ci.yml
+ strategy: depend
-# conan-el7-gcc48:
-# stage: triggers
-# trigger:
-# include: conan-el7-gcc48/.gitlab-ci.yml
-# strategy: depend
+conan-el7-gcc48:
+ stage: triggers
+ trigger:
+ include: conan-el7-gcc48/.gitlab-ci.yml
+ strategy: depend
-# conan-el7-gcc93:
-# stage: triggers
-# trigger:
-# include: conan-el7-gcc93/.gitlab-ci.yml
-# strategy: depend
+conan-el7-gcc93:
+ stage: triggers
+ trigger:
+ include: conan-el7-gcc93/.gitlab-ci.yml
+ strategy: depend
-# conan-el7-gcc48-x86:
-# stage: triggers
-# trigger:
-# include: conan-el7-gcc48-x86/.gitlab-ci.yml
-# strategy: depend
+conan-el7-gcc48-x86:
+ stage: triggers
+ trigger:
+ include: conan-el7-gcc48-x86/.gitlab-ci.yml
+ strategy: depend
-# conan-el7-gcc93-x86:
-# stage: triggers
-# trigger:
-# include: conan-el7-gcc93-x86/.gitlab-ci.yml
-# strategy: depend
+conan-el7-gcc93-x86:
+ stage: triggers
+ trigger:
+ include: conan-el7-gcc93-x86/.gitlab-ci.yml
+ strategy: depend
-# conan-el7-gcc112:
-# stage: triggers
-# trigger:
-# include: conan-el7-gcc112/.gitlab-ci.yml
-# strategy: depend
+conan-el7-gcc112:
+ stage: triggers
+ trigger:
+ include: conan-el7-gcc112/.gitlab-ci.yml
+ strategy: depend
-# conan-el7-gcc114:
-# stage: triggers
-# trigger:
-# include: conan-el7-gcc114-conda-forge/.gitlab-ci.yml
-# strategy: depend
+conan-el7-gcc114:
+ stage: triggers
+ trigger:
+ include: conan-el7-gcc114-conda-forge/.gitlab-ci.yml
+ strategy: depend
conan-el7-gcc115:
stage: triggers
@@ -77,8 +77,8 @@ conan-el7-gcc115:
include: conan-el7-gcc115/.gitlab-ci.yml
strategy: depend
-# conan-el9-gcc115:
-# stage: triggers
-# trigger:
-# include: conan-el9-gcc115/.gitlab-ci.yml
-# strategy: depend
\ No newline at end of file
+conan-el9-gcc115:
+ stage: triggers
+ trigger:
+ include: conan-el9-gcc115/.gitlab-ci.yml
+ strategy: depend
\ No newline at end of file
--
GitLab