Run ODL CSIT on Apex from Cperf container

[releng.git] / jjb / 3rd_party_ci / odl-netvirt.yaml

diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml
index 863eb94..77263d0 100644 (file)
--- 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:
@@ -82,7 +92,7 @@
             #     comment-contains-value: 'https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-carbon/.*?/ : UNSTABLE'
             # yamllint enable rule:line-length
             - comment-added-contains-event:
-                comment-contains-value: 'opnfv-test'
+                comment-contains-value: 'check-opnfv'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
@@ -94,6 +104,9 @@
     builders:
       - description-setter:
           description: "Built on $NODE_NAME"
+      - detect-opnfv-snapshot
+      - inject:
+          properties-file: detected_snapshot
       - multijob:
           name: create-apex-vms
           condition: SUCCESSFUL
@@ -109,6 +122,9 @@
                 GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
                 NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
                 APEX_ENV_NUMBER=$APEX_ENV_NUMBER
+                GERRIT_EVENT_COMMENT_TEXT=$GERRIT_EVENT_COMMENT_TEXT
+                TOPOLOGY=$TOPOLOGY
+                OS_VERSION=$OS_VERSION
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
@@ -119,7 +135,7 @@
             - name: 'odl-netvirt-verify-virtual-install-netvirt-{stream}'
               current-parameters: false
               predefined-parameters: |
-                ODL_BRANCH={branch}
+                ODL_BRANCH=$BRANCH
                 BRANCH=$BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -127,6 +143,8 @@
                 GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
                 GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
                 NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
+                TOPOLOGY=$TOPOLOGY
+                OS_VERSION=$OS_VERSION
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
@@ -136,13 +154,28 @@
           projects:
             - name: 'functest-netvirt-virtual-suite-master'
               predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+                DEPLOY_SCENARIO=os-odl-nofeature-$TOPOLOGY
                 FUNCTEST_MODE=testcase
-                FUNCTEST_SUITE_NAME=odl_netvirt
+                FUNCTEST_SUITE_NAME=tempest_smoke
                 RC_FILE_PATH=$HOME/cloner-info/overcloudrc
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
+      - multijob:
+          name: csit
+          condition: ALWAYS
+          projects:
+            - name: cperf-apex-csit-{stream}
+              predefined-parameters: |
+                ODL_BRANCH=$BRANCH
+                RC_FILE_PATH=$SNAP_CACHE/overcloudrc
+                NODE_FILE_PATH=$SNAP_CACHE/node.yaml
+                SSH_KEY_PATH=$SNAP_CACHE/id_rsa
+                ODL_CONTAINERIZED=false
+                OS_VERSION=$OS_VERSION
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: false
       - multijob:
           name: postprocess
           condition: ALWAYS
@@ -206,7 +239,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
@@ -237,3 +270,9 @@
     builders:
       - shell:
           !include-raw: ./postprocess-netvirt.sh
+
+- builder:
+    name: 'detect-opnfv-snapshot'
+    builders:
+      - shell:
+          !include-raw-escape: ./detect-snapshot.sh