From e047b31c456033f8fe329fc886c9ed5008a4cd64 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Tue, 4 Oct 2022 23:52:04 +0200
Subject: [PATCH] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 65 ++++++++++++++------------------------------------
 1 file changed, 18 insertions(+), 47 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 883a799..d81cfaf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,94 +23,65 @@ stages:
     - grep -I -r -l  "^#\!${PYTHON_ROOT}/bin/python.*$" ${PYTHON_ROOT} | xargs sed -i '1c\#\!/usr/bin/env python'
     # Clean pycache
     - find ${PYTHON_ROOT} -iname __pycache__ -print0 | xargs -0 rm -rf
-    - cd ${PYTHON_ROOT}
-    - zip -r --symlinks ${CI_PROJECT_DIR}/${NAME}.zip *
   artifacts:
     name: ${NAME}
     paths:
-      - ${NAME}.zip
+      - ${PYTHON_ROOT}/
 
 .test-python:
   stage: test
   script:
-    - ${PYTHON_ROOT}/bin/python --version | grep ${PYTHON_VERSION}
+    - ${CI_PROJECT_DIR}/python-${PYTHON_VERSION}-*/bin/python --version | grep ${PYTHON_VERSION}
 
-build:dev-el6-gcc44:
+linux-el6-x86_64:
   extends: [".build-python"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44
   variables:
-    OS: "linux-el6"
-    ARCH: "x86_64"
-    NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}"
+    NAME: "python-${PYTHON_VERSION}-${CI_JOB_NAME}"
     PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
 
-test:dev-el6-gcc44:
+test-el6-x86_64:
   extends: [".test-python"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44
   variables:
-    OS: "linux-el6"
-    ARCH: "x86_64"
-    NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}"
-    PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
   needs:
-    - build:dev-el6-gcc44
+    - linux-el6-x86_64
 
-build:dev-el6-gcc44-x86:
+linux-el6-i686:
   extends: [".build-python"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
   variables:
-    OS: "linux-el6"
-    ARCH: "i686"
-    NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}"
+    NAME: "python-${PYTHON_VERSION}-${CI_JOB_NAME}"
     PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
 
-test:dev-el6-gcc44-x86:
+test-el6-i686:
   extends: [".test-python"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
-  variables:
-    OS: "linux-el6"
-    ARCH: "i686"
-    NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}"
-    PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
   needs:
-    - build:dev-el6-gcc44-x86
+    - linux-el6-i686
 
-build:dev-el7-gcc48:
+linux-el7-x86_64:
   extends: [".build-python"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
   variables:
-    OS: "linux-el7"
-    ARCH: "x86_64"
-    NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}"
+    NAME: "python-${PYTHON_VERSION}-${CI_JOB_NAME}"
     PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
 
-test:dev-el7-gcc48:
+test-el7-x86_64:
   extends: [".test-python"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
-  variables:
-    OS: "linux-el7"
-    ARCH: "x86_64"
-    NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}"
-    PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
   needs:
-    - build:dev-el7-gcc48
+    - linux-el7-x86_64
 
-build:dev-el7-gcc48-x86:
+linux-el7-i686:
   extends: [".build-python"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
   variables:
-    OS: "linux-el7"
-    ARCH: "i686"
-    NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}"
+    NAME: "python-${PYTHON_VERSION}-${CI_JOB_NAME}"
     PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
 
-test:dev-el7-gcc48-x86:
+test-el7-i686:
   extends: [".test-python"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
-  variables:
-    OS: "linux-el7"
-    ARCH: "i686"
-    NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}"
-    PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
   needs:
-    - build:dev-el7-gcc48-x86
\ No newline at end of file
+    - linux-el7-i686
\ No newline at end of file
-- 
GitLab