From 1261f9ee8e43c3496599c2e6d0855171dbe25a5d Mon Sep 17 00:00:00 2001
From: Ulrich Schwickerath <ulrich.schwickerath@gmail.com>
Date: Wed, 5 Mar 2025 20:56:26 +0100
Subject: [PATCH] enable everything again and move ubuntu22 to xrootd
---
.gitlab-ci.yml | 18 +++++++++---------
CI/ubuntu22_64.yml | 16 ++++++++--------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2348669e..22610917 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,15 +37,15 @@ stages:
<<: *vars
include:
- CI/al9_64.yml
-# - CI/al9_32.yml
-# - CI/al9_aarch64.yml
-# - CI/ubuntu18_64.yml
+ - CI/al9_32.yml
+ - CI/al9_aarch64.yml
+ - CI/ubuntu18_64.yml
- CI/ubuntu20_64.yml
-# - CI/ubuntu22_64.yml
+ - CI/ubuntu22_64.yml
- CI/ubuntu24_64.yml
- CI/debian12_64.yml
-# - CI/cc7_64.yml
-# - CI/cc7_32.yml
-# - CI/al8_64.yml
-# - CI/al8_32.yml
-# - CI/al8_aarch64.yml
+ - CI/cc7_64.yml
+ - CI/cc7_32.yml
+ - CI/al8_64.yml
+ - CI/al8_32.yml
+ - CI/al8_aarch64.yml
diff --git a/CI/ubuntu22_64.yml b/CI/ubuntu22_64.yml
index bb8b7805..513c5960 100644
--- a/CI/ubuntu22_64.yml
+++ b/CI/ubuntu22_64.yml
@@ -47,7 +47,7 @@ dstana_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make dstana
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make dstana
artifacts:
paths:
- d
@@ -72,7 +72,7 @@ ddb_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make ddb
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make ddb
artifacts:
paths:
- d
@@ -101,7 +101,7 @@ lep1simana_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make v95d v94c v93d v92e v91f v90e
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make v95d v94c v93d v92e v91f v90e
artifacts:
paths:
- d
@@ -130,7 +130,7 @@ lep2simana_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make va0u va0e v99e v98e v97g v96g
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make va0u va0e v99e v98e v97g v96g
artifacts:
paths:
- d
@@ -158,7 +158,7 @@ delgra_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make openphigs delgra
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make openphigs delgra
artifacts:
paths:
- d
@@ -189,7 +189,7 @@ des_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make des
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make des
artifacts:
paths:
- d
@@ -216,7 +216,7 @@ idea_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make idea
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make idea
allow_failure: true
artifacts:
paths:
@@ -250,7 +250,7 @@ tests_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export DELPHI_INSTALL_DIR=${path}/d; make test
+ - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export CERNLIB_XROOTD=ON; export DELPHI_INSTALL_DIR=${path}/d; make test
binaries_ubuntu22_64:
image: $IMAGEUBUNTU22
--
GitLab