X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml;h=89b0a9343f372c7ee62383c5a8f48f1ea51d3c36;hb=1bb2dbc9d552611c00f072e1369a2c02dc9a5676;hp=ec88031b1c01b2935fc3d827ad6ddc2423142dd4;hpb=e65c585aec4c31834872bdb5450241cbac92f142;p=releng.git

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index ec88031b1..89b0a9343 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -1,12 +1,14 @@
 - project:
     name: apex
     jobs:
-        - 'apex-verify-{stream}'
-        - 'apex-merge-{stream}'
+        - 'apex-verify-{stream1}'
+        - 'apex-verify-{stream2}'
+        - 'apex-runner-{platform}-{scenario}-{stream}'
         - 'apex-build-{stream}'
-        - 'apex-deploy-virtual-{stream}'
-        - 'apex-deploy-baremetal-{stream}'
-        - 'apex-daily-{stream}'
+        - 'apex-deploy-virtual-{scenario}-{stream}'
+        - 'apex-deploy-baremetal-{scenario}-{stream}'
+        - 'apex-daily-{stream1}'
+        - 'apex-daily-{stream2}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
@@ -14,13 +16,49 @@
         - master:
             branch: 'master'
             gs-pathname: ''
+            block-stream: 'brahmaputra'
+            slave: 'intel-pod7'
+        - brahmaputra:
+            branch: 'stable/brahmaputra'
+            gs-pathname: '/brahmaputra'
+            block-stream: 'master'
+            slave: 'opnfv-jump-1'
+            disabled: false
+
+    stream1:
+        - master:
+            branch: 'master'
+            gs-pathname: ''
+            block-stream: 'brahmaputra'
+            slave: 'intel-pod7'
+
+    stream2:
+        - brahmaputra:
+            branch: 'stable/brahmaputra'
+            gs-pathname: '/brahmaputra'
+            block-stream: 'master'
+            slave: 'opnfv-jump-1'
+            disabled: false
 
     project: 'apex'
 
+    scenario:
+         - 'os-nosdn-nofeature-ha'
+         - 'os-odl_l2-nofeature-ha'
+         - 'os-odl_l2-sfc-noha'
+         - 'os-odl_l3-nofeature-ha'
+         - 'os-onos-nofeature-ha'
+         - 'os-opencontrail-nofeature-ha'
+
+    platform:
+         - 'baremetal'
+         - 'virtual'
+
+# Brahmaputra Verify
 - job-template:
-    name: 'apex-verify-{stream}'
+    name: 'apex-verify-{stream2}'
 
-    node: intel-us-deploy-virtual-2
+    node: '{slave}'
 
     parameters:
         - apex-parameter:
@@ -46,7 +84,7 @@
                 - patchset-created-event:
                     exclude-drafts: 'false'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
@@ -57,32 +95,64 @@
                 project-pattern: 'apex'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
-                forbidden-file-paths:
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'ci/**'
+                  - compare-type: ANT
+                    pattern: 'build/**'
                   - compare-type: ANT
-                    pattern: 'docs/**'
+                    pattern: 'lib/**'
+                  - compare-type: ANT
+                    pattern: 'config/**'
 
     properties:
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - "apex-daily.*"
+                - 'apex-daily.*{stream2}'
+                - 'apex-deploy.*{stream2}'
+                - 'apex-build.*{stream2}'
+                - 'apex-runner.*{stream2}'
+                - 'apex-verify-{stream2}'
 
     builders:
         - 'apex-build'
-        - 'apex-deploy-virtual'
+        - trigger-builds:
+          - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream2}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-verify-{stream2}/build_output
+              OPNFV_CLEAN=yes
+            git-revision: false
+            block: true
+        - trigger-builds:
+          - project: 'apex-deploy-virtual-os-onos-nofeature-ha-{stream2}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-verify-{stream2}/build_output
+              OPNFV_CLEAN=yes
+            git-revision: false
+            block: true
+        - trigger-builds:
+          - project: 'apex-deploy-virtual-os-odl_l3-nofeature-ha-{stream2}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-verify-{stream2}/build_output
+              OPNFV_CLEAN=yes
+            git-revision: false
+            block: true
+        - trigger-builds:
+          - project: 'apex-deploy-virtual-os-odl_l2-sfc-noha-{stream2}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-verify-{stream2}/build_output
+              OPNFV_CLEAN=yes
+            git-revision: false
+            block: true
         - 'apex-workspace-cleanup'
 
+# Master Verify
 - job-template:
-    name: 'apex-merge-{stream}'
+    name: 'apex-verify-{stream1}'
 
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
-
-    node: intel-us-deploy-virtual-2
-
-    disabled: true
+    node: '{slave}'
 
     parameters:
         - apex-parameter:
@@ -99,30 +169,118 @@
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
 
     triggers:
         - gerrit:
             trigger-on:
-                - change-merged-event
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'true'
+                - draft-published-event
                 - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: 'apex'
                 branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-                forbidden-file-paths:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'ci/**'
+                  - compare-type: ANT
+                    pattern: 'build/**'
+                  - compare-type: ANT
+                    pattern: 'lib/**'
                   - compare-type: ANT
-                    pattern: 'docs/**'
+                    pattern: 'config/**'
+
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'apex-daily.*{stream1}'
+                - 'apex-deploy.*{stream1}'
+                - 'apex-build.*{stream1}'
+                - 'apex-runner.*{stream1}'
+                - 'apex-verify-{stream1}'
 
     builders:
         - 'apex-build'
-        - 'apex-deploy-virtual'
+        - trigger-builds:
+          - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream1}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-verify-{stream1}/build_output
+              OPNFV_CLEAN=yes
+            git-revision: false
+            block: true
         - 'apex-workspace-cleanup'
 
+- job-template:
+    name: 'apex-runner-{platform}-{scenario}-{stream}'
+
+    # runner jobs for deploying manually
+
+    node: '{slave}'
+
+    disabled: false
+
+    parameters:
+        - apex-parameter:
+            gs-pathname: '{gs-pathname}'
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Used for overriding the GIT URL coming from parameters macro."
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'apex-daily.*{stream}'
+                - 'apex-verify.*{stream}'
+
+    builders:
+        - trigger-builds:
+          - project: 'apex-deploy-{platform}-{scenario}-{stream}'
+            predefined-parameters:
+              OPNFV_CLEAN=yes
+            git-revision: false
+            block: true
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'functest-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+
 - job-template:
     name: 'apex-build-{stream}'
 
@@ -131,7 +289,7 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: intel-us-deploy-virtual-2
+    node: '{slave}'
 
     disabled: false
 
@@ -153,21 +311,32 @@
             refspec: ''
             branch: '{branch}'
 
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'apex-deploy.*{stream}'
+
     builders:
         - 'apex-build'
-        - 'apex-deploy-virtual'
+        - trigger-builds:
+          - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/build_output
+              OPNFV_CLEAN=yes
+            git-revision: false
+            block: true
         - 'apex-upload-artifact'
-        - 'apex-workspace-cleanup'
 
 - job-template:
-    name: 'apex-deploy-virtual-{stream}'
+    name: 'apex-deploy-virtual-{scenario}-{stream}'
 
     # Job template for virtual deployment
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: intel-us-deploy-virtual-2
+    node: '{slave}'
 
     disabled: false
 
@@ -182,20 +351,34 @@
             project: '{project}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: '{scenario}'
+            description: "Scenario to deploy with."
+        - string:
+            name: OPNFV_CLEAN
+            default: 'no'
+            description: "Use yes in lower case to invoke clean. Indicates if the deploy environment should be cleaned before deployment"
+
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'apex-deploy.*{stream}'
 
     builders:
         - 'apex-deploy-virtual'
         - 'apex-workspace-cleanup'
 
 - job-template:
-    name: 'apex-deploy-baremetal-{stream}'
+    name: 'apex-deploy-baremetal-{scenario}-{stream}'
 
     # Job template for baremetal deployment
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: opnfv-jump-1
+    node: '{slave}'
 
     disabled: false
 
@@ -210,20 +393,151 @@
             project: '{project}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: '{scenario}'
+            description: "Scenario to deploy with."
+
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'apex-verify.*{stream}'
+                - 'apex-deploy.*{stream}'
+                - 'apex-build.*{stream}'
+
 
     builders:
         - 'apex-deploy-baremetal'
         - 'apex-workspace-cleanup'
 
+# Brahmaputra Daily
+- job-template:
+    name: 'apex-daily-{stream2}'
+
+    # Job template for daily build
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable)
+    #     branch:    branch (eg. stable)
+    node: '{slave}'
+
+    disabled: false
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - apex-parameter:
+            gs-pathname: '{gs-pathname}'
+
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'apex-verify.*{stream2}'
+                - 'apex-deploy.*{stream2}'
+                - 'apex-build.*{stream2}'
+                - 'apex-runner.*{stream2}'
+
+    triggers:
+        - 'apex-{stream2}'
+
+    builders:
+        - trigger-builds:
+          - project: 'apex-build-{stream2}'
+            git-revision: true
+            current-parameters: true
+            block: true
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream2}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream2}/build_output
+              OPNFV_CLEAN=yes
+            git-revision: true
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{slave}-daily-{stream2}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream2}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-onos-nofeature-ha-{stream2}'
+            predefined-parameters:
+              BUILD_DIRECTORY=apex-build-{stream2}/build_output
+            git-revision: true
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{slave}-daily-{stream2}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-onos-nofeature-ha
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream2}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-onos-nofeature-ha
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream2}'
+            predefined-parameters:
+              BUILD_DIRECTORY=apex-build-{stream2}/build_output
+            git-revision: true
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{slave}-daily-{stream2}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream2}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+
+# Master Daily
 - job-template:
-    name: 'apex-daily-{stream}'
+    name: 'apex-daily-{stream1}'
 
     # Job template for daily build
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: intel-us-deploy-virtual-2
+    node: '{slave}'
 
     disabled: false
 
@@ -243,24 +557,40 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - "apex-daily.*"
+                - 'apex-verify.*{stream1}'
+                - 'apex-deploy.*{stream1}'
+                - 'apex-build.*{stream1}'
+                - 'apex-runner.*{stream1}'
 
     triggers:
-        - 'apex-{stream}'
+        - 'apex-{stream1}'
 
     builders:
         - trigger-builds:
-          - project: 'apex-build-{stream}'
+          - project: 'apex-build-{stream1}'
             git-revision: true
+            current-parameters: true
             block: true
         - trigger-builds:
-          - project: 'apex-deploy-virtual-{stream}'
+          - project: 'apex-deploy-virtual-nosdn-nofeature-ha-{stream1}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream1}/build_output
+              OPNFV_CLEAN=yes
             git-revision: true
             block: true
         - trigger-builds:
-          - project: 'apex-deploy-baremetal-{stream}'
+          - project: 'functest-apex-{slave}-daily-{stream1}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
         - trigger-builds:
-          - project: 'functest-apex-intel-us-deploy-virtual-2-daily-{stream}'
+          - project: 'yardstick-apex-{slave}-daily-{stream1}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
             block: true
             block-thresholds:
                 build-step-failure-threshold: 'never'
@@ -277,13 +607,17 @@
             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_output
             description: "Directory where the build artifact will be located upon the completion of the build."
         - string:
             name: CACHE_DIRECTORY
-            default: $HOME/opnfv/cache/{gs-pathname}
+            default: $HOME/opnfv/cache{gs-pathname}
             description: "Directory where the cache to be used during the build is located."
         - string:
             name: GIT_BASE
@@ -291,7 +625,7 @@
             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_URL
-            default: artifacts.opnfv.org/$PROJECT/{gs-pathname}
+            default: artifacts.opnfv.org/$PROJECT{gs-pathname}
             description: "URL to Google Storage."
 
 ########################
@@ -312,10 +646,37 @@
             # create the cache directory if it doesn't exist
             [[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY
             # set OPNFV_ARTIFACT_VERSION
-            export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S")
+            if echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then
+              if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
+                export OPNFV_ARTIFACT_VERSION=brahmaputra-dev${BUILD_NUMBER}
+                export BUILD_ARGS="-v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY"
+              else
+                export OPNFV_ARTIFACT_VERSION=dev${BUILD_NUMBER}
+                export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY"
+              fi
+            elif [ "$ARTIFACT_VERSION" == "daily" ]; then
+              if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
+                export OPNFV_ARTIFACT_VERSION=brahmaputra-$(date -u +"%Y-%m-%d")
+                export BUILD_ARGS="-v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY"
+              else
+                export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
+                export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY --iso"
+              fi
+            else
+              export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION}
+              if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
+                export BUILD_ARGS="-v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY"
+              else
+                export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY --iso"
+              fi
+            fi
+            # clean for stable but doesn't matter for master
+            if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
+              sudo opnfv-clean
+            fi
             # start the build
             cd $WORKSPACE/ci
-            ./build.sh -v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY
+            ./build.sh $BUILD_ARGS
             RPM_VERSION=$(grep Version $BUILD_DIRECTORY/../build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
             # list the contents of BUILD_OUTPUT directory
             ls -al $BUILD_DIRECTORY
@@ -331,8 +692,8 @@
                 echo "OPNFV_RPM_MD5SUM=$(md5sum $BUILD_DIRECTORY/opnfv-apex-$RPM_VERSION.noarch.rpm | cut -d' ' -f1)"
                 echo "OPNFV_BUILD_URL=$BUILD_URL"
             ) > $WORKSPACE/opnfv.properties
-            echo
             echo "--------------------------------------------------------"
+            echo "Done!"
 
 - builder:
     name: 'apex-workspace-cleanup'
@@ -365,8 +726,19 @@
 
             # upload artifact and additional files to google storage
             gsutil cp $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1
-            gsutil cp $BUILD_DIRECTORY/$(basename $OPNFV_RPM_URL) gs://$GS_URL/$(basename $OPNFV_RPM_URL) > gsutil.iso.log 2>&1
-            gsutil cp $BUILD_DIRECTORY/$(basename $OPNFV_SRPM_URL) gs://$GS_URL/$(basename $OPNFV_SRPM_URL) > gsutil.iso.log 2>&1
+            RPM_INSTALL_PATH=$BUILD_DIRECTORY/$(basename $OPNFV_RPM_URL)
+            RPM_LIST=$RPM_INSTALL_PATH
+            for pkg in common undercloud opendaylight-sfc; do
+                RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
+            done
+            SRPM_INSTALL_PATH=$BUILD_DIRECTORY/$(basename $OPNFV_SRPM_URL)
+            SRPM_LIST=$SRPM_INSTALL_PATH
+            for pkg in common undercloud opendaylight-sfc; do
+                SRPM_LIST+=" ${SRPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
+            done
+            for artifact in $RPM_LIST $SRPM_LIST; do
+              gsutil cp $artifact gs://$GS_URL/$(basename $artifact) > gsutil.iso.log 2>&1
+            done
             gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1
             gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1
 
@@ -390,17 +762,39 @@
             echo "--------------------------------------------------------"
             echo
 
-            if [[ ! "$ARTIFACT_NAME" == "latest" ]]; then
+            if [[ $BUILD_DIRECTORY == *verify-master* ]]; then
+                cd $WORKSPACE/../${BUILD_DIRECTORY/build_output/}
+                WORKSPACE=$(pwd)
+                echo "WORKSPACE modified to $WORKSPACE"
+                cd $WORKSPACE/ci
+            elif [[ ! "$ARTIFACT_NAME" == "latest" ]]; then
                 # if artifact name is passed the pull a
                 # specific artifact from artifacts.opnfv.org
                 RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME
             else
-                if [[ -f opnfv.properties ]]; then
+                if [[ $BUILD_DIRECTORY == *verify* ]]; then
+                  BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY
+                  echo "BUILD DIRECTORY modified to $BUILD_DIRECTORY"
+                elif [[ $BUILD_DIRECTORY == *apex-build* ]]; then
+                  BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY
+                  echo "BUILD DIRECTORY modified to $BUILD_DIRECTORY"
+                fi
+
+                if [[ -f ${BUILD_DIRECTORY}/../opnfv.properties ]]; then
                     # if opnfv.properties exists then use the
                     # local build. Source the file so we get local OPNFV vars
-                    source opnfv.properties
-                    RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL)
+                    source ${BUILD_DIRECTORY}/../opnfv.properties
+                    RPM_INSTALL_PATH=${BUILD_DIRECTORY}/$(basename $OPNFV_RPM_URL)
                 else
+                    if [[ $BUILD_DIRECTORY == *verify* ]]; then
+                      echo "BUILD_DIRECTORY is from a verify job, so will not use latest from URL"
+                      echo "Check that the slave has opnfv.properties in $BUILD_DIRECTORY"
+                      exit 1
+                    elif [[ $BUILD_DIRECTORY == *apex-build* ]]; then
+                      echo "BUILD_DIRECTORY is from a daily job, so will not use latest from URL"
+                      echo "Check that the slave has opnfv.properties in $BUILD_DIRECTORY"
+                      exit 1
+                    fi
                     # no opnfv.properties means use the latest from artifacts.opnfv.org
                     # get the latest.properties to get the link to the latest artifact
                     curl -s -o $WORKSPACE/opnfv.properties http://$GS_URL/latest.properties
@@ -411,25 +805,55 @@
                 fi
             fi
 
-            source opnfv.properties
-            RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL)
+            if [ -z "$DEPLOY_SCENARIO" ]; then
+              echo "Deploy scenario not set!"
+              exit 1
+            fi
 
-            # update / install the new rpm
-            if rpm -q opnfv-apex > /dev/null; then
-               if sudo yum update -y $RPM_INSTALL_PATH | grep "does not update installed package"; then
-                   sudo yum downgrade -y $RPM_INSTALL_PATH;
-               fi
+            # use local build for verify
+            if [[ $BUILD_DIRECTORY == *verify-master* ]]; then
+                if [ ! -e "${WORKSPACE}/build/lib" ]; then ln -s ${WORKSPACE}/lib ${WORKSPACE}/build/lib; fi
+                DEPLOY_CMD="./deploy.sh -c ${WORKSPACE}/build -r ${WORKSPACE}/build/images/"
+                DEPLOY_FILE="${WORKSPACE}/config/deploy/${DEPLOY_SCENARIO}.yaml"
+                NETWORK_FILE="${WORKSPACE}/config/network/network_settings.yaml"
             else
-               sudo yum install -y $RPM_INSTALL_PATH;
+                RPM_LIST=$RPM_INSTALL_PATH
+                for pkg in common undercloud opendaylight-sfc; do
+                    RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
+                done
+
+                # update / install the new rpm
+                if rpm -q opnfv-apex > /dev/null; then
+                   if [ $(basename $OPNFV_RPM_URL) == $(rpm -q opnfv-apex).rpm ]; then
+                     echo "RPM is already installed"
+                   elif sudo yum update -y $RPM_LIST | grep "does not update installed package"; then
+                       if ! sudo yum downgrade -y $RPM_LIST; then
+                         sudo yum remove -y opnfv-undercloud opnfv-common
+                         sudo yum downgrade -y $RPM_INSTALL_PATH
+                       fi
+                   fi
+                else
+                   sudo yum install -y $RPM_LIST;
+                fi
+                DEPLOY_CMD=opnfv-deploy
+                DEPLOY_FILE="/etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml"
+                NETWORK_FILE="/etc/opnfv-apex/network_settings.yaml"
             fi
 
-            # cleanup virtual machines before we start
-            sudo opnfv-clean
+            if [ "$OPNFV_CLEAN" == 'yes' ]; then
+                if [[ $BUILD_DIRECTORY == *verify-master* ]]; then
+                    sudo ./clean.sh
+                else
+                    sudo opnfv-clean
+                fi
+            fi
             # initiate virtual deployment
-            if [ -e /usr/share/doc/opnfv/network_settings.yaml.example ]; then
-              sudo opnfv-deploy -v -d /usr/share/doc/opnfv/deploy_settings.yaml.example -n /usr/share/doc/opnfv/network_settings.yaml.example
+            echo "Deploy Scenario set to ${DEPLOY_SCENARIO}"
+            if [ -e $DEPLOY_FILE ]; then
+              sudo $DEPLOY_CMD -v -d ${DEPLOY_FILE} -n $NETWORK_FILE --debug
             else
-              sudo opnfv-deploy -v
+              echo "File does not exist /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml"
+              exit 1
             fi
             echo
             echo "--------------------------------------------------------"
@@ -454,11 +878,15 @@
                 # specific artifact from artifacts.opnfv.org
                 RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME
             else
-                if [[ -f opnfv.properties ]]; then
+                if [[ $BUILD_DIRECTORY == *apex-build* ]]; then
+                  BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY
+                  echo "BUILD DIRECTORY modified to $BUILD_DIRECTORY"
+                fi
+                if [[ -f ${BUILD_DIRECTORY}/../opnfv.properties ]]; then
                     # if opnfv.properties exists then use the
                     # local build. Source the file so we get local OPNFV vars
-                    source opnfv.properties
-                    RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL)
+                    source ${BUILD_DIRECTORY}/../opnfv.properties
+                    RPM_INSTALL_PATH=${BUILD_DIRECTORY}/$(basename $OPNFV_RPM_URL)
                 else
                     # no opnfv.properties means use the latest from artifacts.opnfv.org
                     # get the latest.properties to get the link to the latest artifact
@@ -470,29 +898,51 @@
                 fi
             fi
 
-            source opnfv.properties
-            RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL)
             if [ ! -e "$RPM_INSTALL_PATH" ]; then
                RPM_INSTALL_PATH=http://${OPNFV_RPM_URL}
             fi
 
+            RPM_LIST=$RPM_INSTALL_PATH
+            for pkg in common undercloud; do
+                RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
+            done
+
             # update / install the new rpm
             if rpm -q opnfv-apex > /dev/null; then
                if [ $(basename $OPNFV_RPM_URL) == $(rpm -q opnfv-apex).rpm ]; then
                  echo "RPM is already installed"
-               elif sudo yum update -y $RPM_INSTALL_PATH | grep "does not update installed package"; then
-                   sudo yum downgrade -y $RPM_INSTALL_PATH;
+               elif sudo yum update -y $RPM_LIST | grep "does not update installed package"; then
+                   if ! sudo yum downgrade -y $RPM_LIST; then
+                     sudo yum remove -y opnfv-undercloud opnfv-common
+                     sudo yum downgrade -y $RPM_INSTALL_PATH
+                   fi
                fi
             else
-               sudo yum install -y $RPM_INSTALL_PATH;
+               sudo yum install -y $RPM_LIST;
             fi
 
             # cleanup environment before we start
             sudo opnfv-clean
             # initiate baremetal deployment
-            sudo opnfv-deploy -i  /root/inventory/pod_settings.yaml \
-            -d /usr/share/doc/opnfv/deploy_settings.yaml.example \
-            -n /root/network/network_settings.yaml
+            if [ -e /etc/opnfv-apex/network_settings.yaml ]; then
+              if [ -n "$DEPLOY_SCENARIO" ]; then
+                echo "Deploy Scenario set to ${DEPLOY_SCENARIO}"
+                if [ -e /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml ]; then
+                  sudo opnfv-deploy -i  /root/inventory/pod_settings.yaml \
+                  -d /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml \
+                  -n /root/network/network_settings.yaml --debug
+                else
+                  echo "File does not exist /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml"
+                  exit 1
+                fi
+              else
+                echo "Deploy scenario not set!"
+                exit 1
+              fi
+            else
+              echo "File /etc/opnfv-apex/network_settings.yaml does not exist!"
+              exit 1
+            fi
 
             echo
             echo "--------------------------------------------------------"
@@ -505,3 +955,7 @@
     name: 'apex-master'
     triggers:
         - timed: '0 3 * * *'
+- trigger:
+    name: 'apex-brahmaputra'
+    triggers:
+        - timed: '0 3 * * *'