From 76d546de268f547f64323a99e4245ed3b3564d8f Mon Sep 17 00:00:00 2001
From: Patrick MADELA <patrick.madela@synchrotron-soleil.fr>
Date: Wed, 5 Oct 2022 15:53:19 +0200
Subject: [PATCH] Fix build extends name
---
.gitlab-ci.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b99b32..b8d55ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,13 +60,13 @@ package-el6-x86_64:
- test-el6-x86_64
linux-el6-i686:
- extends: [".build-python"]
+ extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
variables:
NAME: "git-${GIT_VERSION}-linux-el6-i686"
test-el6-i686:
- extends: [".test-python"]
+ extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
variables:
NAME: "git-${GIT_VERSION}-linux-el6-i686"
@@ -83,13 +83,13 @@ package-el6-i686:
- test-el6-i686
linux-el7-x86_64:
- extends: [".build-python"]
+ extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
variables:
NAME: "git-${GIT_VERSION}-linux-el7-x86_64"
test-el7-x86_64:
- extends: [".test-python"]
+ extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
variables:
NAME: "git-${GIT_VERSION}-linux-el7-x86_64"
@@ -106,14 +106,14 @@ package-el7-x86_64:
- test-el7-x86_64
linux-el7-i686:
- extends: [".build-python"]
+ extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
variables:
NAME: "git-${GIT_VERSION}-${CI_JOB_NAME}"
GIT_ROOT: "${CI_PROJECT_DIR}/${NAME}"
test-el7-i686:
- extends: [".test-python"]
+ extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
needs:
- linux-el7-i686
--
GitLab