From 5ad2dd08f8abefa4ff09c9fd2ccc65d42376f0a8 Mon Sep 17 00:00:00 2001
From: Fabrice Le Goff <fabrice.le.goff@cern.ch>
Date: Tue, 28 Nov 2023 17:55:10 +0100
Subject: [PATCH] preparing for next TDAQ release: tests with el9/tdaq-11-01-00
---
.gitlab-ci.yml | 10 +++++-----
DeploymentTest/tbed.test.bash | 2 +-
point1.deployment.sh | 2 +-
run_docker_container.sh | 4 ++--
run_pylint.sh | 4 +---
run_unit_tests.sh | 2 +-
script_setup.sh | 2 +-
7 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c8569f..d89f1f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,27 +1,27 @@
pylint:
- image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
+ image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:x86_64-el9
tags:
- cvmfs
script:
- ./run_pylint.sh || exit 1
unit_tests:
- image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
+ image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:x86_64-el9
tags:
- cvmfs
script:
- ./run_unit_tests.sh gitlab || exit 1
compilation:
- image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
+ image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:x86_64-el9
tags:
- cvmfs
script:
- - source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-10-00-00
+ - source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-11-01-00
- python -m compileall .
basictest:
- image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
+ image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:x86_64-el9
tags:
- cvmfs
script:
diff --git a/DeploymentTest/tbed.test.bash b/DeploymentTest/tbed.test.bash
index e086ea4..55dc55e 100755
--- a/DeploymentTest/tbed.test.bash
+++ b/DeploymentTest/tbed.test.bash
@@ -71,7 +71,7 @@ fi
echo "Starting CastorScript with config file: $CS_CONFIG_FILE"
if ! [ -v TDAQ_LCG_RELEASE ]; then
- source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-10-00-00
+ source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-11-01-00
fi
python -u $SOURCE_DIR/Script/CastorScript.py $CS_CONFIG_FILE &>$TMP_DIR/logs/stdouterr &
diff --git a/point1.deployment.sh b/point1.deployment.sh
index c149139..2b7caa7 100755
--- a/point1.deployment.sh
+++ b/point1.deployment.sh
@@ -44,7 +44,7 @@ rm run_docker_container.sh run_pylint.sh run_unit_tests.sh || err "cannot delete
# compile with python interpreter from TDAQ
# execute in subshell to avoid importing TDAQ stuffs in here
(
- source /sw/tdaq/setup/setup_tdaq-09-04-00.sh
+ source /sw/tdaq/setup/setup_tdaq-11-01-00.sh
python -m compileall . || err "compiling"
)
diff --git a/run_docker_container.sh b/run_docker_container.sh
index 59f6520..0bf466a 100755
--- a/run_docker_container.sh
+++ b/run_docker_container.sh
@@ -16,6 +16,6 @@
# 7 and run the centos7 image,
# 8 when started, run the run_unit_tests script in bash
# 1 2 3 4 5 6 7 8
-# docker run -it --privileged -v `pwd`:`pwd` -w `pwd` -v /cvmfs:/cvmfs:shared,ro --rm=true gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7 bash ./run_unit_tests.sh
+# docker run -it --privileged -v `pwd`:`pwd` -w `pwd` -v /cvmfs:/cvmfs:shared,ro --rm=true gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:x86_64-el9 bash ./run_unit_tests.sh
# or without running the script:
-docker run -it --privileged -v `pwd`:`pwd` -w `pwd` -v /cvmfs:/cvmfs:shared,ro --rm=true gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7 bash
+docker run -it --privileged -v `pwd`:`pwd` -w `pwd` -v /cvmfs:/cvmfs:shared,ro --rm=true gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:x86_64-el9 bash
diff --git a/run_pylint.sh b/run_pylint.sh
index 6331731..82df7e0 100755
--- a/run_pylint.sh
+++ b/run_pylint.sh
@@ -1,10 +1,8 @@
#!/bin/bash
cd `dirname $0`
-# NOT MIGRATED TO tdaq-09-04-00: pylint from LCG 101 does not work:
-# https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC2920656
if ! [ -v TDAQ_LCG_RELEASE ]; then
- source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-10-00-00
+ source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-11-01-00
fi
/cvmfs/sft.cern.ch/lcg/views/$TDAQ_LCG_RELEASE/$CMTCONFIG/bin/pylint $(find . -name '*.py' -a -not -name config.py)
diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index f0b4c17..eaa52a8 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -2,7 +2,7 @@
cd `dirname $0`
if ! [ -v TDAQ_LCG_RELEASE ]; then
- source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-10-00-00
+ source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-11-01-00
fi
PATTERN='*_[Tt]est.py'
diff --git a/script_setup.sh b/script_setup.sh
index 6b8ed14..ebc6ac7 100755
--- a/script_setup.sh
+++ b/script_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-TDAQ_RELEASE=tdaq-10-00-00
+TDAQ_RELEASE=tdaq-11-01-00
echo "setting up environment for centos, tdaq release: $TDAQ_RELEASE"
source /sw/tdaq/setup/setup_$TDAQ_RELEASE.sh
--
GitLab