👔 Allow testing owner to be different from repo owner

shnizzedy · Dec 8, 2023 · bef5543 · bef5543
1 parent 2d8040c
commit bef5543
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/scripts/launch_regtest_lite.SLURM b/.github/scripts/launch_regtest_lite.SLURM
@@ -20,7 +20,7 @@ fi
 PATH=$PATH:$PATH_EXTRA
 GH_AVAILABLE=true
 cd "${HOME_DIR}/slurm_testing" || exit 1
-gh repo set-default "$OWNER/slurm_testing" || GH_AVAILABLE=false
+gh repo set-default "${TESTING_OWNER}/slurm_testing" || GH_AVAILABLE=false
 
 BUILD_SLURM_JOB=$(sbatch --export="image=$IMAGE,PATH=$PATH,SHA=$SHA,working_dir=$HOME_DIR" --output="${HOME_DIR}/logs/${SHA}/launch/out.log" --error="${HOME_DIR}/logs/${SHA}/launch/error.log" "${HOME_DIR}/slurm_testing/regression_run_scripts/build_image.sh" | awk '{print $4}')
 

diff --git a/regression_run_scripts/regtest_lite.sh b/regression_run_scripts/regtest_lite.sh
@@ -1,13 +1,14 @@
 #!/usr/bin/bash
 
-# Required environment variables: $GH_AVAILABLE, $HOME_DIR, $IMAGE, $OWNER, $PATH, $PUSH_LOGS, $REPO, $SHA
+# Required environment variables: $GH_AVAILABLE, $HOME_DIR, $IMAGE, $OWNER, $PATH, $PUSH_LOGS, $REPO, $SHA, $TESTING_OWNER
 
 while [[ "$#" -gt 0 ]]; do
     case $1 in
         --home_dir) HOME_DIR="$2"; shift ;;
         --image) IMAGE="$2"; shift ;;
         --sha) SHA="$2"; shift ;;
         --owner) OWNER="$2"; shift ;;
+        --testing_owner) TESTING_OWNER="$2"; shift ;;
         --repo) REPO="$2"; shift ;;
     esac
     shift
@@ -22,11 +23,11 @@ PIPELINE_CONFIGS="${GIT_REPO}/pipeline_configs"
 PRECONFIGS="default"
 DATA_SOURCE="Site-CBIC Site-SI HNU_1"
 
-cd $GIT_REPO || exit 1
-gh repo set-default $OWNER/slurm_testing
+cd "$GIT_REPO" || exit 1
+gh repo set-default "$TESTING_OWNER/slurm_testing"
 git fetch origin
-git reset --hard origin/regression/after_runs
-git checkout --force origin/regression/after_runs
+git reset --hard origin/main
+git checkout --force origin/main
 
 FULL_SUCCESS_DEPENDENCIES=""