From 885fac3b3b167cb076cd2b56d91d7e022bfef90b Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Tue, 4 Oct 2022 22:53:53 +0200
Subject: [PATCH] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 54 +++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 47 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5173212..f61d385 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,6 +43,17 @@ build:dev-el6-gcc44:
NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}"
PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
+test:dev-el6-gcc44:
+ 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
+
build:dev-el6-gcc44-x86:
extends: [".build-python"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
@@ -52,24 +63,53 @@ build:dev-el6-gcc44-x86:
NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}"
PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
-test:dev-el6-gcc44:
+test:dev-el6-gcc44-x86:
extends: [".test-python"]
- image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44
+ 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
+
+build:dev-el7-gcc48:
+ 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}"
+ PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
+
+test:dev-el7-gcc48:
+ 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-el6-gcc44
+ - build:dev-el7-gcc48
-test:dev-el6-gcc44-x86:
+build:dev-el7-gcc48-x86:
+ 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}"
+ PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
+
+test:dev-el7-gcc48-x86:
extends: [".test-python"]
- 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-el7-gcc48-x86
variables:
- OS: "linux-el6"
+ OS: "linux-el7"
ARCH: "i686"
NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}"
PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
needs:
- - build:dev-el6-gcc44-x86
+ - build:dev-el7-gcc48-x86
\ No newline at end of file
--
GitLab