From f5c2d712ee40ca33ae5fe645fc5c131c58907425 Mon Sep 17 00:00:00 2001 From: Fabrice Le Goff <fabrice.le.goff@cern.ch> Date: Wed, 6 Dec 2023 14:29:08 +0100 Subject: [PATCH] tdaq-11-02-00 --- .gitlab-ci.yml | 2 +- DeploymentTest/tbed.test.bash | 2 +- point1.deployment.sh | 2 +- pylintrc | 2 +- run_pylint.sh | 2 +- run_unit_tests.sh | 2 +- script_setup.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d89f1f6..e6ba447 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ compilation: tags: - cvmfs script: - - source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-11-01-00 + - source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-11-02-00 - python -m compileall . basictest: diff --git a/DeploymentTest/tbed.test.bash b/DeploymentTest/tbed.test.bash index 55dc55e..e1853b4 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-11-01-00 + source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-11-02-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 2b7caa7..b45493c 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-11-01-00.sh + source /sw/tdaq/setup/setup_tdaq-11-02-00.sh python -m compileall . || err "compiling" ) diff --git a/pylintrc b/pylintrc index 2823cc0..051628f 100644 --- a/pylintrc +++ b/pylintrc @@ -3,7 +3,7 @@ # C: convention # R: refactoring # I: information -disable=global-statement, broad-except, bad-builtin, bare-except, import-error, unspecified-encoding, C, R, I +disable=global-statement, broad-except, bare-except, import-error, unspecified-encoding, C, R, I [REPORTS] reports=no diff --git a/run_pylint.sh b/run_pylint.sh index 82df7e0..8f12396 100755 --- a/run_pylint.sh +++ b/run_pylint.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-11-01-00 + source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-11-02-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 eaa52a8..8602759 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-11-01-00 + source /cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/cmake_tdaq/bin/cm_setup.sh tdaq-11-02-00 fi PATTERN='*_[Tt]est.py' diff --git a/script_setup.sh b/script_setup.sh index ebc6ac7..cdd866f 100755 --- a/script_setup.sh +++ b/script_setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -TDAQ_RELEASE=tdaq-11-01-00 +TDAQ_RELEASE=tdaq-11-02-00 echo "setting up environment for centos, tdaq release: $TDAQ_RELEASE" source /sw/tdaq/setup/setup_$TDAQ_RELEASE.sh -- GitLab