From 175888475118204c22a982b7b28ada9f1d61c7d8 Mon Sep 17 00:00:00 2001 From: Pawel Kopciewicz Date: Fri, 5 Sep 2025 09:41:45 +0000 Subject: [PATCH 1/6] Fix developing.rst --- doc/tutorials/developing.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/tutorials/developing.rst b/doc/tutorials/developing.rst index e1f469813ca..c5c8b7527f8 100644 --- a/doc/tutorials/developing.rst +++ b/doc/tutorials/developing.rst @@ -80,7 +80,7 @@ to make your new test known to the build system, and run using the instructions You can find a detailed specification of the available features on the `Gaudi testing infrastructure`_ TWiki page (which is outdated in some places), -but you can also look at the `Gaudi `_ or `LHCb `_ testing +but you can also look at the `Gaudi `_ (note Gaudi was ported to Pytest and QMTest support was moved to LHCb), LHCb Pytest `LHCb `_ or LHCb QMTest `LHCb `_ testing infrastructure code. Let's dissect the test definition of the `hlt1_reco_baseline.qmt`_ test in @@ -230,6 +230,8 @@ function and follow the instructions in the "Job Options Driven Profiling" secti .. _lb-stack-setup: https://gitlab.cern.ch/rmatev/lb-stack-setup .. _Moore: https://gitlab.cern.ch/lhcb/Moore .. _Gaudi testing infrastructure: https://twiki.cern.ch/twiki/bin/view/Gaudi/GaudiTestingInfrastructure +.. _GaudiPolicy: https://gitlab.cern.ch/lhcb/Gaudi/-/tree/master/GaudiPolicy/python/GaudiTesting +.. _LHCbPytest: https://gitlab.cern.ch/lhcb/LHCb/-/tree/master/GaudiConf/python/LHCbTesting .. _LHCbQMTest: https://gitlab.cern.ch/lhcb/LHCb/-/tree/master/GaudiConf/python/GaudiConf/QMTest .. _hlt1_reco_baseline.qmt: https://gitlab.cern.ch/lhcb/Moore/-/blob/master/Hlt/RecoConf/tests/qmtest/hlt1_reco_baseline.qmt .. _exclusions.py: https://gitlab.cern.ch/lhcb/Moore/-/blob/master/Hlt/Moore/python/Moore/qmtest/exclusions.py -- GitLab From 174ff8f41d87fb82ae162299e210fa21685242bd Mon Sep 17 00:00:00 2001 From: Pawel Kopciewicz Date: Fri, 12 Sep 2025 10:09:04 +0000 Subject: [PATCH 2/6] make linkcheck custom verbose --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c934f0ae8c3..ee212018f0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,7 @@ build-docs: - ./run make -C doc graphs || { echo "WARNING build is incompatible with last nightly, stopping"; exit 77; } - reasons= - ./run python doc/make_functor_docs.py "${CI_COMMIT_SHA:0:8}" "${TARGET_BRANCH}" > doc/selection/thor_functors_reference.generated.rst || reasons+='ERROR failed functor docs build\n' - - ./run make -C doc linkcheck || reasons+='ERROR failed link check\n' + - output=$(./run make -C doc linkcheck 2>&1) || reasons+="ERROR failed link check - Broken links: $(echo "$output" | grep "broken" | head -n 5 | sed 's/.*\(http[^ ]*\).*/\1/' | tr '\n' ' ')\n" - ./run make -C doc html || reasons+='ERROR failed html generation\n' - if [ -n "$reasons" ]; then echo -e $reasons; exit 1; fi allow_failure: -- GitLab From 5c4d9078bb8aa7ec3bf3aa074d7f33d9a13fc6c3 Mon Sep 17 00:00:00 2001 From: Pawel Kopciewicz Date: Fri, 12 Sep 2025 10:15:33 +0000 Subject: [PATCH 3/6] fix invalid yaml in custom verbosity linkcheck --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee212018f0b..8ded474f36b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,8 @@ build-docs: - ./run make -C doc graphs || { echo "WARNING build is incompatible with last nightly, stopping"; exit 77; } - reasons= - ./run python doc/make_functor_docs.py "${CI_COMMIT_SHA:0:8}" "${TARGET_BRANCH}" > doc/selection/thor_functors_reference.generated.rst || reasons+='ERROR failed functor docs build\n' - - output=$(./run make -C doc linkcheck 2>&1) || reasons+="ERROR failed link check - Broken links: $(echo "$output" | grep "broken" | head -n 5 | sed 's/.*\(http[^ ]*\).*/\1/' | tr '\n' ' ')\n" + - | + output=$(./run make -C doc linkcheck 2>&1) || reasons+="ERROR failed link check - Broken links: $(echo "$output" | grep "broken" | head -n 5 | sed 's/.*\(http[^ ]*\).*/\1/' | tr '\n' ' ')\n" - ./run make -C doc html || reasons+='ERROR failed html generation\n' - if [ -n "$reasons" ]; then echo -e $reasons; exit 1; fi allow_failure: -- GitLab From eb5aa7a379ae2266e1eef0c925b589a479cc239e Mon Sep 17 00:00:00 2001 From: Pawel Kopciewicz Date: Fri, 12 Sep 2025 11:06:38 +0000 Subject: [PATCH 4/6] make verbosity more beautiful --- .gitlab-ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ded474f36b..0f9128b1e36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,13 @@ build-docs: - reasons= - ./run python doc/make_functor_docs.py "${CI_COMMIT_SHA:0:8}" "${TARGET_BRANCH}" > doc/selection/thor_functors_reference.generated.rst || reasons+='ERROR failed functor docs build\n' - | - output=$(./run make -C doc linkcheck 2>&1) || reasons+="ERROR failed link check - Broken links: $(echo "$output" | grep "broken" | head -n 5 | sed 's/.*\(http[^ ]*\).*/\1/' | tr '\n' ' ')\n" + output=$(./run make -C doc linkcheck 2>&1 | tee /dev/tty) + exit_code=$? + if [ $exit_code -ne 0 ]; then + broken_links=$(echo "$output" | grep -i "broken" | head -n 5 | sed 's/.*\(http[^ ]*\).*/\1/' | tr '\n' ' ' | sed 's/ */ /g') + error_msgs=$(echo "$output" | grep -i -E "(error|failed)" | head -n 2 | tr '\n' '; ' | sed 's/ */ /g') + reasons+="ERROR failed link check (exit code: $exit_code) - ${error_msgs}Broken links: ${broken_links}\n" + fi - ./run make -C doc html || reasons+='ERROR failed html generation\n' - if [ -n "$reasons" ]; then echo -e $reasons; exit 1; fi allow_failure: -- GitLab From 9361f26307cac499ac7f5b374e4dcb5642f7531d Mon Sep 17 00:00:00 2001 From: Pawel Kopciewicz Date: Fri, 12 Sep 2025 11:21:20 +0000 Subject: [PATCH 5/6] change tty to stdev --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f9128b1e36..1510c64be2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,7 @@ build-docs: - reasons= - ./run python doc/make_functor_docs.py "${CI_COMMIT_SHA:0:8}" "${TARGET_BRANCH}" > doc/selection/thor_functors_reference.generated.rst || reasons+='ERROR failed functor docs build\n' - | - output=$(./run make -C doc linkcheck 2>&1 | tee /dev/tty) + output=$(./run make -C doc linkcheck 2>&1 | tee /dev/stdout) exit_code=$? if [ $exit_code -ne 0 ]; then broken_links=$(echo "$output" | grep -i "broken" | head -n 5 | sed 's/.*\(http[^ ]*\).*/\1/' | tr '\n' ' ' | sed 's/ */ /g') -- GitLab From 5855b652b25afef56b72a6329dbe36ac15c73184 Mon Sep 17 00:00:00 2001 From: Pawel Kopciewicz Date: Tue, 9 Dec 2025 09:11:22 +0000 Subject: [PATCH 6/6] revert .gitlab-ci.yml --- .gitlab-ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1510c64be2c..c934f0ae8c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,14 +63,7 @@ build-docs: - ./run make -C doc graphs || { echo "WARNING build is incompatible with last nightly, stopping"; exit 77; } - reasons= - ./run python doc/make_functor_docs.py "${CI_COMMIT_SHA:0:8}" "${TARGET_BRANCH}" > doc/selection/thor_functors_reference.generated.rst || reasons+='ERROR failed functor docs build\n' - - | - output=$(./run make -C doc linkcheck 2>&1 | tee /dev/stdout) - exit_code=$? - if [ $exit_code -ne 0 ]; then - broken_links=$(echo "$output" | grep -i "broken" | head -n 5 | sed 's/.*\(http[^ ]*\).*/\1/' | tr '\n' ' ' | sed 's/ */ /g') - error_msgs=$(echo "$output" | grep -i -E "(error|failed)" | head -n 2 | tr '\n' '; ' | sed 's/ */ /g') - reasons+="ERROR failed link check (exit code: $exit_code) - ${error_msgs}Broken links: ${broken_links}\n" - fi + - ./run make -C doc linkcheck || reasons+='ERROR failed link check\n' - ./run make -C doc html || reasons+='ERROR failed html generation\n' - if [ -n "$reasons" ]; then echo -e $reasons; exit 1; fi allow_failure: -- GitLab