From: Tim Rozet <trozet@redhat.com>
Date: Fri, 27 Jul 2018 17:33:09 +0000 (-0400)
Subject: CPERF: Update netvirt verify tests
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9d40386d93630fc726271d0f904bf9b4a1f8c071;p=releng.git

CPERF: Update netvirt verify tests

Changes-Include:
 - Disable functest (we only care about csit passing for netvirt)
 - Fix trigger of csit job for other snapshot versions (always use
   master for now)
 - Fix csit always returning 0 even when tests fail

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

diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml
index 4453ee250..98c85db19 100644
--- a/jjb/3rd_party_ci/odl-netvirt.yaml
+++ b/jjb/3rd_party_ci/odl-netvirt.yaml
@@ -150,9 +150,9 @@
               abort-all-job: true
       - multijob:
           name: csit
-          condition: ALWAYS
+          condition: SUCCESSFUL
           projects:
-            - name: cperf-apex-csit-{stream}
+            - name: cperf-apex-csit-master
               predefined-parameters: |
                 ODL_BRANCH=$BRANCH
                 RC_FILE_PATH=$SNAP_CACHE/overcloudrc
@@ -161,28 +161,6 @@
                 ODL_CONTAINERIZED=false
                 OS_VERSION=$OS_VERSION
               node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: false
-      - shell: |
-          if echo $OS_VERSION | grep queens &> /dev/null; then
-          echo 'REPO=opnfv' > functest_repo
-          else
-          echo 'REPO=ollivier' > functest_repo
-          fi
-      - inject:
-          properties-file: functest_repo
-      - multijob:
-          name: functest
-          condition: SUCCESSFUL
-          projects:
-            - name: 'functest-netvirt-virtual-suite-master'
-              predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl-nofeature-$TOPOLOGY
-                FUNCTEST_MODE=testcase
-                FUNCTEST_SUITE_NAME=tempest_smoke
-                RC_FILE_PATH=$HOME/cloner-info/overcloudrc
-                REPO=$REPO
-              node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
       - multijob:
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index 5e7825061..3d943e1be 100755
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -77,7 +77,6 @@ LOGS_LOCATION=/tmp/robot_results
 robot_cmd="pybot \
   --removekeywords wuks \
   --xunit robotxunit.xml \
-  -c critical \
   -e exclude \
   -d $LOGS_LOCATION \
   -v BUNDLEFOLDER:/opt/opendaylight \