From 0bfdc46f53a6b91fab337653d499a14878e01a1e Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Thu, 18 Jan 2024 15:22:18 +0100
Subject: [PATCH] Use correct containers
Use the newly created or updated containers which contain the development
packages for lzma and zstd. Without the new containers the linking of the
flesnet binaries fail due to missing dependencies.
---
.gitlab-ci.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65eafa3bb4..fdb39eb08b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -289,7 +289,7 @@ FileLicenceCheck:
CONFIGFILE: "/cvmfs/fairsoft.gsi.de/$OS/bin/setup_development_environment.sh"
.apptainer_vae23_variables_apr21: &apptainer_vae23_variables_apr21
- CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/user_container-develop.sif"
+ CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/user_container-production.sif"
OS: vae23
FAIRSOFT_VERSION: apr21p2
FAIRROOT_VERSION: v18.6.7
@@ -301,8 +301,7 @@ FileLicenceCheck:
EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
.apptainer_vae23_variables_nov22p1: &apptainer_vae23_variables_nov22p1
- CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/user_container-develop.sif"
- # CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/vae23-user_container_20230331T1657.sif"
+ CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/user_container-production.sif"
OS: vae23
FAIRSOFT_VERSION: nov22p1
FAIRROOT_VERSION: v18.8.0
@@ -314,7 +313,7 @@ FileLicenceCheck:
EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
.apptainer_debian11_variables_apr21: &apptainer_debian11_variables_apr21
- CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian11_v18.6.7_apr21p2.sif"
+ CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian11_v18.6.7_apr21p2_1.sif"
OS: debian11
FAIRSOFT_VERSION: apr21p2
FAIRROOT_VERSION: v18.6.7
@@ -325,7 +324,7 @@ FileLicenceCheck:
EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
.apptainer_debian12_variables_nov22p1: &apptainer_debian12_variables_nov22p1
- CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian12_v18.8.0_nov22p1.sif"
+ CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian12_v18.8.0_nov22p1_2.sif"
OS: debian12
FAIRSOFT_VERSION: nov22p1
FAIRROOT_VERSION: v18.8.0
--
GitLab