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] 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