Merge Apex Daily Jobs

Merged 'apex-daily-master' and 'apex-daily-danube' into
'apex-daily-{stream}'

Change-Id: I2b1e9e3dd0869b6a1f2b1b6415b364a2d9f151d2
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index baad8d3..4e358bf 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -7,8 +7,7 @@
         - 'apex-verify-unit-tests-{stream}'
         - 'apex-runner-cperf-{stream}'
         - 'apex-deploy-{platform}-{stream}'
-        - 'apex-daily-master'
-        - 'apex-daily-danube'
+        - 'apex-daily-{stream}'
         - 'apex-csit-promote-daily-{stream}'
         - 'apex-fdio-promote-daily-{stream}'
         - 'apex-{scenario}-baremetal-{scenario_stream}'
@@ -777,10 +776,8 @@
 #            steps:
 #                - shell: 'echo "Tests Passed"'
 
-
-# danube Daily
 - job-template:
-    name: 'apex-daily-danube'
+    name: 'apex-daily-{stream}'
 
     # Job template for daily build
     #
@@ -789,7 +786,7 @@
     #     branch:    branch (eg. stable)
     project-type: 'multijob'
 
-    node: 'apex-baremetal-danube'
+    node: '{baremetal-slave}'
 
     disabled: false
 
@@ -798,25 +795,25 @@
 
     parameters:
         - '{project}-defaults'
-        - '{project}-baremetal-danube-defaults'
+        - '{project}-baremetal-{stream}-defaults'
         - project-parameter:
             project: '{project}'
-            branch: 'stable/danube'
+            branch: '{branch}'
         - apex-parameter:
-            gs-pathname: '/danube'
+            gs-pathname: '{gs-pathname}'
 
     properties:
         - logrotate-default
 
     triggers:
-        - 'apex-danube'
+        - 'apex-{stream}'
 
     builders:
         - multijob:
             name: build
             condition: SUCCESSFUL
             projects:
-                - name: 'apex-build-danube'
+                - name: 'apex-build-{stream}'
                   current-parameters: false
                   predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
@@ -831,10 +828,10 @@
             name: 'Verify and upload ISO'
             condition: SUCCESSFUL
             projects:
-                - name: 'apex-verify-iso-danube'
+                - name: 'apex-verify-iso-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    BUILD_DIRECTORY=$WORKSPACE/../apex-build-danube/.build
+                    BUILD_DIRECTORY=$WORKSPACE/../apex-build-{stream}/.build
                     GERRIT_BRANCH=$GERRIT_BRANCH
                     GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -843,102 +840,442 @@
                   kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: true
+        - apex-builder-{stream}
+
+# snapshot create
+- job-template:
+    name: 'apex-create-snapshot'
+
+    # Job template for clean
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable)
+
+    disabled: false
+
+    builders:
+        - shell:
+            !include-raw-escape: ./apex-snapshot-create.sh
+
+# snapshot upload
+- job-template:
+    name: 'apex-upload-snapshot'
+
+    # Job template for clean
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable)
+
+    disabled: false
+
+    builders:
+        - inject:
+           properties-content: ARTIFACT_TYPE=snapshot
+        - 'apex-upload-artifact'
+
+# CSIT promote
+- job-template:
+    name: 'apex-csit-promote-daily-{stream}'
+
+    # Job template for promoting CSIT Snapshots
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable)
+    #     branch:    branch (eg. stable)
+    node: '{virtual-slave}'
+    project-type: 'multijob'
+    disabled: false
+
+    scm:
+        - git-scm
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - apex-parameter:
+            gs-pathname: '{gs-pathname}'
+
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            block-level: 'NODE'
+            blocking-jobs:
+                - 'apex-verify.*'
+                - 'apex-deploy.*'
+                - 'apex-runner.*'
+                - 'apex-daily.*'
+
+    triggers:
+        - timed: '0 12 * * 0'
+
+    builders:
         - multijob:
-            name: Baremetal Deploy and Test Phase
+            name: build
             condition: SUCCESSFUL
             projects:
-
-                - name: 'apex-os-nosdn-nofeature-noha-baremetal-danube'
-                  node-parameters: false
+                - name: 'apex-build-{stream}'
                   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-danube'
+                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: false
-                  current-parameters: false
-                  predefined-parameters: |
-                    OPNFV_CLEAN=yes
-                  kill-phase-on: NEVER
+                  kill-phase-on: FAILURE
                   abort-all-job: true
-                  git-revision: false
-
-                - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-danube'
-                  node-parameters: false
+                  git-revision: true
+        - multijob:
+            name: deploy-virtual
+            condition: SUCCESSFUL
+            projects:
+                - name: 'apex-deploy-virtual-{stream}'
                   current-parameters: false
                   predefined-parameters: |
+                    DEPLOY_SCENARIO=os-odl_l3-csit-noha
                     OPNFV_CLEAN=yes
-                  kill-phase-on: NEVER
+                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                    PROMOTE=True
+                  node-parameters: true
+                  kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: false
+        - multijob:
+            name: functest-smoke
+            condition: SUCCESSFUL
+            projects:
+              - name: 'functest-apex-virtual-suite-{stream}'
+                current-parameters: false
+                predefined-parameters: |
+                  DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
+                  FUNCTEST_SUITE_NAME=tempest_smoke_serial
+                  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: FAILURE
+                abort-all-job: true
+                git-revision: false
+        - multijob:
+            name: create snapshot
+            condition: SUCCESSFUL
+            projects:
+              - name: 'apex-create-snapshot'
+                current-parameters: false
+                predefined-parameters: |
+                  SNAP_TYPE=csit
+                node-parameters: true
+                kill-phase-on: FAILURE
+                abort-all-job: true
+                git-revision: false
+        - multijob:
+            name: upload snapshot
+            condition: SUCCESSFUL
+            projects:
+              - name: 'apex-upload-snapshot'
+                current-parameters: false
+                predefined-parameters: |
+                  SNAP_TYPE=csit
+                node-parameters: true
+                kill-phase-on: FAILURE
+                abort-all-job: true
+                git-revision: false
 
-                - name: 'apex-os-nosdn-ovs-noha-baremetal-danube'
-                  node-parameters: false
-                  current-parameters: false
-                  predefined-parameters: |
-                    OPNFV_CLEAN=yes
-                  kill-phase-on: NEVER
-                  abort-all-job: true
-                  git-revision: false
+# FDIO promote
+- job-template:
+    name: 'apex-fdio-promote-daily-{stream}'
 
-                - name: 'apex-os-nosdn-ovs-ha-baremetal-danube'
-                  node-parameters: false
-                  current-parameters: false
-                  predefined-parameters: |
-                    OPNFV_CLEAN=yes
-                  kill-phase-on: NEVER
-                  abort-all-job: true
-                  git-revision: false
+    # Job template for promoting CSIT Snapshots
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable)
+    #     branch:    branch (eg. stable)
+    node: '{virtual-slave}'
+    project-type: 'multijob'
+    disabled: false
 
-                - name: 'apex-os-nosdn-fdio-noha-baremetal-danube'
-                  node-parameters: false
-                  current-parameters: false
-                  predefined-parameters: |
-                    OPNFV_CLEAN=yes
-                  kill-phase-on: NEVER
-                  abort-all-job: true
-                  git-revision: false
+    scm:
+        - git-scm
 
-                - name: 'apex-os-nosdn-fdio-ha-baremetal-danube'
-                  node-parameters: false
-                  current-parameters: false
-                  predefined-parameters: |
-                    OPNFV_CLEAN=yes
-                  kill-phase-on: NEVER
-                  abort-all-job: true
-                  git-revision: false
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - apex-parameter:
+            gs-pathname: '{gs-pathname}'
 
-                - name: 'apex-os-nosdn-kvm-ha-baremetal-danube'
-                  node-parameters: false
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            block-level: 'NODE'
+            blocking-jobs:
+                - 'apex-verify.*'
+                - 'apex-deploy.*'
+                - 'apex-runner.*'
+                - 'apex-daily.*'
+
+    builders:
+        - multijob:
+            name: build
+            condition: SUCCESSFUL
+            projects:
+                - name: 'apex-build-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    OPNFV_CLEAN=yes
-                  kill-phase-on: NEVER
-                  abort-all-job: true
-                  git-revision: false
-
-                - name: 'apex-os-nosdn-kvm-noha-baremetal-danube'
+                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: false
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+                  git-revision: true
+        - multijob:
+            name: deploy-virtual
+            condition: SUCCESSFUL
+            projects:
+                - name: 'apex-deploy-virtual-{stream}'
                   current-parameters: false
                   predefined-parameters: |
+                    DEPLOY_SCENARIO=os-odl_netvirt-fdio-noha
                     OPNFV_CLEAN=yes
-                  kill-phase-on: NEVER
+                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                    PROMOTE=True
+                  node-parameters: true
+                  kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: false
-
-                - name: 'apex-os-odl_l2-fdio-noha-baremetal-danube'
-                  node-parameters: false
-                  current-parameters: false
+        - multijob:
+            name: create snapshot
+            condition: SUCCESSFUL
+            projects:
+              - name: 'apex-create-snapshot'
+                current-parameters: false
+                predefined-parameters: |
+                  SNAP_TYPE=fdio
+                node-parameters: true
+                kill-phase-on: FAILURE
+                abort-all-job: true
+                git-revision: false
+        - multijob:
+            name: upload snapshot
+            condition: SUCCESSFUL
+            projects:
+              - name: 'apex-upload-snapshot'
+                current-parameters: false
+                predefined-parameters: |
+                  SNAP_TYPE=fdio
+                node-parameters: true
+                kill-phase-on: FAILURE
+                abort-all-job: true
+                git-revision: false
+
+# Flex job
+- job-template:
+    name: 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
+
+    project-type: 'multijob'
+
+    disabled: false
+
+    node: 'flex-pod2'
+
+    scm:
+        - git-scm
+    triggers:
+        - 'apex-{stream}'
+    parameters:
+        - '{project}-defaults'
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - apex-parameter:
+            gs-pathname: '{gs-pathname}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-nosdn-nofeature-ha'
+            description: "Scenario to deploy with."
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: SSH_KEY
+            default: /root/.ssh/id_rsa
+            description: 'SSH key to use for Apex'
+    properties:
+        - logrotate-default
+        - build-blocker:
+            use-build-blocker: true
+            block-level: 'NODE'
+            blocking-jobs:
+                - 'apex-verify.*'
+                - 'apex-runner.*'
+                - 'apex-.*-promote.*'
+                - 'apex-run.*'
+                - 'apex-.+-baremetal-.+'
+        - throttle:
+            max-per-node: 1
+            max-total: 10
+            option: 'project'
+    builders:
+        - description-setter:
+            description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
+        - multijob:
+            name: 'Baremetal Deploy'
+            condition: SUCCESSFUL
+            projects:
+                - name: 'apex-deploy-baremetal-{stream}'
+                  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: Yardstick
+            condition: ALWAYS
+            projects:
+                - name: 'yardstick-apex-baremetal-daily-{stream}'
+                  node-parameters: true
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                   kill-phase-on: NEVER
+                  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 12 * * *'
+
+    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
 
-                - name: 'apex-os-odl_l2-fdio-ha-baremetal-danube'
+########################
+# parameter macros
+########################
+- parameter:
+    name: apex-parameter
+    parameters:
+        - string:
+            name: ARTIFACT_NAME
+            default: 'latest'
+            description: "RPM Artifact name that will be appended to GS_URL to deploy a specific artifact"
+        - string:
+            name: ARTIFACT_VERSION
+            default: 'daily'
+            description: "Artifact version type"
+        - string:
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/.build
+            description: "Directory where the build artifact will be located upon the completion of the build."
+        - string:
+            name: CACHE_DIRECTORY
+            default: $HOME/opnfv/apex-cache{gs-pathname}
+            description: "Directory where the cache to be used during the build is located."
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+        - string:
+            name: GS_PATHNAME
+            default: '{gs-pathname}'
+            description: "Version directory where opnfv artifacts are stored in gs repository"
+        - string:
+            name: GS_URL
+            default: $GS_BASE{gs-pathname}
+            description: "URL to Google Storage."
+        - string:
+            name: PROMOTE
+            default: 'False'
+            description: "Flag to know if we should promote/upload snapshot artifacts."
+
+########################
+# builder macros
+########################
+
+# 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: |
@@ -947,7 +1284,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl_netvirt-fdio-noha-baremetal-danube'
+                - name: 'apex-os-nosdn-nofeature-ha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -956,7 +1293,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl_l2-sfc-noha-baremetal-danube'
+                - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -965,7 +1302,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl_l3-nofeature-noha-baremetal-danube'
+                - name: 'apex-os-nosdn-ovs-noha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -974,7 +1311,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl_l3-nofeature-ha-baremetal-danube'
+                - name: 'apex-os-nosdn-ovs-ha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -983,7 +1320,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl_l3-ovs-noha-baremetal-danube'
+                - name: 'apex-os-nosdn-fdio-noha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -992,7 +1329,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl_l3-ovs-ha-baremetal-danube'
+                - name: 'apex-os-nosdn-fdio-ha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1001,7 +1338,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl-bgpvpn-ha-baremetal-danube'
+                - name: 'apex-os-nosdn-kvm-ha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1010,7 +1347,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl-gluon-noha-baremetal-danube'
+                - name: 'apex-os-nosdn-kvm-noha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1019,7 +1356,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl_l3-fdio-noha-baremetal-danube'
+                - name: 'apex-os-odl_l2-fdio-noha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1028,7 +1365,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl_l3-fdio-ha-baremetal-danube'
+                - name: 'apex-os-odl_l2-fdio-ha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1037,7 +1374,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl_l3-fdio_dvr-noha-baremetal-danube'
+                - name: 'apex-os-odl_netvirt-fdio-noha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1046,7 +1383,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl_l3-fdio_dvr-ha-baremetal-danube'
+                - name: 'apex-os-odl_l2-sfc-noha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1055,7 +1392,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl_l3-csit-noha-baremetal-danube'
+                - name: 'apex-os-odl_l3-nofeature-noha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1064,7 +1401,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-onos-nofeature-ha-baremetal-danube'
+                - name: 'apex-os-odl_l3-nofeature-ha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1073,7 +1410,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-ovn-nofeature-noha-baremetal-danube'
+                - name: 'apex-os-odl_l3-ovs-noha-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1082,72 +1419,101 @@
                   abort-all-job: true
                   git-revision: false
 
+                - name: 'apex-os-odl_l3-ovs-ha-baremetal-danube'
+                  node-parameters: false
+                  current-parameters: false
+                  predefined-parameters: |
+                    OPNFV_CLEAN=yes
+                  kill-phase-on: NEVER
+                  abort-all-job: true
+                  git-revision: false
 
-# master Daily
-- job-template:
-    name: 'apex-daily-master'
-
-    # Job template for daily build
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-    project-type: 'multijob'
+                - name: 'apex-os-odl-bgpvpn-ha-baremetal-danube'
+                  node-parameters: false
+                  current-parameters: false
+                  predefined-parameters: |
+                    OPNFV_CLEAN=yes
+                  kill-phase-on: NEVER
+                  abort-all-job: true
+                  git-revision: false
 
-    node: 'apex-baremetal-master'
+                - name: 'apex-os-odl-gluon-noha-baremetal-danube'
+                  node-parameters: false
+                  current-parameters: false
+                  predefined-parameters: |
+                    OPNFV_CLEAN=yes
+                  kill-phase-on: NEVER
+                  abort-all-job: true
+                  git-revision: false
 
-    disabled: false
+                - name: 'apex-os-odl_l3-fdio-noha-baremetal-danube'
+                  node-parameters: false
+                  current-parameters: false
+                  predefined-parameters: |
+                    OPNFV_CLEAN=yes
+                  kill-phase-on: NEVER
+                  abort-all-job: true
+                  git-revision: false
 
-    scm:
-        - git-scm
+                - name: 'apex-os-odl_l3-fdio-ha-baremetal-danube'
+                  node-parameters: false
+                  current-parameters: false
+                  predefined-parameters: |
+                    OPNFV_CLEAN=yes
+                  kill-phase-on: NEVER
+                  abort-all-job: true
+                  git-revision: false
 
-    parameters:
-        - '{project}-defaults'
-        - '{project}-baremetal-master-defaults'
-        - project-parameter:
-            project: '{project}'
-            branch: 'master'
-        - apex-parameter:
-            gs-pathname: ''
+                - name: 'apex-os-odl_l3-fdio_dvr-noha-baremetal-danube'
+                  node-parameters: false
+                  current-parameters: false
+                  predefined-parameters: |
+                    OPNFV_CLEAN=yes
+                  kill-phase-on: NEVER
+                  abort-all-job: true
+                  git-revision: false
 
-    properties:
-        - logrotate-default
+                - name: 'apex-os-odl_l3-fdio_dvr-ha-baremetal-danube'
+                  node-parameters: false
+                  current-parameters: false
+                  predefined-parameters: |
+                    OPNFV_CLEAN=yes
+                  kill-phase-on: NEVER
+                  abort-all-job: true
+                  git-revision: false
 
-    triggers:
-        - 'apex-master'
+                - name: 'apex-os-odl_l3-csit-noha-baremetal-danube'
+                  node-parameters: false
+                  current-parameters: false
+                  predefined-parameters: |
+                    OPNFV_CLEAN=yes
+                  kill-phase-on: NEVER
+                  abort-all-job: true
+                  git-revision: false
 
-    builders:
-        - multijob:
-            name: build
-            condition: SUCCESSFUL
-            projects:
-                - name: 'apex-build-master'
+                - name: 'apex-os-onos-nofeature-ha-baremetal-danube'
+                  node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                  node-parameters: true
-                  kill-phase-on: FAILURE
+                    OPNFV_CLEAN=yes
+                  kill-phase-on: NEVER
                   abort-all-job: true
-                  git-revision: true
-        - multijob:
-            name: 'Verify and upload ISO'
-            condition: SUCCESSFUL
-            projects:
-                - name: 'apex-verify-iso-master'
+                  git-revision: false
+
+                - name: 'apex-os-ovn-nofeature-noha-baremetal-danube'
+                  node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
-                    BUILD_DIRECTORY=$WORKSPACE/../apex-build-master/.build
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                  node-parameters: true
-                  kill-phase-on: FAILURE
+                    OPNFV_CLEAN=yes
+                  kill-phase-on: NEVER
                   abort-all-job: true
-                  git-revision: true
+                  git-revision: false
+
+
+# master Builder
+- builder:
+      name: apex-builder-master
+      builders:
         - multijob:
             name: Baremetal Deploy and Test Phase
             condition: SUCCESSFUL
@@ -1344,429 +1710,6 @@
 
 
 
-# snapshot create
-- job-template:
-    name: 'apex-create-snapshot'
-
-    # Job template for clean
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-
-    disabled: false
-
-    builders:
-        - shell:
-            !include-raw-escape: ./apex-snapshot-create.sh
-
-# snapshot upload
-- job-template:
-    name: 'apex-upload-snapshot'
-
-    # Job template for clean
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-
-    disabled: false
-
-    builders:
-        - inject:
-           properties-content: ARTIFACT_TYPE=snapshot
-        - 'apex-upload-artifact'
-
-# CSIT promote
-- job-template:
-    name: 'apex-csit-promote-daily-{stream}'
-
-    # Job template for promoting CSIT Snapshots
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-    node: '{virtual-slave}'
-    project-type: 'multijob'
-    disabled: false
-
-    scm:
-        - git-scm
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
-
-    properties:
-        - build-blocker:
-            use-build-blocker: true
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-verify.*'
-                - 'apex-deploy.*'
-                - 'apex-runner.*'
-                - 'apex-daily.*'
-
-    triggers:
-        - timed: '0 12 * * 0'
-
-    builders:
-        - multijob:
-            name: build
-            condition: SUCCESSFUL
-            projects:
-                - name: 'apex-build-{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: false
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-                  git-revision: true
-        - multijob:
-            name: deploy-virtual
-            condition: SUCCESSFUL
-            projects:
-                - name: 'apex-deploy-virtual-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO=os-odl_l3-csit-noha
-                    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
-                    PROMOTE=True
-                  node-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-                  git-revision: false
-        - multijob:
-            name: functest-smoke
-            condition: SUCCESSFUL
-            projects:
-              - name: 'functest-apex-virtual-suite-{stream}'
-                current-parameters: false
-                predefined-parameters: |
-                  DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
-                  FUNCTEST_SUITE_NAME=tempest_smoke_serial
-                  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: FAILURE
-                abort-all-job: true
-                git-revision: false
-        - multijob:
-            name: create snapshot
-            condition: SUCCESSFUL
-            projects:
-              - name: 'apex-create-snapshot'
-                current-parameters: false
-                predefined-parameters: |
-                  SNAP_TYPE=csit
-                node-parameters: true
-                kill-phase-on: FAILURE
-                abort-all-job: true
-                git-revision: false
-        - multijob:
-            name: upload snapshot
-            condition: SUCCESSFUL
-            projects:
-              - name: 'apex-upload-snapshot'
-                current-parameters: false
-                predefined-parameters: |
-                  SNAP_TYPE=csit
-                node-parameters: true
-                kill-phase-on: FAILURE
-                abort-all-job: true
-                git-revision: false
-
-# FDIO promote
-- job-template:
-    name: 'apex-fdio-promote-daily-{stream}'
-
-    # Job template for promoting CSIT Snapshots
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-    node: '{virtual-slave}'
-    project-type: 'multijob'
-    disabled: false
-
-    scm:
-        - git-scm
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
-
-    properties:
-        - build-blocker:
-            use-build-blocker: true
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-verify.*'
-                - 'apex-deploy.*'
-                - 'apex-runner.*'
-                - 'apex-daily.*'
-
-    builders:
-        - multijob:
-            name: build
-            condition: SUCCESSFUL
-            projects:
-                - name: 'apex-build-{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: false
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-                  git-revision: true
-        - multijob:
-            name: deploy-virtual
-            condition: SUCCESSFUL
-            projects:
-                - name: 'apex-deploy-virtual-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO=os-odl_netvirt-fdio-noha
-                    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
-                    PROMOTE=True
-                  node-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-                  git-revision: false
-        - multijob:
-            name: create snapshot
-            condition: SUCCESSFUL
-            projects:
-              - name: 'apex-create-snapshot'
-                current-parameters: false
-                predefined-parameters: |
-                  SNAP_TYPE=fdio
-                node-parameters: true
-                kill-phase-on: FAILURE
-                abort-all-job: true
-                git-revision: false
-        - multijob:
-            name: upload snapshot
-            condition: SUCCESSFUL
-            projects:
-              - name: 'apex-upload-snapshot'
-                current-parameters: false
-                predefined-parameters: |
-                  SNAP_TYPE=fdio
-                node-parameters: true
-                kill-phase-on: FAILURE
-                abort-all-job: true
-                git-revision: false
-
-# Flex job
-- job-template:
-    name: 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
-
-    project-type: 'multijob'
-
-    disabled: false
-
-    node: 'flex-pod2'
-
-    scm:
-        - git-scm
-    triggers:
-        - 'apex-{stream}'
-    parameters:
-        - '{project}-defaults'
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-ha'
-            description: "Scenario to deploy with."
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: SSH_KEY
-            default: /root/.ssh/id_rsa
-            description: 'SSH key to use for Apex'
-    properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-verify.*'
-                - 'apex-runner.*'
-                - 'apex-.*-promote.*'
-                - 'apex-run.*'
-                - 'apex-.+-baremetal-.+'
-        - throttle:
-            max-per-node: 1
-            max-total: 10
-            option: 'project'
-    builders:
-        - description-setter:
-            description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-        - multijob:
-            name: 'Baremetal Deploy'
-            condition: SUCCESSFUL
-            projects:
-                - name: 'apex-deploy-baremetal-{stream}'
-                  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: Yardstick
-            condition: ALWAYS
-            projects:
-                - name: 'yardstick-apex-baremetal-daily-{stream}'
-                  node-parameters: true
-                  current-parameters: false
-                  predefined-parameters:
-                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                  kill-phase-on: NEVER
-                  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 12 * * *'
-
-    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
-########################
-- parameter:
-    name: apex-parameter
-    parameters:
-        - string:
-            name: ARTIFACT_NAME
-            default: 'latest'
-            description: "RPM Artifact name that will be appended to GS_URL to deploy a specific artifact"
-        - string:
-            name: ARTIFACT_VERSION
-            default: 'daily'
-            description: "Artifact version type"
-        - string:
-            name: BUILD_DIRECTORY
-            default: $WORKSPACE/.build
-            description: "Directory where the build artifact will be located upon the completion of the build."
-        - string:
-            name: CACHE_DIRECTORY
-            default: $HOME/opnfv/apex-cache{gs-pathname}
-            description: "Directory where the cache to be used during the build is located."
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
-        - string:
-            name: GS_PATHNAME
-            default: '{gs-pathname}'
-            description: "Version directory where opnfv artifacts are stored in gs repository"
-        - string:
-            name: GS_URL
-            default: $GS_BASE{gs-pathname}
-            description: "URL to Google Storage."
-        - string:
-            name: PROMOTE
-            default: 'False'
-            description: "Flag to know if we should promote/upload snapshot artifacts."
-
-########################
-# builder macros
-########################
 - builder:
     name: 'apex-unit-test'
     builders:

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index df8cf92..410241c 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -7,8 +7,7 @@
         - 'apex-verify-unit-tests-{stream}'
         - 'apex-runner-cperf-{stream}'
         - 'apex-deploy-{platform}-{stream}'
-        - 'apex-daily-master'
-        - 'apex-daily-danube'
+        - 'apex-daily-{stream}'
         - 'apex-csit-promote-daily-{stream}'
         - 'apex-fdio-promote-daily-{stream}'
         - 'apex-{scenario}-baremetal-{scenario_stream}'
@@ -689,10 +688,8 @@
 #            steps:
 #                - shell: 'echo "Tests Passed"'
 
-{% for stream in scenarios %}
-# {{ stream }} Daily
 - job-template:
-    name: 'apex-daily-{{ stream }}'
+    name: 'apex-daily-{stream}'
 
     # Job template for daily build
     #
@@ -701,7 +698,7 @@
     #     branch:    branch (eg. stable)
     project-type: 'multijob'
 
-    node: '{{ build_slave[stream] }}'
+    node: '{baremetal-slave}'
 
     disabled: false
 
@@ -710,25 +707,25 @@
 
     parameters:
         - '{project}-defaults'
-        - '{project}-baremetal-{{ stream }}-defaults'
+        - '{project}-baremetal-{stream}-defaults'
         - project-parameter:
             project: '{project}'
-            branch: '{{ branch[stream] }}'
+            branch: '{branch}'
         - apex-parameter:
-            gs-pathname: '{{ gspathname[stream] }}'
+            gs-pathname: '{gs-pathname}'
 
     properties:
         - logrotate-default
 
     triggers:
-        - 'apex-{{ stream }}'
+        - 'apex-{stream}'
 
     builders:
         - multijob:
             name: build
             condition: SUCCESSFUL
             projects:
-                - name: 'apex-build-{{ stream }}'
+                - name: 'apex-build-{stream}'
                   current-parameters: false
                   predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
@@ -743,10 +740,10 @@
             name: 'Verify and upload ISO'
             condition: SUCCESSFUL
             projects:
-                - name: 'apex-verify-iso-{{ stream }}'
+                - name: 'apex-verify-iso-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    BUILD_DIRECTORY=$WORKSPACE/../apex-build-{{ stream }}/.build
+                    BUILD_DIRECTORY=$WORKSPACE/../apex-build-{stream}/.build
                     GERRIT_BRANCH=$GERRIT_BRANCH
                     GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -755,21 +752,7 @@
                   kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: true
-        - multijob:
-            name: Baremetal Deploy and Test Phase
-            condition: SUCCESSFUL
-            projects:
-{% for scenario in scenarios[stream] %}
-                - name: 'apex-{{ scenario }}-baremetal-{{ stream }}'
-                  node-parameters: false
-                  current-parameters: false
-                  predefined-parameters: |
-                    OPNFV_CLEAN=yes
-                  kill-phase-on: NEVER
-                  abort-all-job: true
-                  git-revision: false
-{% endfor %}
-{% endfor %}
+        - apex-builder-{stream}
 
 # snapshot create
 - job-template:
@@ -1194,6 +1177,27 @@
 ########################
 # builder macros
 ########################
+{% for stream in scenarios %}
+# {{ stream }} Builder
+- builder:
+      name: apex-builder-{{ stream }}
+      builders:
+        - multijob:
+            name: Baremetal Deploy and Test Phase
+            condition: SUCCESSFUL
+            projects:
+{% for scenario in scenarios[stream] %}
+                - name: 'apex-{{ scenario }}-baremetal-{{ stream }}'
+                  node-parameters: false
+                  current-parameters: false
+                  predefined-parameters: |
+                    OPNFV_CLEAN=yes
+                  kill-phase-on: NEVER
+                  abort-all-job: true
+                  git-revision: false
+{% endfor %}
+{% endfor %}
+
 - builder:
     name: 'apex-unit-test'
     builders: