From 9da0e3de649eda974702acbcc8ec1d67882aa6e0 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 15 Oct 2019 18:39:52 +0200 Subject: [PATCH] onap: Do not fail verification if it is not supported We can't verify changes touching onap-nofeature-noha scenario yet since it is costly so this change prevents jobs to fail and vote Verified-1 on Gerrit until we introduce scenario verification for ONAP. Change-Id: I11a9ae721c4a588dd28b98bd8325e22a8cbb7537 --- jjb/cloud-infra/cloud-infra-deploy.sh | 7 +++++++ jjb/cloud-infra/cloud-infra-test.sh | 7 +++++++ jjb/cloud-infra/determine-scenario.sh | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/jjb/cloud-infra/cloud-infra-deploy.sh b/jjb/cloud-infra/cloud-infra-deploy.sh index 1812f2fc..fd9f6a41 100644 --- a/jjb/cloud-infra/cloud-infra-deploy.sh +++ b/jjb/cloud-infra/cloud-infra-deploy.sh @@ -37,6 +37,13 @@ set -o pipefail # If DEPLOY_TYPE is baremetal, we use variable NODE_NAME injected by Jenkins to the job # in order to set PDF and IDF for the POD the job is running against. +# we don't support ONAP scenario verification because it is expensive +# TODO: we need to find a way to verify those patches in a cheaper way +if [[ "$DEPLOY_SCENARIO" =~ "onap" ]]; then + echo "Info: ONAP scenario verification has not been implemented yet!" + exit 0 +fi + if [[ $DEPLOY_TYPE == "baremetal" ]]; then PDF="https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/${NODE_NAME}-pdf.yml" IDF="https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/${NODE_NAME}-idf.yml" diff --git a/jjb/cloud-infra/cloud-infra-test.sh b/jjb/cloud-infra/cloud-infra-test.sh index d74f47a0..7d693604 100644 --- a/jjb/cloud-infra/cloud-infra-test.sh +++ b/jjb/cloud-infra/cloud-infra-test.sh @@ -28,6 +28,13 @@ set -o pipefail # Logic in this script should be kept at minimum and the changes should be pushed into # the cloud infra test test.sh script. +# we don't support ONAP scenario verification because it is expensive +# TODO: we need to find a way to verify those patches in a cheaper way +if [[ "$DEPLOY_SCENARIO" =~ "onap" ]]; then + echo "Info: ONAP scenario verification has not been implemented yet!" + exit 0 +fi + # execute cloud engine test.sh script with arguments cd $WORKSPACE ./test/test.sh -c -f $TEST_FW -t $TEST_SUITE -s $DEPLOY_SCENARIO -d $YARDSTICK_DISPATCHER diff --git a/jjb/cloud-infra/determine-scenario.sh b/jjb/cloud-infra/determine-scenario.sh index 77d6c9bc..2779d63e 100644 --- a/jjb/cloud-infra/determine-scenario.sh +++ b/jjb/cloud-infra/determine-scenario.sh @@ -77,7 +77,7 @@ function determine_scenario() { cd $WORKSPACE COMMIT_MESSAGE=$(git show -s --format=%B) echo "Info: Not implemented!" - exit 1 + exit 0 fi } -- 2.25.1