diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a63fbf8bb1cf4bbe511f96603b5a95d57e466a7a..150fec2d05af7aee5aca6229265efae9352eaf93 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 9661f2bf884bdc1e571eff9ea757ddb80e0128e9..e349c088fea8e878c2f89a95157a94d756c48017 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 456b1ba1ada44f93e54fb43ab1b314728ff05a17..57fb320c0999919ebd90736f4f2ecd18ae8ed875 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 8da5704a067c383258a9322ca92a75593f9ece98..e6fb86af1ec281e04bb18b9d32660ed389396a2e 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 addb5a9f88d4682b653c7b84643c2e45b58d327a..f4b9080a8582ef88f46abb1eeacda3bbaab1f078 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 e84141da5e23d3d9a15c088060c8bd043ab1145e..33c746e93dd4a918b76cef2ff4131a8ed8fbacd8 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 0d74aa4b40609d617a217b763e3d974becd28eca..8f45f275ca48fa14afadef123047a6b593bafeef 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 ec4e1a30e96f82e056a415edfa518c3fcbda47be..7d4d88eebdb6ea7d98cba8d6f1a00848702e1541 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 e58d0d867c2c65275320ac5e169061ad12cdee8b..cf64056d881d7c37d636cb6674c2bab9861a7b5a 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 2d61a0028ebbd279b93ff41fde8f6335c1eec5dd..fd1185e01cf7d24611eec068a3f0871da4197ea1 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 7d30984d125e57d051860a3a609e20440bf06f5f..b02f87448618654f7072a6548ad91aa41fc8a374 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 34b351deaca796cea84b73674e47a07f761fde98..c6b44638cf91da90e0c82d370b40462b217f4a32 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 72a43637b3023e829b98820b410c4aed2b2a5706..6cb4f08049ee4e4d8ba963ed7adbed7a417166fb 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