From a712e20912c6100dd9f4c1d2103f6bc66d1216c8 Mon Sep 17 00:00:00 2001
From: Dennis Klein <d.klein@gsi.de>
Date: Fri, 10 Sep 2021 16:06:49 +0200
Subject: [PATCH] ci: Update envs

---
 Jenkinsfile             |  2 ++
 test/ci/CMakeLists.txt  | 18 ++++--------------
 test/ci/linux.def.in    |  6 +++---
 test/ci/setup-fedora.sh |  7 +++----
 test/ci/slurm-submit.sh | 10 ++--------
 5 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 01de8ad..9ff6aa9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -59,7 +59,9 @@ pipeline{
       steps{
         script {
           def builds = jobMatrix('alfa-ci', 'build', [
+            [os: 'fedora', ver: '32',    arch: 'x86_64', compiler: 'gcc-10'],
             [os: 'fedora', ver: '33',    arch: 'x86_64', compiler: 'gcc-10'],
+            [os: 'fedora', ver: '34',    arch: 'x86_64', compiler: 'gcc-11'],
             [os: 'macos',  ver: '11',    arch: 'x86_64', compiler: 'apple-clang-12'],
           ])
 
diff --git a/test/ci/CMakeLists.txt b/test/ci/CMakeLists.txt
index 280ddfc..6459895 100644
--- a/test/ci/CMakeLists.txt
+++ b/test/ci/CMakeLists.txt
@@ -7,24 +7,12 @@
 ################################################################################
 
 function(container)
-  cmake_parse_arguments(ARGS "" "OS;VERSION;DOCKER_TAG;PACKAGE_SETUP_SCRIPT" "" ${ARGN})
-
-  if(ARGS_DOCKER_TAG)
-    set(DOCKER_TAG ${ARGS_DOCKER_TAG})
-  else()
-    set(DOCKER_TAG "${ARGS_OS}:${ARGS_VERSION}")
-  endif()
-
-  if(ARGS_PACKAGE_SETUP_SCRIPT)
-    set(PACKAGE_SETUP_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_PACKAGE_SETUP_SCRIPT}")
-  else()
-    set(PACKAGE_SETUP_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/setup-${ARGS_OS}.sh")
-  endif()
+  cmake_parse_arguments(ARGS "" "OS;VERSION" "" ${ARGN})
 
   set(container "${ARGS_OS}.${ARGS_VERSION}")
   set(def "${container}.def")
   set(log "${container}.log")
-  set(target "${container}.fairlogger.sif")
+  set(target "${container}.sif")
 
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/linux.def.in" ${def} @ONLY)
 
@@ -41,6 +29,8 @@ function(container)
   set(containers ${containers} PARENT_SCOPE)
 endfunction()
 
+container(OS fedora VERSION 32)
 container(OS fedora VERSION 33)
+container(OS fedora VERSION 34)
 
 add_custom_target(all-containers DEPENDS ${containers})
diff --git a/test/ci/linux.def.in b/test/ci/linux.def.in
index 501f89b..585f1ea 100644
--- a/test/ci/linux.def.in
+++ b/test/ci/linux.def.in
@@ -1,8 +1,8 @@
 Bootstrap: docker
-From: @DOCKER_TAG@
+From: @ARGS_OS@:@ARGS_VERSION@
 
 %files
-    @PACKAGE_SETUP_SCRIPT@ /setup.sh
+    @CMAKE_CURRENT_SOURCE_DIR@/setup-@ARGS_OS@.sh /setup.sh
 
 %post
-    bash /setup.sh
+    bash /setup.sh @ARGS_VERSION@
diff --git a/test/ci/setup-fedora.sh b/test/ci/setup-fedora.sh
index 44f9ff0..aa5d92b 100755
--- a/test/ci/setup-fedora.sh
+++ b/test/ci/setup-fedora.sh
@@ -1,8 +1,7 @@
 #! /bin/bash
 
 dnf -y update
-dnf -y groupinstall "C Development Tools and Libraries"
-dnf -y install binutils boost-devel cmake ca-certificates coreutils diffutils \
-  findutils fmt-devel gcc-c++ git hostname ninja-build patch procps python \
-  redhat-lsb-core sed tar wget which
+dnf -y install https://alfa-ci.gsi.de/packages/rpm/fedora-$1-x86_64/fairsoft-release-dev.rpm
+dnf -y install ninja-build 'dnf-command(builddep)' libasan liblsan libtsan libubsan clang-tools-extra
+dnf -y builddep fairlogger
 dnf -y clean all
diff --git a/test/ci/slurm-submit.sh b/test/ci/slurm-submit.sh
index 87601b3..dd0d4c6 100755
--- a/test/ci/slurm-submit.sh
+++ b/test/ci/slurm-submit.sh
@@ -3,18 +3,12 @@
 label="$1"
 jobsh="$2"
 
-if [ -z "$ALFACI_SLURM_CPUS" ]
-then
-	ALFACI_SLURM_CPUS=32
-fi
+ALFACI_SLURM_CPUS=4
 if [ -z "$ALFACI_SLURM_EXTRA_OPTS" ]
 then
 	ALFACI_SLURM_EXTRA_OPTS="--hint=compute_bound"
 fi
-if [ -z "$ALFACI_SLURM_TIMEOUT" ]
-then
-	ALFACI_SLURM_TIMEOUT=30
-fi
+ALFACI_SLURM_TIMEOUT=10
 if [ -z "$ALFACI_SLURM_QUEUE" ]
 then
 	ALFACI_SLURM_QUEUE=main