From 6faad40563694596a866285b45620fece5f62222 Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Sun, 16 Jul 2023 08:07:38 +0200 Subject: [PATCH 1/8] Add TMVAWeights to the CI checkout flow. --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39858ba23..511721b88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,6 +49,7 @@ python-linting: - git lb-checkout Phys/2018-patches Phys - git lb-use Rec - git lb-checkout Rec/2018-patches Rec + - git clone ssh://git@gitlab.cern.ch:7999/lhcb-datapkg/TMVAWeights.git - make configure && make - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py @@ -67,6 +68,7 @@ python-linting: - git lb-checkout Phys/2018-patches Phys - git lb-use Rec - git lb-checkout Rec/2018-patches Rec + - git clone ssh://git@gitlab.cern.ch:7999/lhcb-datapkg/TMVAWeights.git - make configure && make - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py @@ -85,6 +87,7 @@ python-linting: - git lb-checkout Phys/2018-patches Phys - git lb-use Rec - git lb-checkout Rec/2018-patches Rec + - git clone ssh://git@gitlab.cern.ch:7999/lhcb-datapkg/TMVAWeights.git - make configure && make - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py -- GitLab From 80a817c0d1fcf10afdf95dcd3173e7dff0af2a5b Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Sun, 16 Jul 2023 11:22:46 +0200 Subject: [PATCH 2/8] Use https rather than ssh for the checkout. --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 511721b88..8ed5311d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ python-linting: - git lb-checkout Phys/2018-patches Phys - git lb-use Rec - git lb-checkout Rec/2018-patches Rec - - git clone ssh://git@gitlab.cern.ch:7999/lhcb-datapkg/TMVAWeights.git + - git clone https://gitlab.cern.ch/lhcb-datapkg/TMVAWeights.git - make configure && make - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py @@ -68,7 +68,7 @@ python-linting: - git lb-checkout Phys/2018-patches Phys - git lb-use Rec - git lb-checkout Rec/2018-patches Rec - - git clone ssh://git@gitlab.cern.ch:7999/lhcb-datapkg/TMVAWeights.git + - git clone https://gitlab.cern.ch/lhcb-datapkg/TMVAWeights.git - make configure && make - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py @@ -87,7 +87,7 @@ python-linting: - git lb-checkout Phys/2018-patches Phys - git lb-use Rec - git lb-checkout Rec/2018-patches Rec - - git clone ssh://git@gitlab.cern.ch:7999/lhcb-datapkg/TMVAWeights.git + - git clone https://gitlab.cern.ch/lhcb-datapkg/TMVAWeights.git - make configure && make - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py -- GitLab From 150df64a0410fb0e618996a2f1ed6c598cb0cbc0 Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Sun, 16 Jul 2023 16:45:08 +0200 Subject: [PATCH 3/8] test environment variable. --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ed5311d6..c5160f653 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,6 +88,8 @@ python-linting: - git lb-use Rec - git lb-checkout Rec/2018-patches Rec - git clone https://gitlab.cern.ch/lhcb-datapkg/TMVAWeights.git + - export $TMVAWEIGHTSROOT = $PWD/TMVAWeights + - echo $TMVAWEIGHTSROOT - make configure && make - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py -- GitLab From c6e384abe7cbb2ec266edae22066a1cf1ff5a9c7 Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Sun, 16 Jul 2023 16:52:50 +0200 Subject: [PATCH 4/8] Correctly test exports. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5160f653..270b9d294 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,7 +88,7 @@ python-linting: - git lb-use Rec - git lb-checkout Rec/2018-patches Rec - git clone https://gitlab.cern.ch/lhcb-datapkg/TMVAWeights.git - - export $TMVAWEIGHTSROOT = $PWD/TMVAWeights + - export TMVAWEIGHTSROOT="$PWD/TMVAWeights" - echo $TMVAWEIGHTSROOT - make configure && make - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py -- GitLab From c798823875fa4bec8e163a81c7a96fb8d6bec3c2 Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Sun, 16 Jul 2023 17:06:18 +0200 Subject: [PATCH 5/8] Add all of the years' environment variables. --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 270b9d294..a19470e99 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,6 +50,7 @@ python-linting: - git lb-use Rec - git lb-checkout Rec/2018-patches Rec - git clone https://gitlab.cern.ch/lhcb-datapkg/TMVAWeights.git + - export TMVAWEIGHTSROOT="$PWD/TMVAWeights" - make configure && make - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py @@ -69,6 +70,7 @@ python-linting: - git lb-use Rec - git lb-checkout Rec/2018-patches Rec - git clone https://gitlab.cern.ch/lhcb-datapkg/TMVAWeights.git + - export TMVAWEIGHTSROOT="$PWD/TMVAWeights" - make configure && make - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py @@ -89,7 +91,6 @@ python-linting: - git lb-checkout Rec/2018-patches Rec - git clone https://gitlab.cern.ch/lhcb-datapkg/TMVAWeights.git - export TMVAWEIGHTSROOT="$PWD/TMVAWeights" - - echo $TMVAWEIGHTSROOT - make configure && make - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py -- GitLab From ee4e8da2f14929fffa57fb44194dbae8f4a6d8b6 Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Sun, 16 Jul 2023 17:12:19 +0200 Subject: [PATCH 6/8] See if the env gets overwritten with make. --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a19470e99..d5cb2bcca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,6 +52,7 @@ python-linting: - git clone https://gitlab.cern.ch/lhcb-datapkg/TMVAWeights.git - export TMVAWEIGHTSROOT="$PWD/TMVAWeights" - make configure && make + - echou $TMVAWEIGHTSROOT - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py .setup_script_2017: -- GitLab From 328374d3246a73e9c0d1bbbd6f61a53f4585db7a Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Sun, 16 Jul 2023 17:26:48 +0200 Subject: [PATCH 7/8] Spell echo correctly. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5cb2bcca..d25aebd47 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ python-linting: - git clone https://gitlab.cern.ch/lhcb-datapkg/TMVAWeights.git - export TMVAWEIGHTSROOT="$PWD/TMVAWeights" - make configure && make - - echou $TMVAWEIGHTSROOT + - echo $TMVAWEIGHTSROOT - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py .setup_script_2017: -- GitLab From ff454d83f4ee66fe01d821a9a66081852ae56283 Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Sun, 16 Jul 2023 18:01:13 +0200 Subject: [PATCH 8/8] Finalize tmva grabbing. --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d25aebd47..a19470e99 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,6 @@ python-linting: - git clone https://gitlab.cern.ch/lhcb-datapkg/TMVAWeights.git - export TMVAWEIGHTSROOT="$PWD/TMVAWeights" - make configure && make - - echo $TMVAWEIGHTSROOT - lb-conda default python Phys/StrippingSelections/tests/CI/DataAuthentication.py .setup_script_2017: -- GitLab