From 801948cb91c29aceb05a4faa4845048fee7c90af Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Thu, 12 Apr 2018 16:51:07 -0400 Subject: APEX: Fix gate check scenario detection - Change scenario parsing to allow k8s scenarios in gate jobs. - Remove scenario detection in shell scripts. Also changes network setting file for fd.io scenarios as we don't use separate config files any more. Change-Id: Icbcc6cb7b6b66c7cc43f5d6c58dd97730e41ea5f Signed-off-by: Feng Pan --- jjb/apex/apex-download-artifact.sh | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'jjb/apex/apex-download-artifact.sh') diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh index 066d61203..6c0f8fe26 100755 --- a/jjb/apex/apex-download-artifact.sh +++ b/jjb/apex/apex-download-artifact.sh @@ -13,21 +13,8 @@ echo if [ -z "$DEPLOY_SCENARIO" ]; then echo "Deploy scenario not set!" exit 1 -elif [[ "$DEPLOY_SCENARIO" == *gate* ]]; then - echo "Detecting Gating scenario..." - if [ -z "$GERRIT_EVENT_COMMENT_TEXT" ]; then - echo "ERROR: Gate job triggered without comment!" - exit 1 - else - DEPLOY_SCENARIO=$(echo ${GERRIT_EVENT_COMMENT_TEXT} | grep start-gate-scenario | grep -Eo 'os-.*$') - if [ -z "$DEPLOY_SCENARIO" ]; then - echo "ERROR: Unable to detect scenario in Gerrit Comment!" - echo "Format of comment to trigger gate should be 'start-gate-scenario: '" - exit 1 - else - echo "Gate scenario detected: ${DEPLOY_SCENARIO}" - fi - fi +else + echo "Deploy scenario: ${DEPLOY_SCENARIO}" fi # if upstream we do not need to download anything -- cgit 1.2.3-korg