Merge changes from topic 'stable-branch'

[releng.git] / jjb / apex / apex.yaml

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 8b48fb4..fd0e826 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -14,6 +14,7 @@
       - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
       - 'apex-upload-snapshot'
       - 'apex-create-snapshot'
+      - 'apex-fetch-snap-info'
       - 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
       - 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube'
     # stream:    branch with - in place of / (eg. stable-arno)
@@ -122,6 +123,8 @@
           <<: *master
       - 'os-nosdn-nofeature-ha':
           <<: *master
+      - 'os-nosdn-nofeature-ha-ipv6':
+          <<: *master
       - 'os-odl-nofeature-noha':
           <<: *master
       - 'os-odl-nofeature-ha':
@@ -130,6 +133,8 @@
           <<: *master
       - 'os-nosdn-queens-ha':
           <<: *master
+      - 'os-nosdn-queens-ha-ipv6':
+          <<: *master
       - 'os-odl-queens-noha':
           <<: *master
       - 'os-odl-queens-ha':
@@ -144,6 +149,18 @@
           <<: *master
       - 'os-odl-bgpvpn_queens-noha':
           <<: *master
+      - 'os-odl-sfc-ha':
+          <<: *master
+      - 'os-odl-sfc-noha':
+          <<: *master
+      - 'os-odl-sfc_queens-ha':
+          <<: *master
+      - 'os-odl-sfc_queens-noha':
+          <<: *master
+      - 'os-nosdn-calipso-noha':
+          <<: *master
+      - 'os-nosdn-calipso_queens-noha':
+          <<: *master
       - 'os-nosdn-nofeature-noha':
           <<: *euphrates
       - 'os-nosdn-nofeature-ha':
@@ -178,8 +195,6 @@
           <<: *euphrates
       - 'os-odl-sfc-ha':
           <<: *euphrates
-      - 'os-nosdn-calipso-noha':
-          <<: *euphrates
 
     platform:
       - 'baremetal'
@@ -199,6 +214,7 @@
     topology:
       - 'noha'
       - 'ha'
+      - 'noha-allinone'
 
 # Fetch Logs Job
 - job-template:
@@ -769,7 +785,7 @@
 
     builders:
       - shell:
-          !include-raw: ./apex-fetch-snap-info.sh
+          !include-raw-escape: ./apex-fetch-snap-info.sh
 
 # snapshot create
 - job-template:
@@ -890,6 +906,7 @@
       - multijob:
           name: csit
           condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
           projects:
             - name: cperf-apex-csit-master
               predefined-parameters: |
@@ -900,8 +917,26 @@
                 ODL_CONTAINERIZED=true
                 OS_VERSION=$OS_VERSION
               node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: false
+            - name: cperf-upload-logs-csit
+              predefined-parameters: |
+                ODL_BRANCH=$ODL_BRANCH
+                OS_VERSION=$OS_VERSION
+              node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
+            - name: 'apex-fetch-logs-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
       - multijob:
           name: create snapshot
           condition: SUCCESSFUL
@@ -1480,6 +1515,14 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+            - name: 'apex-os-nosdn-nofeature-ha-ipv6-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
@@ -1512,6 +1555,14 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+            - name: 'apex-os-nosdn-queens-ha-ipv6-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
@@ -1568,6 +1619,54 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+            - name: 'apex-os-odl-sfc-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-sfc-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-odl-sfc_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-sfc_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-calipso-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-calipso_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
 
 # euphrates Builder
 - builder:
@@ -1713,14 +1812,6 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-calipso-noha-baremetal-euphrates'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
 - builder:
     name: 'apex-upload-artifact'
     builders: