From: Tim Rozet <trozet@redhat.com>
Date: Tue, 17 Jul 2018 21:26:57 +0000 (-0400)
Subject: Apex: Fix snapshot scenario detection
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e6012df6b35a64f16da918f72680ef87c3b47b45;p=releng.git

Apex: Fix snapshot scenario detection

Change-Id: I4b18d441ebc4f9b9ac8c8c67415b8817f3091ee9
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/jjb/3rd_party_ci/detect-snapshot.sh b/jjb/3rd_party_ci/detect-snapshot.sh
index 46d4dfa2d..4949cb2c8 100755
--- a/jjb/3rd_party_ci/detect-snapshot.sh
+++ b/jjb/3rd_party_ci/detect-snapshot.sh
@@ -4,7 +4,7 @@ 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
@@ -24,7 +24,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