From 4b546160a5f99e5a2b0d2f9df09f94ffbd067492 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 17 Oct 2018 10:29:39 -0400 Subject: Apex: Adds ability to force snapshot promotion We want the ability to be able to force a promotion and skip CSIT. This patch introduces a variable we can use when manually triggering a promotion job to force promotion. The use case here is for HA scenarios we have no snapshots because CSIT always fails. We want to be able to force promotions for this case to at least have some snapshot available. Change-Id: I7e81b458f4169596929f032e9394695477fbb940 Signed-off-by: Tim Rozet --- jjb/apex/apex.yaml | 6 +++++- jjb/apex/apex.yaml.j2 | 6 +++++- jjb/cperf/cperf-robot-netvirt-csit.sh | 5 +++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 5a8f241b1..b05da22cf 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -895,7 +895,10 @@ name: ODL_BRANCH default: '{odl_branch}' description: ODL branch being used - + - string: + name: FORCE_PROMOTE + default: 'False' + description: "Used to force promotion and skip CSIT" properties: - build-blocker: use-build-blocker: true @@ -955,6 +958,7 @@ SSH_KEY_PATH=/tmp/csit/id_rsa ODL_CONTAINERIZED=true OS_VERSION=$OS_VERSION + SKIP_CSIT=$FORCE_PROMOTE node-parameters: true kill-phase-on: NEVER abort-all-job: false diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 908acb62c..35a696ad4 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -741,7 +741,10 @@ name: ODL_BRANCH default: '{odl_branch}' description: ODL branch being used - + - string: + name: FORCE_PROMOTE + default: 'False' + description: "Used to force promotion and skip CSIT" properties: - build-blocker: use-build-blocker: true @@ -801,6 +804,7 @@ SSH_KEY_PATH=/tmp/csit/id_rsa ODL_CONTAINERIZED=true OS_VERSION=$OS_VERSION + SKIP_CSIT=$FORCE_PROMOTE node-parameters: true kill-phase-on: NEVER abort-all-job: false diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index abd62a39d..892f0aa7a 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -4,6 +4,11 @@ set -o errexit set -o nounset set -o pipefail +if [[ ! -z ${SKIP_CSIT+x} && "$SKIP_CSIT" == "True" ]]; then + echo "Skipping csit run" + exit 0 +fi + if [ "$OS_VERSION" == 'master' ]; then FULL_OS_VER='master' else -- cgit 1.2.3-korg