Apex: update 3rd party netvirt CI

Intel slave no longer exists. Moves the Apex netvirt snapshots to run on
Apex slaves.

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

4 files changed, 26 insertions, 9 deletions

diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml
index 863eb94dd..c077fce2c 100644
--- a/jjb/3rd_party_ci/odl-netvirt.yaml
+++ b/jjb/3rd_party_ci/odl-netvirt.yaml
@@ -13,8 +13,8 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - carbon:
-          branch: 'stable/carbon'
+      - oxygen:
+          branch: 'stable/oxygen'
           gs-pathname: ''
           disabled: false
     #####################################
@@ -22,11 +22,11 @@
     #####################################
     phase:
       - 'create-apex-vms':
-          slave-label: 'odl-netvirt-virtual-intel'
+          slave-label: 'apex-virtual-master'
       - 'install-netvirt':
-          slave-label: 'odl-netvirt-virtual-intel'
+          slave-label: 'apex-virtual-master'
       - 'postprocess':
-          slave-label: 'odl-netvirt-virtual-intel'
+          slave-label: 'apex-virtual-master'
     #####################################
     # jobs
     #####################################
@@ -53,7 +53,17 @@
           max-total: 5
           max-per-node: 1
           option: 'project'
-
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'apex-verify.*'
+            - 'apex-.*-promote.*'
+            - 'apex-virtual.*'
+            - 'odl-netvirt-verify-virtual-create-apex-vms-.*'
+            - 'odl-netvirt-verify-virtual-install-netvirt-.*'
+            - 'functest-netvirt-virtual-suite-.*'
+            - 'odl-netvirt-verify-virtual-postprocess-.*'
+          block-level: 'NODE'
     scm:
       - git:
           url: https://gerrit.opnfv.org/gerrit/apex
@@ -69,7 +79,7 @@
       - string:
           name: NETVIRT_ARTIFACT
           default: distribution-karaf.tar.gz
-      - 'odl-netvirt-virtual-intel-defaults'
+      - 'apex-virtual-master-defaults'
 
     triggers:
       - gerrit:
@@ -136,7 +146,7 @@
           projects:
             - name: 'functest-netvirt-virtual-suite-master'
               predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+                DEPLOY_SCENARIO=os-odl-nofeature-ha
                 FUNCTEST_MODE=testcase
                 FUNCTEST_SUITE_NAME=odl_netvirt
                 RC_FILE_PATH=$HOME/cloner-info/overcloudrc
@@ -206,7 +216,7 @@
       - '{installer}-defaults'
       - string:
           name: DEPLOY_SCENARIO
-          default: 'os-odl_l2-bgpvpn-noha'
+          default: 'os-odl-nofeature-noha'
           description: 'Scenario to deploy and test'
       - string:
           name: GS_URL
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index 0837a76e4..81e59bdf5 100644
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -312,6 +312,7 @@
             - 'apex-verify.*'
             - 'apex-virtual.*'
             - 'apex-.*-promote.*'
+            - 'odl-netvirt.*'
       - throttle:
           max-per-node: 1
           max-total: 10
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 65e558820..8dcd4d431 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -347,6 +347,7 @@
             - 'yardstick.*'
             - 'dovetail.*'
             - 'storperf.*'
+            - 'odl-netvirt.*'
       - throttle:
           max-per-node: 1
           max-total: 10
@@ -401,6 +402,8 @@
             - 'apex-run.*'
             - 'apex-virtual-.*'
             - 'apex-verify-gate-.*'
+            - 'apex-.*-promote.*'
+            - 'odl-netvirt.*'
       - throttle:
           max-per-node: 1
           max-total: 10
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index f1208d27e..377d38d40 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -219,6 +219,7 @@
             - 'yardstick.*'
             - 'dovetail.*'
             - 'storperf.*'
+            - 'odl-netvirt.*'
       - throttle:
           max-per-node: 1
           max-total: 10
@@ -273,6 +274,8 @@
             - 'apex-run.*'
             - 'apex-virtual-.*'
             - 'apex-verify-gate-.*'
+            - 'apex-.*-promote.*'
+            - 'odl-netvirt.*'
       - throttle:
           max-per-node: 1
           max-total: 10