diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f850ca87ddc90812278be6b31d073f38537ce813..b286a1880a9fd2b4f3c746ed16d55841c05b2012 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,10 +41,6 @@ linux-el6-i686: image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc73-x86 variables: NAME: "cmake-${CMAKE_VERSION}-linux-el6-i686" - PYTHON_ROOT: ${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-linux-el6-i686 - CONAN_ROOT: ${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-linux-el6-i686 - PATH: "${CONAN_ROOT}/bin:${PYTHON_ROOT}/bin" - PYTHONPATH: "${CONAN_ROOT}/lib/python3.6/site-packages" test-el6-i686: extends: [".test"] @@ -73,7 +69,7 @@ test-el7-i686: extends: [".test"] image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc73-x86 variables: - NAME: "cmake-${CMAKE_VERSION}-linux-el6-i686" + NAME: "cmake-${CMAKE_VERSION}-linux-el7-i686" needs: - linux-el7-i686