From c8b88661fc348ad7b4ef39c4e11f9b740eedc361 Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Wed, 12 Oct 2022 21:23:56 +0200 Subject: [PATCH] Update project path after move --- .gitlab-ci.yml | 24 ++++++++++++------------ README.md | 16 ++++++++-------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b0437a..06f1aa7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,14 +43,14 @@ stages: linux-el6-x86_64: extends: [".build"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44 variables: NAME: "python-${PYTHON_VERSION}-linux-el6-x86_64" PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" test-el6-x86_64: extends: [".test"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44 variables: NAME: "python-${PYTHON_VERSION}-linux-el6-x86_64" needs: @@ -58,7 +58,7 @@ test-el6-x86_64: package-el6-x86_64: extends: [".package"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44 variables: NAME: "python-${PYTHON_VERSION}-linux-el6-x86_64" needs: @@ -67,14 +67,14 @@ package-el6-x86_64: linux-el6-i686: extends: [".build"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86 variables: NAME: "python-${PYTHON_VERSION}-${CI_JOB_NAME}" PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" test-el6-i686: extends: [".test"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86 variables: NAME: "python-${PYTHON_VERSION}-linux-el6-i686" needs: @@ -82,7 +82,7 @@ test-el6-i686: package-el6-i686: extends: [".package"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86 variables: NAME: "python-${PYTHON_VERSION}-linux-el6-i686" needs: @@ -91,14 +91,14 @@ package-el6-i686: linux-el7-x86_64: extends: [".build"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48 variables: NAME: "python-${PYTHON_VERSION}-linux-el7-x86_64" PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" test-el7-x86_64: extends: [".test"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48 variables: NAME: "python-${PYTHON_VERSION}-linux-el7-x86_64" needs: @@ -106,7 +106,7 @@ test-el7-x86_64: package-el7-x86_64: extends: [".package"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48 variables: NAME: "python-${PYTHON_VERSION}-linux-el7-x86_64" needs: @@ -115,14 +115,14 @@ package-el7-x86_64: linux-el7-i686: extends: [".build"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48-x86 variables: NAME: "python-${PYTHON_VERSION}-${CI_JOB_NAME}" PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" test-el7-i686: extends: [".test"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48-x86 variables: NAME: "python-${PYTHON_VERSION}-linux-el7-i686" needs: @@ -130,7 +130,7 @@ test-el7-i686: package-el7-i686: extends: [".package"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48-x86 variables: NAME: "python-${PYTHON_VERSION}-linux-el7-i686" needs: diff --git a/README.md b/README.md index 3e436db..fabe1fe 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,13 @@ Pipeline to build Python 3.6.13 on CentOS Docker image Allows to build Python 3.6.13 for: -* CentOS 6.10 64 bits: [python-3.6.13-linux-el6-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/python3/-/jobs/artifacts/main/download?job=linux-el6-x86_64) -* CentOS 6.10 32 bits: [python-3.6.13-linux-el6-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/python3/-/jobs/artifacts/main/download?job=linux-el6-i686) -* CentOS 7.9 64 bits: [python-3.6.13-linux-el7-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/python3/-/jobs/artifacts/main/download?job=linux-el7-x86_64) -* CentOS 7.9 32 bits: [python-3.6.13-linux-el7-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/python3/-/jobs/artifacts/main/download?job=linux-el7-i686) +* CentOS 6.10 64 bits: [python-3.6.13-linux-el6-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/main/download?job=linux-el6-x86_64) +* CentOS 6.10 32 bits: [python-3.6.13-linux-el6-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/main/download?job=linux-el6-i686) +* CentOS 7.9 64 bits: [python-3.6.13-linux-el7-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/main/download?job=linux-el7-x86_64) +* CentOS 7.9 32 bits: [python-3.6.13-linux-el7-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/main/download?job=linux-el7-i686) Build on Docker image: -* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44 -* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86 -* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48 -* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86 +* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44 +* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86 +* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48 +* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48-x86 -- GitLab