Make jobs running without needing to set needles URL specifically

As per https://progress.opensuse.org/issues/162632, openqa-clone-custom-git-refspec might fail in case NEEDLES_DIR is set and contains an absolute path which directs to the pool. Also in contrast of the poo's suggestion there is no change in removal of the vars.json logic. Signed-off-by: ybonatakis <[email protected]>
os-autoinst · Jul 30, 2024 · 4a88e1b · 4a88e1b
1 parent ef1c555
commit 4a88e1b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/script/openqa-clone-custom-git-refspec b/script/openqa-clone-custom-git-refspec
@@ -160,6 +160,9 @@ Please try 'curl $json_url' or select another job, e.g. in the same scenario: $h
         local old_needledir
         old_needledir=$(echo "$json_data" | jq -r '.NEEDLES_DIR | select (.!=null)') || throw_json_error "$json_url" "$json_data"
         local needles_dir="${needles_dir:-"$old_needledir"}"
+        if [[ -n $needles_dir ]]; then
+            needles_dir=$(echo "$json_data" | jq -r '.NEEDLES_GIT_URL | select (.!=null)') || throw_json_error "$json_url" "$json_data"
+        fi
         needles_dir="${needles_dir:-"$old_productdir/needles"}"
     fi
     local repo_branch="${repo_branch:-"$repo_name#$branch"}"