[ci] simplify overlay scripts

1 files changed, 18 insertions, 9 deletions

diff --git a/dev/ci/ci-common.sh b/dev/ci/ci-common.sh
index 98ad834b4c..fdba690155 100644
--- a/dev/ci/ci-common.sh
+++ b/dev/ci/ci-common.sh
@@ -49,25 +49,34 @@ ls -l "$CI_BUILD_DIR" || true
 
 declare -A overlays
 
-overlay()
+# overlay <project> <giturl> <ref> <prnumber> [<prbranch>]
+#   creates an overlay for project using a given url and branch which is
+#   active for prnumber or prbranch. prbranch defaults to ref.
+function overlay()
 {
     local project=$1
     local ov_url=$2
     local ov_ref=$3
-
-    if ! is_in_projects "$1"; then
-      echo "Error: $1 is not a known project which can be overlayed"
-      exit 1
+    local ov_prnumber=$4
+    local ov_prbranch=$5
+    : "${ov_prbranch:=$ov_ref}"
+
+    if [ "$CI_PULL_REQUEST" = "$ov_prnumber" ] || [ "$CI_BRANCH" = "$ov_prbranch" ]; then
+      if ! is_in_projects "$project"; then
+        echo "Error: $1 is not a known project which can be overlayed"
+        exit 1
+      fi
+
+      overlays[${project}_URL]=$ov_url
+      overlays[${project}_REF]=$ov_ref
     fi
-
-    overlays[${project}_URL]=$ov_url
-    overlays[${project}_REF]=$ov_ref
 }
 
 set +x
 for overlay in "${ci_dir}"/user-overlays/*.sh; do
     # shellcheck source=/dev/null
-    . "${overlay}"
+    # the directoy can be empty
+    if [ -e "${overlay}" ]; then . "${overlay}"; fi
 done
 
 # shellcheck source=ci-basic-overlay.sh