From c15ec0d198a1f1382b68b230defcbed8da473a61 Mon Sep 17 00:00:00 2001 From: emanuel-schmid Date: Mon, 23 Sep 2024 19:57:47 +0200 Subject: [PATCH] jenkins: align with petals --- script/jenkins/petals_regression_test/Jenkinsfile | 2 +- script/jenkins/petals_regression_test/run_integ_test.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/script/jenkins/petals_regression_test/Jenkinsfile b/script/jenkins/petals_regression_test/Jenkinsfile index 433771e3ab..a78d32d369 100644 --- a/script/jenkins/petals_regression_test/Jenkinsfile +++ b/script/jenkins/petals_regression_test/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stages { stage('integ_test') { steps { - sh 'bash script/jenkins/petals_regression_test/run_integ_test.sh' + sh "bash script/jenkins/petals_regression_test/run_integ_test.sh ${env.GIT_BRANCH}" } } } diff --git a/script/jenkins/petals_regression_test/run_integ_test.sh b/script/jenkins/petals_regression_test/run_integ_test.sh index 1c93998794..c532a1709f 100644 --- a/script/jenkins/petals_regression_test/run_integ_test.sh +++ b/script/jenkins/petals_regression_test/run_integ_test.sh @@ -5,7 +5,8 @@ mamba env update -n climada_env -f ~/jobs/petals_install_env/workspace/requireme source activate climada_env REGTESTENV=~/jobs/petals_compatibility/petals_env -BRANCH=`git branch -r | grep PR | cut -f 2 -d /` +BRANCH=$1 +echo ::: $REGTESTENV/$BRANCH PETALS_DIR=`test -e $REGTESTENV/$BRANCH && cat $REGTESTENV/$BRANCH || echo ~/jobs/petals_branches/branches/develop/workspace` python -m venv --system-site-packages tvenv