summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-07-17 17:26:57 -0400
committerTim Rozet <trozet@redhat.com>2018-07-17 17:26:57 -0400
commite6012df6b35a64f16da918f72680ef87c3b47b45 (patch)
tree2fe364e951e14412660297038fea1b71b0144e61
parent766d248dd8f0fd3cef5fda841b1dd0365427c42f (diff)
Apex: Fix snapshot scenario detection
Change-Id: I4b18d441ebc4f9b9ac8c8c67415b8817f3091ee9 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rwxr-xr-xjjb/3rd_party_ci/detect-snapshot.sh4
1 files changed, 2 insertions, 2 deletions
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