Merge "[fuel] dovetail: disable for Hunter/master streams"

[releng.git] / jjb / 3rd_party_ci / detect-snapshot.sh

diff --git a/jjb/3rd_party_ci/detect-snapshot.sh b/jjb/3rd_party_ci/detect-snapshot.sh
index 46d4dfa..77788aa 100755 (executable)
--- a/jjb/3rd_party_ci/detect-snapshot.sh
+++ b/jjb/3rd_party_ci/detect-snapshot.sh
@@ -4,13 +4,12 @@ set -o nounset
 set -o pipefail
 
 echo "Detecting requested OpenStack branch and topology type in gerrit comment"
-parsed_comment=$(echo $GERRIT_EVENT_COMMENT_TEXT | sed -n 's/^opnfv-check\s*//p')
+parsed_comment=$(echo $GERRIT_EVENT_COMMENT_TEXT | sed -n 's/^.*check-opnfv\s*//p')
 parsed_comment=$(echo $parsed_comment | sed -n 's/\s*$//p')
 if [ ! -z "$parsed_comment" ]; then
   if echo $parsed_comment | grep -E '^[a-z]+-(no)?ha'; then
-    IFS='-' read -r -a array <<< "$parsed_comment"
-    os_version=${array[0]}
-    topo=${array[1]}
+    os_version=${parsed_comment%%"-"*}
+    topo=${parsed_comment#*"-"}
     echo "OS version detected in gerrit comment: ${os_version}"
     echo "Topology type detected in gerrit comment: ${topo}"
   else
@@ -24,7 +23,7 @@ else
 fi
 
 echo "Writing variables to file"
-echo > detected_snapshot << EOI
+cat > detected_snapshot << EOI
 OS_VERSION=$os_version
 TOPOLOGY=$topo
 SNAP_CACHE=$HOME/snap_cache/$os_version/$topo