X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yaml;h=45f6fd8d2c8be5933a59abc4d66c767e923f699e;hb=a91b3afb5814f9a6374444c6557b4d7e227cb42a;hp=15ab7e8817c2a592e2f88d5fecfe4856c5375565;hpb=4a0a2215e4091b89085cc36f0566779fbb1a7749;p=releng.git

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 15ab7e881..45f6fd8d2 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -8,7 +8,7 @@
       - 'apex-virtual-{stream}'
       - 'apex-deploy-{platform}-{stream}'
       - 'apex-daily-{stream}'
-      - 'apex-csit-promote-daily-{stream}-{os_version}'
+      - 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}'
       - 'apex-fdio-promote-daily-{stream}'
       - 'apex-{scenario}-baremetal-{scenario_stream}'
       - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
@@ -25,7 +25,7 @@
           build-slave: 'apex-build-master'
           virtual-slave: 'apex-virtual-master'
           baremetal-slave: 'apex-baremetal-master'
-          verify-scenario: 'os-odl-nofeature-ha'
+          verify-scenario: 'os-nosdn-nofeature-ha'
           scenario_stream: 'master'
           disable_daily: false
           disable_promote: false
@@ -35,9 +35,9 @@
           build-slave: 'apex-build-master'
           virtual-slave: 'apex-virtual-master'
           baremetal-slave: 'apex-baremetal-master'
-          verify-scenario: 'os-odl-nofeature-ha'
+          verify-scenario: 'os-nosdn-nofeature-ha'
           scenario_stream: 'fraser'
-          disable_daily: false
+          disable_daily: true
           disable_promote: true
       - euphrates: &euphrates
           branch: 'stable/euphrates'
@@ -144,10 +144,18 @@
           <<: *danube
       - 'os-ovn-nofeature-noha':
           <<: *danube
+      - 'os-nosdn-nofeature-noha':
+          <<: *master
+      - 'os-nosdn-nofeature-ha':
+          <<: *master
       - 'os-odl-nofeature-noha':
           <<: *master
       - 'os-odl-nofeature-ha':
           <<: *master
+      - 'os-nosdn-queens-noha':
+          <<: *master
+      - 'os-nosdn-queens-ha':
+          <<: *master
       - 'os-odl-queens-noha':
           <<: *master
       - 'os-odl-queens-ha':
@@ -201,6 +209,9 @@
       - 'master':
           os_scenario: 'nofeature'
 
+    topology:
+      - 'noha'
+      - 'ha'
 
 # Fetch Logs Job
 - job-template:
@@ -339,6 +350,7 @@
             - 'yardstick.*'
             - 'dovetail.*'
             - 'storperf.*'
+            - 'odl-netvirt.*'
       - throttle:
           max-per-node: 1
           max-total: 10
@@ -368,6 +380,7 @@
     parameters:
       - '{project}-defaults'
       - '{project}-virtual-{stream}-defaults'
+      - 'functest-suite-parameter'
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
@@ -392,6 +405,7 @@
             - 'apex-run.*'
             - 'apex-virtual-.*'
             - 'apex-verify-gate-.*'
+            - 'odl-netvirt.*'
       - throttle:
           max-per-node: 1
           max-total: 10
@@ -419,6 +433,14 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
+      - shell: |
+          if echo $DEPLOY_SCENARIO | 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-smoke
           condition: ALWAYS
@@ -427,7 +449,9 @@
               current-parameters: false
               predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                FUNCTEST_SUITE_NAME=healthcheck
+                FUNCTEST_MODE=$FUNCTEST_MODE
+                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+                REPO=$REPO
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -621,8 +645,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
-                                 && $BUILD_NUMBER % 2 == 1"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob:
@@ -635,8 +658,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
-                                 && $BUILD_NUMBER % 2 == 0"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob:
@@ -735,13 +757,11 @@
 - job-template:
     name: 'apex-create-snapshot'
 
-    # Job template for clean
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-
     disabled: false
 
+    parameters:
+      - '{project}-defaults'
+
     builders:
       - shell:
           !include-raw-escape: ./apex-snapshot-create.sh
@@ -750,13 +770,11 @@
 - job-template:
     name: 'apex-upload-snapshot'
 
-    # Job template for clean
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-
     disabled: false
 
+    parameters:
+      - '{project}-defaults'
+
     builders:
       - inject:
           properties-content: ARTIFACT_TYPE=snapshot
@@ -764,7 +782,7 @@
 
 # CSIT promote
 - job-template:
-    name: 'apex-csit-promote-daily-{stream}-{os_version}'
+    name: 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}'
 
     # Job template for promoting CSIT Snapshots
     #
@@ -792,6 +810,10 @@
           name: PROMOTE
           default: 'True'
           description: "Used for overriding the PROMOTE"
+      - string:
+          name: GS_URL
+          default: $GS_BASE{gs-pathname}/{os_version}/{topology}
+          description: "User for overriding GS_URL from apex params"
 
     properties:
       - build-blocker:
@@ -801,6 +823,11 @@
             - 'apex-verify.*'
             - 'apex-runner.*'
             - 'apex-daily.*'
+            - 'apex-csit-promote.*'
+      - throttle:
+          max-per-node: 1
+          max-total: 10
+          option: 'project'
 
     triggers:
       - timed: '0 12 * * 0'
@@ -813,12 +840,14 @@
             - name: 'apex-virtual-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl-{os_scenario}-noha
+                DEPLOY_SCENARIO=os-odl-{os_scenario}-{topology}
                 OPNFV_CLEAN=yes
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                FUNCTEST_SUITE_NAME=tempest_smoke
+                FUNCTEST_MODE=testcase
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
@@ -828,7 +857,7 @@
           condition: SUCCESSFUL
           projects:
             - name: 'apex-create-snapshot'
-              current-parameters: false
+              current-parameters: true
               predefined-parameters: |
                 SNAP_TYPE=csit
               node-parameters: true
@@ -840,7 +869,7 @@
           condition: SUCCESSFUL
           projects:
             - name: 'apex-upload-snapshot'
-              current-parameters: false
+              current-parameters: true
               predefined-parameters: |
                 SNAP_TYPE=csit
               node-parameters: true
@@ -1489,6 +1518,22 @@
           name: Baremetal Deploy and Test Phase
           condition: SUCCESSFUL
           projects:
+            - name: 'apex-os-nosdn-nofeature-noha-baremetal-master'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-master'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
             - name: 'apex-os-odl-nofeature-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
@@ -1505,6 +1550,22 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+            - name: 'apex-os-nosdn-queens-noha-baremetal-master'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-queens-ha-baremetal-master'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
             - name: 'apex-os-odl-queens-noha-baremetal-master'
               node-parameters: false
               current-parameters: false