X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yaml;h=fd0e8269cfdb2b025bf084659474030213ef9213;hb=d22571ce191d958aa8da002e6b0268a5290b6971;hp=e24a2c3583b43f0cb385008e11e7586a16eabef0;hpb=07139071a8d3e7d0207ccac05b24b84bf11f712a;p=releng.git

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index e24a2c358..fd0e8269c 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -8,12 +8,13 @@
       - 'apex-virtual-{stream}'
       - 'apex-deploy-{platform}-{stream}'
       - 'apex-daily-{stream}'
-      - 'apex-csit-promote-daily-{stream}-os-{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}'
       - '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)
@@ -25,7 +26,7 @@
           build-slave: 'apex-build-master'
           virtual-slave: 'apex-virtual-master'
           baremetal-slave: 'apex-baremetal-master'
-          verify-scenario: 'os-nosdn-nofeature-ha'
+          verify-scenario: 'os-nosdn-nofeature-noha'
           scenario_stream: 'master'
           disable_daily: false
           disable_promote: false
@@ -62,36 +63,10 @@
           disable_promote: true
 
     scenario:
-      - 'os-nosdn-nofeature-noha':
-          <<: *fraser
       - 'os-nosdn-nofeature-ha':
           <<: *fraser
-      - 'os-odl-nofeature-ha':
-          <<: *fraser
-      - 'os-odl-nofeature-noha':
-          <<: *fraser
       - 'os-odl-bgpvpn-ha':
           <<: *fraser
-      - 'os-ovn-nofeature-noha':
-          <<: *fraser
-      - 'os-nosdn-fdio-noha':
-          <<: *fraser
-      - 'os-nosdn-fdio-ha':
-          <<: *fraser
-      - 'os-nosdn-bar-ha':
-          <<: *fraser
-      - 'os-nosdn-bar-noha':
-          <<: *fraser
-      - 'os-nosdn-ovs_dpdk-noha':
-          <<: *fraser
-      - 'os-nosdn-ovs_dpdk-ha':
-          <<: *fraser
-      - 'os-odl-sfc-noha':
-          <<: *fraser
-      - 'os-odl-sfc-ha':
-          <<: *fraser
-      - 'os-nosdn-calipso-noha':
-          <<: *fraser
       - 'os-nosdn-nofeature-noha':
           <<: *danube
       - 'os-nosdn-nofeature-ha':
@@ -148,6 +123,8 @@
           <<: *master
       - 'os-nosdn-nofeature-ha':
           <<: *master
+      - 'os-nosdn-nofeature-ha-ipv6':
+          <<: *master
       - 'os-odl-nofeature-noha':
           <<: *master
       - 'os-odl-nofeature-ha':
@@ -156,10 +133,34 @@
           <<: *master
       - 'os-nosdn-queens-ha':
           <<: *master
+      - 'os-nosdn-queens-ha-ipv6':
+          <<: *master
       - 'os-odl-queens-noha':
           <<: *master
       - 'os-odl-queens-ha':
           <<: *master
+      - 'k8s-nosdn-nofeature-noha':
+          <<: *master
+      - 'os-odl-bgpvpn-ha':
+          <<: *master
+      - 'os-odl-bgpvpn-noha':
+          <<: *master
+      - 'os-odl-bgpvpn_queens-ha':
+          <<: *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':
@@ -194,8 +195,6 @@
           <<: *euphrates
       - 'os-odl-sfc-ha':
           <<: *euphrates
-      - 'os-nosdn-calipso-noha':
-          <<: *euphrates
 
     platform:
       - 'baremetal'
@@ -204,11 +203,18 @@
     os_version:
       - 'pike':
           os_scenario: 'pike'
+          odl_branch: 'stable/carbon'
       - 'queens':
           os_scenario: 'queens'
+          odl_branch: 'stable/oxygen'
       - 'master':
           os_scenario: 'nofeature'
+          odl_branch: 'stable/oxygen'
 
+    topology:
+      - 'noha'
+      - 'ha'
+      - 'noha-allinone'
 
 # Fetch Logs Job
 - job-template:
@@ -540,6 +546,24 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+      - shell: |
+          if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
+            echo 'REPO=opnfv' > functest_properties
+          else
+            echo 'REPO=ollivier' > functest_properties
+          fi
+          features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p')
+          if [ "$features" == 'queens' ]; then
+            functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p')
+          elif [[ "$features" =~ 'queens' ]]; then
+            functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p')
+          else
+            functest_scenario=$DEPLOY_SCENARIO
+          fi
+          echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties
+      - inject:
+          properties-file: functest_properties
+          override-build-parameters: true
       - multijob:
           name: 'OPNFV Test Suite'
           condition: ALWAYS
@@ -636,7 +660,7 @@
           name: Dovetail-proposed_tests
           condition: ALWAYS
           projects:
-            - name: 'dovetail-apex-baremetal-proposed_tests-{scenario_stream}'
+            - name: 'dovetail-apex-baremetal-default-mandatory-{scenario_stream}'
               node-parameters: true
               current-parameters: false
               predefined-parameters:
@@ -649,7 +673,7 @@
           name: Dovetail-default
           condition: ALWAYS
           projects:
-            - name: 'dovetail-apex-baremetal-default-{scenario_stream}'
+            - name: 'dovetail-apex-baremetal-default-optional-{scenario_stream}'
               node-parameters: true
               current-parameters: false
               predefined-parameters:
@@ -750,6 +774,19 @@
               git-revision: true
       - apex-builder-{stream}
 
+# snapshot info fetch
+- job-template:
+    name: 'apex-fetch-snap-info'
+
+    disabled: false
+
+    parameters:
+      - '{project}-defaults'
+
+    builders:
+      - shell:
+          !include-raw-escape: ./apex-fetch-snap-info.sh
+
 # snapshot create
 - job-template:
     name: 'apex-create-snapshot'
@@ -779,7 +816,7 @@
 
 # CSIT promote
 - job-template:
-    name: 'apex-csit-promote-daily-{stream}-os-{os_version}'
+    name: 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}'
 
     # Job template for promoting CSIT Snapshots
     #
@@ -807,6 +844,18 @@
           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"
+      - string:
+          name: OS_VERSION
+          default: '{os_version}'
+          description: OpenStack version short name
+      - string:
+          name: ODL_BRANCH
+          default: '{odl_branch}'
+          description: ODL branch being used
 
     properties:
       - build-blocker:
@@ -816,30 +865,78 @@
             - 'apex-verify.*'
             - 'apex-runner.*'
             - 'apex-daily.*'
+            - 'apex-csit-promote.*'
+            - 'odl-netvirt.*'
+      - throttle:
+          max-per-node: 1
+          max-total: 10
+          option: 'project'
 
     triggers:
       - timed: '0 12 * * 0'
 
     builders:
       - multijob:
-          name: apex-virtual-deploy-test
+          name: apex-virtual-deploy
           condition: SUCCESSFUL
           projects:
-            - name: 'apex-virtual-{stream}'
+            - name: 'apex-deploy-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_serial
-                FUNCTEST_MODE=testcase
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
+      - multijob:
+          name: fetch snapshot info
+          condition: SUCCESSFUL
+          projects:
+            - name: 'apex-fetch-snap-info'
+              current-parameters: true
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+              git-revision: false
+      - multijob:
+          name: csit
+          condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
+          projects:
+            - name: cperf-apex-csit-master
+              predefined-parameters: |
+                ODL_BRANCH=$ODL_BRANCH
+                RC_FILE_PATH=/tmp/csit/overcloudrc
+                NODE_FILE_PATH=/tmp/csit/node.yaml
+                SSH_KEY_PATH=/tmp/csit/id_rsa
+                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
@@ -1160,7 +1257,7 @@
           name: Baremetal Deploy and Test Phase
           condition: SUCCESSFUL
           projects:
-            - name: 'apex-os-nosdn-nofeature-noha-baremetal-fraser'
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1168,7 +1265,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser'
+            - name: 'apex-os-odl-bgpvpn-ha-baremetal-fraser'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1176,7 +1273,16 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-nofeature-ha-baremetal-fraser'
+
+# danube Builder
+- builder:
+    name: apex-builder-danube
+    builders:
+      - multijob:
+          name: Baremetal Deploy and Test Phase
+          condition: SUCCESSFUL
+          projects:
+            - name: 'apex-os-nosdn-nofeature-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1184,7 +1290,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-nofeature-noha-baremetal-fraser'
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1192,7 +1298,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-bgpvpn-ha-baremetal-fraser'
+            - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1200,7 +1306,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-ovn-nofeature-noha-baremetal-fraser'
+            - name: 'apex-os-nosdn-ovs-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1208,7 +1314,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-fdio-noha-baremetal-fraser'
+            - name: 'apex-os-nosdn-ovs-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1216,7 +1322,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-fdio-ha-baremetal-fraser'
+            - name: 'apex-os-nosdn-fdio-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1224,7 +1330,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-bar-ha-baremetal-fraser'
+            - name: 'apex-os-nosdn-fdio-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1232,7 +1338,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-bar-noha-baremetal-fraser'
+            - name: 'apex-os-nosdn-kvm-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1240,7 +1346,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-fraser'
+            - name: 'apex-os-nosdn-kvm-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1248,7 +1354,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-ovs_dpdk-ha-baremetal-fraser'
+            - name: 'apex-os-odl_l2-fdio-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1256,7 +1362,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-sfc-noha-baremetal-fraser'
+            - name: 'apex-os-odl_l2-fdio-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1264,7 +1370,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-sfc-ha-baremetal-fraser'
+            - name: 'apex-os-odl_netvirt-fdio-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1272,7 +1378,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-calipso-noha-baremetal-fraser'
+            - name: 'apex-os-odl_l2-sfc-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1280,16 +1386,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-
-# danube Builder
-- builder:
-    name: apex-builder-danube
-    builders:
-      - multijob:
-          name: Baremetal Deploy and Test Phase
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-os-nosdn-nofeature-noha-baremetal-danube'
+            - name: 'apex-os-odl_l3-nofeature-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1297,7 +1394,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-nofeature-ha-baremetal-danube'
+            - name: 'apex-os-odl_l3-nofeature-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1305,7 +1402,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-danube'
+            - name: 'apex-os-odl_l3-ovs-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1313,7 +1410,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-ovs-noha-baremetal-danube'
+            - name: 'apex-os-odl_l3-ovs-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1321,7 +1418,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-ovs-ha-baremetal-danube'
+            - name: 'apex-os-odl-bgpvpn-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1329,7 +1426,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-fdio-noha-baremetal-danube'
+            - name: 'apex-os-odl-gluon-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1337,7 +1434,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-fdio-ha-baremetal-danube'
+            - name: 'apex-os-odl_l3-fdio-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1345,7 +1442,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-kvm-ha-baremetal-danube'
+            - name: 'apex-os-odl_l3-fdio-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1353,7 +1450,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-kvm-noha-baremetal-danube'
+            - name: 'apex-os-odl_l3-fdio_dvr-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1361,7 +1458,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l2-fdio-noha-baremetal-danube'
+            - name: 'apex-os-odl_l3-fdio_dvr-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1369,7 +1466,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l2-fdio-ha-baremetal-danube'
+            - name: 'apex-os-odl_l3-csit-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1377,7 +1474,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_netvirt-fdio-noha-baremetal-danube'
+            - name: 'apex-os-onos-nofeature-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1385,7 +1482,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l2-sfc-noha-baremetal-danube'
+            - name: 'apex-os-ovn-nofeature-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1393,7 +1490,16 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-nofeature-noha-baremetal-danube'
+
+# master Builder
+- builder:
+    name: apex-builder-master
+    builders:
+      - multijob:
+          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: |
@@ -1401,7 +1507,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-nofeature-ha-baremetal-danube'
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1409,7 +1515,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-ovs-noha-baremetal-danube'
+            - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1417,7 +1523,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-ovs-ha-baremetal-danube'
+            - name: 'apex-os-odl-nofeature-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1425,7 +1531,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-bgpvpn-ha-baremetal-danube'
+            - name: 'apex-os-odl-nofeature-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1433,7 +1539,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-gluon-noha-baremetal-danube'
+            - name: 'apex-os-nosdn-queens-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1441,7 +1547,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-fdio-noha-baremetal-danube'
+            - name: 'apex-os-nosdn-queens-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1449,7 +1555,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-fdio-ha-baremetal-danube'
+            - name: 'apex-os-nosdn-queens-ha-ipv6-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1457,7 +1563,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-fdio_dvr-noha-baremetal-danube'
+            - name: 'apex-os-odl-queens-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1465,7 +1571,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-fdio_dvr-ha-baremetal-danube'
+            - name: 'apex-os-odl-queens-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1473,7 +1579,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-csit-noha-baremetal-danube'
+            - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1481,7 +1587,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-onos-nofeature-ha-baremetal-danube'
+            - name: 'apex-os-odl-bgpvpn-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1489,7 +1595,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-ovn-nofeature-noha-baremetal-danube'
+            - name: 'apex-os-odl-bgpvpn-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1497,16 +1603,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-
-# master Builder
-- builder:
-    name: apex-builder-master
-    builders:
-      - multijob:
-          name: Baremetal Deploy and Test Phase
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-os-nosdn-nofeature-noha-baremetal-master'
+            - name: 'apex-os-odl-bgpvpn_queens-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1514,7 +1611,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-nofeature-ha-baremetal-master'
+            - name: 'apex-os-odl-bgpvpn_queens-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1522,7 +1619,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-nofeature-noha-baremetal-master'
+            - name: 'apex-os-odl-sfc-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1530,7 +1627,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-nofeature-ha-baremetal-master'
+            - name: 'apex-os-odl-sfc-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1538,7 +1635,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-queens-noha-baremetal-master'
+            - name: 'apex-os-odl-sfc_queens-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1546,7 +1643,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-queens-ha-baremetal-master'
+            - name: 'apex-os-odl-sfc_queens-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1554,7 +1651,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-queens-noha-baremetal-master'
+            - name: 'apex-os-nosdn-calipso-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1562,7 +1659,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-queens-ha-baremetal-master'
+            - name: 'apex-os-nosdn-calipso_queens-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1715,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: