X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yaml;h=fb2eaa2db06939189fe53cc8df256502fd522dc4;hb=933079028dc326c32bc3ff4d6320d6432680dca6;hp=720d5bdd9d57fe836d3084ef280c8c3446e31a6c;hpb=e4a6c05de01febe062fac4c642613331866a68df;p=releng.git

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 720d5bdd9..fb2eaa2db 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -8,14 +8,14 @@
       - 'apex-virtual-{stream}'
       - 'apex-deploy-{platform}-{stream}'
       - 'apex-daily-{stream}'
-      - 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}'
+      - 'apex-{snap_type}-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)
     # branch:    branch (eg. stable/arno)
     stream:
@@ -25,10 +25,30 @@
           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
+          disable_daily: true
+          disable_promote: true
+      - hunter: &hunter
+          branch: 'stable/hunter'
+          gs-pathname: '/hunter'
+          build-slave: 'apex-build-master'
+          virtual-slave: 'apex-virtual-master'
+          baremetal-slave: 'apex-baremetal-master'
+          verify-scenario: 'os-nosdn-nofeature-ha'
+          scenario_stream: 'hunter'
+          disable_daily: true
+          disable_promote: true
+      - gambia: &gambia
+          branch: 'stable/gambia'
+          gs-pathname: '/gambia'
+          build-slave: 'apex-build-master'
+          virtual-slave: 'apex-virtual-master'
+          baremetal-slave: 'apex-baremetal-master'
+          verify-scenario: 'os-nosdn-nofeature-ha'
+          scenario_stream: 'gambia'
+          disable_daily: true
+          disable_promote: true
       - fraser: &fraser
           branch: 'stable/fraser'
           gs-pathname: '/fraser'
@@ -62,36 +82,6 @@
           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,20 +138,40 @@
           <<: *master
       - 'os-nosdn-nofeature-ha':
           <<: *master
+      - 'os-nosdn-nofeature-noha':
+          <<: *gambia
+      - 'os-nosdn-nofeature-ha':
+          <<: *gambia
+      - 'os-nosdn-nofeature-ha-ipv6':
+          <<: *gambia
       - 'os-odl-nofeature-noha':
-          <<: *master
+          <<: *gambia
       - 'os-odl-nofeature-ha':
-          <<: *master
-      - 'os-nosdn-queens-noha':
-          <<: *master
-      - 'os-nosdn-queens-ha':
-          <<: *master
-      - 'os-odl-queens-noha':
-          <<: *master
-      - 'os-odl-queens-ha':
-          <<: *master
+          <<: *gambia
       - 'k8s-nosdn-nofeature-noha':
-          <<: *master
+          <<: *gambia
+      - 'os-odl-bgpvpn-ha':
+          <<: *gambia
+      - 'os-odl-bgpvpn-noha':
+          <<: *gambia
+      - 'os-odl-sfc-ha':
+          <<: *gambia
+      - 'os-odl-sfc-noha':
+          <<: *gambia
+      - 'os-nosdn-calipso-noha':
+          <<: *gambia
+      - 'os-ovn-nofeature-ha':
+          <<: *gambia
+      - 'os-nosdn-nofeature-ha':
+          <<: *fraser
+      - 'os-odl-bgpvpn-ha':
+          <<: *fraser
+      - 'os-nosdn-nofeature-noha':
+          <<: *hunter
+      - 'os-nosdn-nofeature-ha':
+          <<: *hunter
+      - 'os-ovn-nofeature-ha':
+          <<: *hunter
       - 'os-nosdn-nofeature-noha':
           <<: *euphrates
       - 'os-nosdn-nofeature-ha':
@@ -196,25 +206,32 @@
           <<: *euphrates
       - 'os-odl-sfc-ha':
           <<: *euphrates
-      - 'os-nosdn-calipso-noha':
-          <<: *euphrates
 
     platform:
       - 'baremetal'
       - 'virtual'
 
     os_version:
-      - 'pike':
-          os_scenario: 'pike'
       - 'queens':
-          os_scenario: 'queens'
+          os_scenario: 'nofeature'
+          odl_branch: 'stable/oxygen'
+      - 'rocky':
+          os_scenario: 'rocky'
+          odl_branch: 'stable/oxygen'
       - 'master':
           os_scenario: 'nofeature'
+          odl_branch: 'stable/fluorine'
 
     topology:
       - 'noha'
       - 'ha'
+      - 'noha-allinone'
 
+    snap_type:
+      - csit:
+          sdn: 'odl'
+      - functest:
+          sdn: 'nosdn'
 # Fetch Logs Job
 - job-template:
     name: 'apex-fetch-logs-{stream}'
@@ -268,7 +285,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: false
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
       - throttle:
@@ -345,7 +362,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
             - 'functest.*'
@@ -401,13 +418,14 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-runner.*'
             - 'apex-run.*'
             - 'apex-virtual-.*'
             - 'apex-verify-gate-.*'
             - 'odl-netvirt.*'
+            - 'apex-.*-promote.*'
       - throttle:
           max-per-node: 1
           max-total: 10
@@ -435,14 +453,6 @@
               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
@@ -453,7 +463,6 @@
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 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
@@ -505,7 +514,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -545,6 +554,11 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+      - shell:
+          !include-raw-escape: ./apex-functest-scenario.sh
+      - inject:
+          properties-file: functest_scenario
+          override-build-parameters: true
       - multijob:
           name: 'OPNFV Test Suite'
           condition: ALWAYS
@@ -552,8 +566,9 @@
             - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
               node-parameters: true
               current-parameters: false
-              predefined-parameters:
+              predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                DOCKER_TAG=$DOCKER_TAG
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
@@ -594,12 +609,16 @@
           name: DEPLOY_SCENARIO
           default: '{scenario}'
           description: "Scenario to deploy with."
+      - string:
+          name: DOCKER_TAG
+          default: ''
+          description: Default docker tag to pass to functest
 
     properties:
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -620,8 +639,9 @@
             - name: 'functest-apex-baremetal-daily-{scenario_stream}'
               node-parameters: true
               current-parameters: false
-              predefined-parameters:
+              predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                DOCKER_TAG=$DOCKER_TAG
               kill-phase-on: NEVER
               abort-all-job: false
               git-revision: false
@@ -638,10 +658,10 @@
               abort-all-job: false
               git-revision: false
       - multijob:
-          name: Dovetail-proposed_tests
+          name: Dovetail-default-mandatory
           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:
@@ -651,10 +671,23 @@
               abort-all-job: false
               git-revision: false
       - multijob:
-          name: Dovetail-default
+          name: Dovetail-default-optional
           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:
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              kill-phase-on: NEVER
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
+              abort-all-job: false
+              git-revision: false
+      - multijob:
+          name: Dovetail-proposed_tests
+          condition: ALWAYS
+          projects:
+            - name: 'dovetail-apex-baremetal-proposed_tests-optional-{scenario_stream}'
               node-parameters: true
               current-parameters: false
               predefined-parameters:
@@ -714,7 +747,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-daily.*'
 
@@ -755,6 +788,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'
@@ -784,7 +830,7 @@
 
 # CSIT promote
 - job-template:
-    name: 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}'
+    name: 'apex-{snap_type}-promote-daily-{stream}-os-{os_version}-{topology}'
 
     # Job template for promoting CSIT Snapshots
     #
@@ -814,54 +860,131 @@
           description: "Used for overriding the PROMOTE"
       - string:
           name: GS_URL
-          default: $GS_BASE{gs-pathname}/{os_version}/{topology}
+          default: 'artifacts.opnfv.org/apex/{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
+      - string:
+          name: FORCE_PROMOTE
+          default: 'False'
+          description: "Used to force promotion and skip CSIT"
+      - string:
+          name: SNAP_TYPE
+          default: '{snap_type}'
+          description: Type of snapshot to promote
     properties:
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
             - 'apex-daily.*'
-            - 'apex-csit-promote.*'
+            - 'apex-.*-promote.*'
+            - 'odl-netvirt.*'
       - throttle:
           max-per-node: 1
           max-total: 10
           option: 'project'
 
     triggers:
-      - timed: '0 12 * * 0'
+      - '{stream}-{snap_type}-{os_version}'
 
     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}-{topology}
+                DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}-{snap_type}
                 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
               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: test phase
+          condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
+          projects:
+            - name: cperf-apex-csit-master
+              predefined-parameters: |
+                ODL_BRANCH=$ODL_BRANCH
+                RC_FILE_PATH=/tmp/snap/overcloudrc
+                NODE_FILE_PATH=/tmp/snap/node.yaml
+                SSH_KEY_PATH=/tmp/snap/id_rsa
+                ODL_CONTAINERIZED=true
+                OS_VERSION=$OS_VERSION
+                SKIP_CSIT=$FORCE_PROMOTE
+                SNAP_TYPE=$SNAP_TYPE
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: false
+              enable-condition: "def m = '$SNAP_TYPE' ==~ /csit/"
+            - name: cperf-upload-logs-csit
+              predefined-parameters: |
+                ODL_BRANCH=$ODL_BRANCH
+                OS_VERSION=$OS_VERSION
+                SNAP_TYPE=$SNAP_TYPE
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: false
+              enable-condition: "def m = '$SNAP_TYPE' ==~ /csit/"
+            - name: 'functest-apex-virtual-suite-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                DOCKER_TAG=$DOCKER_TAG
+                FUNCTEST_SUITE_NAME=tempest_smoke
+                FUNCTEST_MODE=testcase
+                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
+              enable-condition: "def m = '$SNAP_TYPE' ==~ /functest/"
+              abort-all-job: true
+              git-revision: 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
           projects:
             - name: 'apex-create-snapshot'
               current-parameters: true
-              predefined-parameters: |
-                SNAP_TYPE=csit
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
@@ -872,8 +995,6 @@
           projects:
             - name: 'apex-upload-snapshot'
               current-parameters: true
-              predefined-parameters: |
-                SNAP_TYPE=csit
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
@@ -905,7 +1026,7 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-deploy.*'
@@ -977,7 +1098,7 @@
 
     project-type: 'multijob'
 
-    disabled: false
+    disabled: true
 
     node: 'flex-pod2'
 
@@ -1011,7 +1132,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -1054,72 +1175,6 @@
               abort-all-job: false
               git-revision: false
 
-# Dovetail Danube test job
-- job-template:
-    name: 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube'
-
-    project-type: 'multijob'
-
-    node: 'huawei-pod4'
-
-    disabled: false
-
-    parameters:
-      - '{project}-defaults'
-      - project-parameter:
-          project: '{project}'
-          branch: 'stable/danube'
-      - apex-parameter:
-          gs-pathname: '/danube'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
-          description: "Scenario to deploy with."
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          block-level: 'NODE'
-          blocking-jobs:
-            - 'apex-verify.*'
-            - 'apex-runner.*'
-            - 'apex-.*-promote.*'
-            - 'apex-run.*'
-
-    triggers:
-      - timed: ''  # '0 1 * * *'
-
-    builders:
-      - description-setter:
-          description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-      - multijob:
-          name: 'Baremetal Deploy'
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-deploy-baremetal-danube'
-              node-parameters: true
-              current-parameters: true
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: false
-      - multijob:
-          name: Dovetail
-          condition: ALWAYS
-          projects:
-            - name: 'dovetail-apex-baremetal-proposed_tests-danube'
-              node-parameters: true
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: NEVER
-              abort-all-job: false
-              git-revision: false
 
 ########################
 # parameter macros
@@ -1166,23 +1221,15 @@
 # builder macros
 ########################
 
-# fraser Builder
+# danube Builder
 - builder:
-    name: apex-builder-fraser
+    name: apex-builder-danube
     builders:
       - multijob:
           name: Baremetal Deploy and Test Phase
           condition: SUCCESSFUL
           projects:
-            - name: 'apex-os-nosdn-nofeature-noha-baremetal-fraser'
-              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-fraser'
+            - name: 'apex-os-nosdn-nofeature-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1190,7 +1237,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-nofeature-ha-baremetal-fraser'
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1198,7 +1245,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-ipv6-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1206,7 +1253,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-bgpvpn-ha-baremetal-fraser'
+            - name: 'apex-os-nosdn-ovs-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1214,7 +1261,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-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1222,7 +1269,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-fdio-noha-baremetal-fraser'
+            - name: 'apex-os-nosdn-fdio-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1230,7 +1277,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-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1238,7 +1285,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-bar-ha-baremetal-fraser'
+            - name: 'apex-os-nosdn-kvm-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1246,7 +1293,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-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1254,7 +1301,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-fraser'
+            - name: 'apex-os-odl_l2-fdio-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1262,7 +1309,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-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1270,7 +1317,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-sfc-noha-baremetal-fraser'
+            - name: 'apex-os-odl_netvirt-fdio-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1278,7 +1325,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-sfc-ha-baremetal-fraser'
+            - name: 'apex-os-odl_l2-sfc-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1286,7 +1333,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-calipso-noha-baremetal-fraser'
+            - name: 'apex-os-odl_l3-nofeature-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1294,16 +1341,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-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1311,7 +1349,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-ovs-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1319,7 +1357,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-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1327,7 +1365,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-ovs-noha-baremetal-danube'
+            - name: 'apex-os-odl-bgpvpn-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1335,7 +1373,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-ovs-ha-baremetal-danube'
+            - name: 'apex-os-odl-gluon-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1343,7 +1381,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-fdio-noha-baremetal-danube'
+            - name: 'apex-os-odl_l3-fdio-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1351,7 +1389,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-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1359,7 +1397,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_dvr-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1367,7 +1405,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-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1375,7 +1413,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-csit-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1383,7 +1421,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l2-fdio-ha-baremetal-danube'
+            - name: 'apex-os-onos-nofeature-ha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1391,7 +1429,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_netvirt-fdio-noha-baremetal-danube'
+            - name: 'apex-os-ovn-nofeature-noha-baremetal-danube'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1399,7 +1437,16 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l2-sfc-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: |
@@ -1407,7 +1454,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-nofeature-noha-baremetal-danube'
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1415,7 +1462,16 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-nofeature-ha-baremetal-danube'
+
+# gambia Builder
+- builder:
+    name: apex-builder-gambia
+    builders:
+      - multijob:
+          name: Baremetal Deploy and Test Phase
+          condition: SUCCESSFUL
+          projects:
+            - name: 'apex-os-nosdn-nofeature-noha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1423,7 +1479,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-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1431,7 +1487,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-ovs-ha-baremetal-danube'
+            - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1439,7 +1495,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-noha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1447,7 +1503,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-gluon-noha-baremetal-danube'
+            - name: 'apex-os-odl-nofeature-ha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1455,7 +1511,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-fdio-noha-baremetal-danube'
+            - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1463,7 +1519,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-fdio-ha-baremetal-danube'
+            - name: 'apex-os-odl-bgpvpn-ha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1471,7 +1527,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-bgpvpn-noha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1479,7 +1535,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-sfc-ha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1487,7 +1543,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl_l3-csit-noha-baremetal-danube'
+            - name: 'apex-os-odl-sfc-noha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1495,7 +1551,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-onos-nofeature-ha-baremetal-danube'
+            - name: 'apex-os-nosdn-calipso-noha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1503,7 +1559,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-ovn-nofeature-noha-baremetal-danube'
+            - name: 'apex-os-ovn-nofeature-ha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1512,47 +1568,15 @@
               abort-all-job: true
               git-revision: false
 
-# master Builder
+# fraser Builder
 - builder:
-    name: apex-builder-master
+    name: apex-builder-fraser
     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: |
-                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
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-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-nosdn-queens-noha-baremetal-master'
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1560,7 +1584,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-queens-ha-baremetal-master'
+            - name: 'apex-os-odl-bgpvpn-ha-baremetal-fraser'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1568,7 +1592,16 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-queens-noha-baremetal-master'
+
+# hunter Builder
+- builder:
+    name: apex-builder-hunter
+    builders:
+      - multijob:
+          name: Baremetal Deploy and Test Phase
+          condition: SUCCESSFUL
+          projects:
+            - name: 'apex-os-nosdn-nofeature-noha-baremetal-hunter'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1576,7 +1609,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-queens-ha-baremetal-master'
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-hunter'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1584,7 +1617,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-master'
+            - name: 'apex-os-ovn-nofeature-ha-baremetal-hunter'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1737,14 +1770,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:
@@ -1771,12 +1796,23 @@
 
 #######################
 # trigger macros
+# timed is in format: 'min hour daymonth month dayweek'
 ########################
 - trigger:
     name: 'apex-master'
     triggers:
       - timed: '0 0 1-31/2 * *'
 
+- trigger:
+    name: 'apex-hunter'
+    triggers:
+      - timed: '0 4 2-30/2 * *'
+
+- trigger:
+    name: 'apex-gambia'
+    triggers:
+      - timed: '0 4 2-30/2 * *'
+
 - trigger:
     name: 'apex-fraser'
     triggers:
@@ -1791,3 +1827,182 @@
     name: 'apex-danube'
     triggers:
       - timed: '0 3 1 1 7'
+
+- trigger:
+    name: 'master-csit-master'
+    triggers:
+      - timed: '0 5 * * *'
+
+- trigger:
+    name: 'master-csit-rocky'
+    triggers:
+      - timed: '0 5 * * *'
+
+- trigger:
+    name: 'master-csit-queens'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'hunter-csit-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'hunter-csit-rocky'
+    triggers:
+      - timed: '0 5 * * *'
+
+- trigger:
+    name: 'hunter-csit-queens'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'gambia-csit-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'gambia-csit-rocky'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'gambia-csit-queens'
+    triggers:
+      - timed: '0 5 * * *'
+
+- trigger:
+    name: 'fraser-csit-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'fraser-csit-rocky'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'fraser-csit-queens'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'euphrates-csit-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'euphrates-csit-rocky'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'euphrates-csit-queens'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'danube-csit-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'danube-csit-rocky'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'danube-csit-queens'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'master-functest-master'
+    triggers:
+      - timed: '0 3 * * *'
+
+- trigger:
+    name: 'master-functest-rocky'
+    triggers:
+      - timed: '0 3 * * *'
+
+- trigger:
+    name: 'master-functest-queens'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'hunter-functest-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'hunter-functest-rocky'
+    triggers:
+      - timed: '0 3 * * *'
+
+- trigger:
+    name: 'hunter-functest-queens'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'gambia-functest-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'gambia-functest-rocky'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'gambia-functest-queens'
+    triggers:
+      - timed: '0 3 * * *'
+
+- trigger:
+    name: 'fraser-functest-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'fraser-functest-rocky'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'fraser-functest-queens'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'euphrates-functest-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'euphrates-functest-rocky'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'euphrates-functest-queens'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'danube-functest-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'danube-functest-rocky'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'danube-functest-queens'
+    triggers:
+      - timed: ''