From 9071c779a7dfd761a5332023e7bec81ea30a7c6d Mon Sep 17 00:00:00 2001
From: mavogel <mavogel@cern.ch>
Date: Wed, 8 May 2024 17:20:45 +0200
Subject: [PATCH] Updated platforms for testing

---
 .gitlab-ci.yml          | 63 +++++++++++++++++++++++++++++------------
 script-gitlab-ci.yml.py |  2 +-
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaccad854..0bc55df16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,18 +12,18 @@ variables:
 before_script:
   - export MAKEFLAGS="-j`nproc` -l`nproc`"
 
-build_x86_64-centos7-gcc11-dbg_dev3:
+build_x86_64-el9-gcc11-opt_dev3:
   variables:
-    BINARY_TAG: x86_64-centos7-gcc11-dbg
-    LCG_RELEASE_PATH: /cvmfs/sft-nightlies.cern.ch/lcg/views/dev3/latest/x86_64-centos7-gcc11-dbg
-    CMAKE_ARGUMENTS: -DCMAKE_BUILD_TYPE=Debug -DLCG_python3=on -DBINARY_TAG=x86_64-centos7-gcc11-dbg
+    BINARY_TAG: x86_64-el9-gcc11-opt
+    LCG_RELEASE_PATH: /cvmfs/sft-nightlies.cern.ch/lcg/views/dev3/latest/x86_64-el9-gcc11-opt
+    CMAKE_ARGUMENTS: -DCMAKE_BUILD_TYPE=Debug -DLCG_python3=on -DBINARY_TAG=x86_64-el9-gcc11-opt
   before_script:
     - "echo $BINARY_TAG $CI_COMMIT_REF_NAME"
-    - "export highest=$(curl --header \"PRIVATE-TOKEN: $PRIVATE_TOKEN\" \"https://gitlab.cern.ch/api/v4/projects/25684/jobs?per_page=100\" | jq  \".[] | select(.name == \\\"build_x86_64-centos7-gcc11-dbg_dev3\\\") | select(.ref == \\\"${CI_COMMIT_REF_NAME}\\\") | .id\" | sort -n | tail -1)"
+    - "export highest=$(curl --header \"PRIVATE-TOKEN: $PRIVATE_TOKEN\" \"https://gitlab.cern.ch/api/v4/projects/25684/jobs?per_page=100\" | jq  \".[] | select(.name == \\\"build_x86_64-el9-gcc11-opt_dev3\\\") | select(.ref == \\\"${CI_COMMIT_REF_NAME}\\\") | .id\" | sort -n | tail -1)"
     - "echo $highest"
-    - "curl -L --header \"PRIVATE-TOKEN: $PRIVATE_TOKEN\" \"https://gitlab.cern.ch/api/v4/projects/25684/jobs/$highest/artifacts\" > coral-build_x86_64-centos7-gcc11-dbg_dev3.zip"
-    - "ls -l coral-build_x86_64-centos7-gcc11-dbg_dev3.zip"
-    - "unzip coral-build_x86_64-centos7-gcc11-dbg_dev3.zip -d ./coral"
+    - "curl -L --header \"PRIVATE-TOKEN: $PRIVATE_TOKEN\" \"https://gitlab.cern.ch/api/v4/projects/25684/jobs/$highest/artifacts\" > coral-build_x86_64-el9-gcc11-opt_dev3.zip"
+    - "ls -l coral-build_x86_64-el9-gcc11-opt_dev3.zip"
+    - "unzip coral-build_x86_64-el9-gcc11-opt_dev3.zip -d ./coral"
   stage: build 
   script: 
     - "source $LCG_RELEASE_PATH/setup.sh"
@@ -37,20 +37,20 @@ build_x86_64-centos7-gcc11-dbg_dev3:
     - "ctest --test-dir ci_build --output-on-failure"
     - "! grep -e Failed ci_build/Testing/Temporary/LastTest.log"
   tags: 
-    - centos7
+    - el9
 
-build_x86_64-centos7-gcc11-opt_dev3:
+build_x86_64-el9-gcc13-dbg_dev3:
   variables:
-    BINARY_TAG: x86_64-centos7-gcc11-opt
-    LCG_RELEASE_PATH: /cvmfs/sft-nightlies.cern.ch/lcg/views/dev3/latest/x86_64-centos7-gcc11-opt
-    CMAKE_ARGUMENTS: -DCMAKE_BUILD_TYPE=Debug -DLCG_python3=on -DBINARY_TAG=x86_64-centos7-gcc11-opt
+    BINARY_TAG: x86_64-el9-gcc13-dbg
+    LCG_RELEASE_PATH: /cvmfs/sft-nightlies.cern.ch/lcg/views/dev3/latest/x86_64-el9-gcc13-dbg
+    CMAKE_ARGUMENTS: -DCMAKE_BUILD_TYPE=Debug -DLCG_python3=on -DBINARY_TAG=x86_64-el9-gcc13-dbg
   before_script:
     - "echo $BINARY_TAG $CI_COMMIT_REF_NAME"
-    - "export highest=$(curl --header \"PRIVATE-TOKEN: $PRIVATE_TOKEN\" \"https://gitlab.cern.ch/api/v4/projects/25684/jobs?per_page=100\" | jq  \".[] | select(.name == \\\"build_x86_64-centos7-gcc11-opt_dev3\\\") | select(.ref == \\\"${CI_COMMIT_REF_NAME}\\\") | .id\" | sort -n | tail -1)"
+    - "export highest=$(curl --header \"PRIVATE-TOKEN: $PRIVATE_TOKEN\" \"https://gitlab.cern.ch/api/v4/projects/25684/jobs?per_page=100\" | jq  \".[] | select(.name == \\\"build_x86_64-el9-gcc13-dbg_dev3\\\") | select(.ref == \\\"${CI_COMMIT_REF_NAME}\\\") | .id\" | sort -n | tail -1)"
     - "echo $highest"
-    - "curl -L --header \"PRIVATE-TOKEN: $PRIVATE_TOKEN\" \"https://gitlab.cern.ch/api/v4/projects/25684/jobs/$highest/artifacts\" > coral-build_x86_64-centos7-gcc11-opt_dev3.zip"
-    - "ls -l coral-build_x86_64-centos7-gcc11-opt_dev3.zip"
-    - "unzip coral-build_x86_64-centos7-gcc11-opt_dev3.zip -d ./coral"
+    - "curl -L --header \"PRIVATE-TOKEN: $PRIVATE_TOKEN\" \"https://gitlab.cern.ch/api/v4/projects/25684/jobs/$highest/artifacts\" > coral-build_x86_64-el9-gcc13-dbg_dev3.zip"
+    - "ls -l coral-build_x86_64-el9-gcc13-dbg_dev3.zip"
+    - "unzip coral-build_x86_64-el9-gcc13-dbg_dev3.zip -d ./coral"
   stage: build 
   script: 
     - "source $LCG_RELEASE_PATH/setup.sh"
@@ -64,5 +64,32 @@ build_x86_64-centos7-gcc11-opt_dev3:
     - "ctest --test-dir ci_build --output-on-failure"
     - "! grep -e Failed ci_build/Testing/Temporary/LastTest.log"
   tags: 
-    - centos7
+    - el9
+
+build_x86_64-el9-gcc13-opt_dev3:
+  variables:
+    BINARY_TAG: x86_64-el9-gcc13-opt
+    LCG_RELEASE_PATH: /cvmfs/sft-nightlies.cern.ch/lcg/views/dev3/latest/x86_64-el9-gcc13-opt
+    CMAKE_ARGUMENTS: -DCMAKE_BUILD_TYPE=Debug -DLCG_python3=on -DBINARY_TAG=x86_64-el9-gcc13-opt
+  before_script:
+    - "echo $BINARY_TAG $CI_COMMIT_REF_NAME"
+    - "export highest=$(curl --header \"PRIVATE-TOKEN: $PRIVATE_TOKEN\" \"https://gitlab.cern.ch/api/v4/projects/25684/jobs?per_page=100\" | jq  \".[] | select(.name == \\\"build_x86_64-el9-gcc13-opt_dev3\\\") | select(.ref == \\\"${CI_COMMIT_REF_NAME}\\\") | .id\" | sort -n | tail -1)"
+    - "echo $highest"
+    - "curl -L --header \"PRIVATE-TOKEN: $PRIVATE_TOKEN\" \"https://gitlab.cern.ch/api/v4/projects/25684/jobs/$highest/artifacts\" > coral-build_x86_64-el9-gcc13-opt_dev3.zip"
+    - "ls -l coral-build_x86_64-el9-gcc13-opt_dev3.zip"
+    - "unzip coral-build_x86_64-el9-gcc13-opt_dev3.zip -d ./coral"
+  stage: build 
+  script: 
+    - "source $LCG_RELEASE_PATH/setup.sh"
+    - export CMAKE_PREFIX_PATH=./coral/ci_build:$CMAKE_PREFIX_PATH
+    - "cmake $CMAKE_ARGUMENTS -S . -B ci_build"
+    - "cmake --build ci_build"
+    - export CORAL_AUTH_PATH=/home/gitlab-runner/
+    - export CORAL_DBLOOKUP_PATH=/home/gitlab-runner/
+    - export COOL_QMTEST_USER=sftnight
+    - export COOLSYS=ci_build
+    - "ctest --test-dir ci_build --output-on-failure"
+    - "! grep -e Failed ci_build/Testing/Temporary/LastTest.log"
+  tags: 
+    - el9
 
diff --git a/script-gitlab-ci.yml.py b/script-gitlab-ci.yml.py
index 32b342df8..471a07339 100755
--- a/script-gitlab-ci.yml.py
+++ b/script-gitlab-ci.yml.py
@@ -31,7 +31,7 @@ def build_gitlabci(binary_tag, view, OS):
 
 """
 
-platforms=['dev3-x86_64-centos7-gcc11-dbg', 'dev3-x86_64-centos7-gcc11-opt']
+platforms=['dev3-x86_64-el9-gcc11-opt', 'dev3-x86_64-el9-gcc13-dbg', 'dev3-x86_64-el9-gcc13-opt']
  
 with open('.gitlab-ci.yml', 'w') as f:
   f.write("""---
-- 
GitLab