From d067e757b15292a51fe535f0c42ba85c31e74133 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Thu, 6 Oct 2022 18:29:57 +0200
Subject: [PATCH] Restore build for linux-el7-i686 platform after successfully
build of linux-el6-i686
---
.gitlab-ci.yml | 49 +++++++++++++++++++++++++++++--------------------
1 file changed, 29 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99c900c..eda9125 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,25 +89,34 @@ package-el6-i686:
- linux-el6-i686
- test-el6-i686
-# linux-el7-i686:
-# extends: [".build"]
-# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc73-x86
-# variables:
-# NAME: "cmake-${CMAKE_VERSION}-linux-el7-i686"
+prebuild-el7-i686:
+ extends: [".prebuild"]
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc73-x86
+ variables:
+ NAME: "cmake-${PREBUILD_CMAKE_VERSION}-linux-el7-i686"
+
+linux-el7-i686:
+ extends: [".build"]
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc73-x86
+ variables:
+ PREBUILD_NAME: "cmake-${PREBUILD_CMAKE_VERSION}-linux-el7-i686"
+ NAME: "cmake-${CMAKE_VERSION}-linux-el7-i686"
+ needs:
+ - prebuild-el7-i686
-# 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-el7-i686"
-# needs:
-# - linux-el7-i686
+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-el7-i686"
+ needs:
+ - linux-el7-i686
-# package-el7-i686:
-# extends: [".package"]
-# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc73-x86
-# variables:
-# NAME: "cmake-${CMAKE_VERSION}-linux-el7-i686"
-# needs:
-# - linux-el7-i686
-# - test-el7-i686
+package-el7-i686:
+ extends: [".package"]
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc73-x86
+ variables:
+ NAME: "cmake-${CMAKE_VERSION}-linux-el7-i686"
+ needs:
+ - linux-el7-i686
+ - test-el7-i686
--
GitLab