Skip to content
Snippets Groups Projects
Commit 041645dc authored by Patrick MADELA's avatar Patrick MADELA
Browse files

Force to use image with Conan 1 because all required packages for building...

Force to use image with Conan 1 because all required packages for building Python are not yet for Conan 2
parent 2cf8398d
No related branches found
No related tags found
No related merge requests found
Pipeline #1949 passed
variables: variables:
PYTHON_VERSION: "3.6.13" PYTHON_VERSION: "3.6.13"
CONAN_DOCKER_VERSION: "1.59.0" CONAN_DOCKER_TAG: "1-59-0"
stages: stages:
- build - build
...@@ -45,14 +45,14 @@ workflow: ...@@ -45,14 +45,14 @@ workflow:
linux-x86_64: linux-x86_64:
extends: [".build"] extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:${CONAN_DOCKER_VERSION} image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:${CONAN_DOCKER_TAG}
variables: variables:
NAME: "python-${PYTHON_VERSION}-linux-x86_64" NAME: "python-${PYTHON_VERSION}-linux-x86_64"
PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
test-x86_64: test-x86_64:
extends: [".test"] extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:${CONAN_DOCKER_VERSION} image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:${CONAN_DOCKER_TAG}
variables: variables:
NAME: "python-${PYTHON_VERSION}-linux-x86_64" NAME: "python-${PYTHON_VERSION}-linux-x86_64"
needs: needs:
...@@ -60,7 +60,7 @@ test-x86_64: ...@@ -60,7 +60,7 @@ test-x86_64:
package-x86_64: package-x86_64:
extends: [".package"] extends: [".package"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:${CONAN_DOCKER_VERSION} image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:${CONAN_DOCKER_TAG}
variables: variables:
NAME: "python-${PYTHON_VERSION}-linux-x86_64" NAME: "python-${PYTHON_VERSION}-linux-x86_64"
needs: needs:
...@@ -69,14 +69,14 @@ package-x86_64: ...@@ -69,14 +69,14 @@ package-x86_64:
linux-i686: linux-i686:
extends: [".build"] extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86:${CONAN_DOCKER_VERSION} image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86:${CONAN_DOCKER_TAG}
variables: variables:
NAME: "python-${PYTHON_VERSION}-linux-i686" NAME: "python-${PYTHON_VERSION}-linux-i686"
PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
test-i686: test-i686:
extends: [".test"] extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86:${CONAN_DOCKER_VERSION} image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86:${CONAN_DOCKER_TAG}
variables: variables:
NAME: "python-${PYTHON_VERSION}-linux-i686" NAME: "python-${PYTHON_VERSION}-linux-i686"
needs: needs:
...@@ -84,7 +84,7 @@ test-i686: ...@@ -84,7 +84,7 @@ test-i686:
package-i686: package-i686:
extends: [".package"] extends: [".package"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86:${CONAN_DOCKER_VERSION} image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86:${CONAN_DOCKER_TAG}
variables: variables:
NAME: "python-${PYTHON_VERSION}-linux-i686" NAME: "python-${PYTHON_VERSION}-linux-i686"
needs: needs:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment