X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml.j2;h=27a854dd720ad64c0a4d425624972962ef536ae4;hb=f47a682614fa0d68fb5bba6abeacb2fcf87ee537;hp=499e426564b807e77fd0cecf00f35758a4a4dc26;hpb=2efecc1438fdaed8aa7e9f4eb4c4b42b4fbef1fc;p=releng.git

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 499e42656..27a854dd7 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -1,350 +1,63 @@
+---
 - project:
     name: 'apex'
     project: 'apex'
     jobs:
-        - 'apex-verify-{stream}'
-        - 'apex-verify-gate-{stream}'
-        - 'apex-verify-unit-tests-{stream}'
-        - 'apex-runner-cperf-{stream}'
-        - 'apex-build-{stream}'
-        - 'apex-deploy-{platform}-{stream}'
-        - 'apex-daily-master'
-        - 'apex-daily-danube'
-        - 'apex-csit-promote-daily-{stream}'
-        - 'apex-fdio-promote-daily-{stream}'
-        - 'apex-verify-iso-{stream}'
-        - 'apex-{scenario}-baremetal-{scenario_stream}'
-        - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
-        - 'apex-upload-snapshot'
-        - 'apex-create-snapshot'
+      - 'apex-runner-cperf-{stream}'
+      - 'apex-virtual-{stream}'
+      - 'apex-deploy-{platform}-{stream}'
+      - 'apex-daily-{stream}'
+      - 'apex-csit-promote-daily-{stream}'
+      - 'apex-fdio-promote-daily-{stream}'
+      - 'apex-{scenario}-baremetal-{scenario_stream}'
+      - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
+      - 'apex-upload-snapshot'
+      - 'apex-create-snapshot'
+      - '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:
-        - master: &master
-            branch: 'master'
-            gs-pathname: ''
-            build-slave: 'apex-build-master'
-            virtual-slave: 'apex-virtual-master'
-            baremetal-slave: 'apex-baremetal-master'
-            verify-scenario: 'os-odl-nofeature-ha'
-            concurrent-builds: 3
-            scenario_stream: 'master'
-
-        - danube: &danube
-            branch: 'stable/danube'
-            gs-pathname: '/danube'
-            build-slave: 'apex-build-danube'
-            virtual-slave: 'apex-virtual-danube'
-            baremetal-slave: 'apex-baremetal-danube'
-            verify-scenario: 'os-odl_l3-nofeature-ha'
-            concurrent-builds: 1
-            scenario_stream: 'danube'
-            disabled: true
+      - master: &master
+          branch: 'master'
+          gs-pathname: ''
+          build-slave: 'apex-build-master'
+          virtual-slave: 'apex-virtual-master'
+          baremetal-slave: 'apex-baremetal-master'
+          verify-scenario: 'os-odl-nofeature-ha'
+          scenario_stream: 'master'
+          disable_daily: false
+      - euphrates: &euphrates
+          branch: 'stable/euphrates'
+          gs-pathname: '/euphrates'
+          build-slave: 'apex-build-master'
+          virtual-slave: 'apex-virtual-master'
+          baremetal-slave: 'apex-baremetal-master'
+          verify-scenario: 'os-odl-nofeature-ha'
+          scenario_stream: 'euphrates'
+          disable_daily: true
+      - danube: &danube
+          branch: 'stable/danube'
+          gs-pathname: '/danube'
+          build-slave: 'apex-build-danube'
+          virtual-slave: 'apex-virtual-danube'
+          baremetal-slave: 'apex-baremetal-danube'
+          verify-scenario: 'os-odl_l3-nofeature-ha'
+          scenario_stream: 'danube'
+          disabled: true
+          disable_daily: true
 
     scenario:
-        {%- for stream in scenarios %}
-        {%- for scenario in scenarios[stream] %}
-        - '{{scenario}}':
-              <<: *{{stream}}
-        {%- endfor %}
-        {%- endfor %}
+      {%- for stream in scenarios %}
+      {%- for scenario in scenarios[stream] %}
+      - '{{scenario}}':
+          <<: *{{stream}}
+      {%- endfor %}
+      {%- endfor %}
 
     platform:
-         - 'baremetal'
-         - 'virtual'
-
-# Unit Test
-- job-template:
-    name: 'apex-verify-unit-tests-{stream}'
-
-    node: '{build-slave}'
-
-    concurrent: true
-
-    parameters:
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-
-    scm:
-        - git-scm-gerrit
-
-    triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - 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: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'apex'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'apex/tests/**'
-    properties:
-        - logrotate-default
-        - throttle:
-            max-per-node: 1
-            max-total: 10
-            option: 'project'
-
-    builders:
-        - shell:
-            !include-raw-escape: ./apex-unit-test.sh
-
-# Verify
-- job-template:
-    name: 'apex-verify-{stream}'
-
-    node: '{virtual-slave}'
-
-    concurrent: true
-
-    project-type: 'multijob'
-
-    parameters:
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}/dev'
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - string:
-            name: ARTIFACT_VERSION
-            default: dev
-            description: "Used for overriding the ARTIFACT_VERSION"
-    scm:
-        - git-scm-gerrit
-
-    triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - 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: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'apex'
-                branches:
-                  - 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: 'config/**'
-                  - compare-type: ANT
-                    pattern: 'apex/**'
-
-    properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-verify.*'
-        - throttle:
-            max-per-node: 1
-            max-total: 10
-            option: 'project'
-
-    builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - multijob:
-            name: basic
-            condition: SUCCESSFUL
-            projects:
-                - name: 'apex-verify-unit-tests-{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: build
-            condition: SUCCESSFUL
-            projects:
-                - name: 'apex-build-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    ARTIFACT_VERSION=$ARTIFACT_VERSION
-                    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: |
-                    ARTIFACT_VERSION=$ARTIFACT_VERSION
-                    DEPLOY_SCENARIO={verify-scenario}
-                    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
-                  node-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-                  git-revision: true
-        - multijob:
-            name: functest-smoke
-            condition: SUCCESSFUL
-            projects:
-              - name: 'functest-apex-virtual-suite-{stream}'
-                current-parameters: false
-                predefined-parameters: |
-                  DEPLOY_SCENARIO={verify-scenario}
-                  FUNCTEST_SUITE_NAME=healthcheck
-                  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
-
-# Verify Scenario Gate
-- job-template:
-    name: 'apex-verify-gate-{stream}'
-
-    node: '{virtual-slave}'
-
-    concurrent: true
-
-    project-type: 'multijob'
-
-    parameters:
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}/dev'
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Used for overriding the GIT URL coming from parameters macro."
-        - string:
-            name: ARTIFACT_VERSION
-            default: dev
-            description: "Used for overriding the ARTIFACT_VERSION"
-
-    scm:
-        - git-scm-gerrit
-
-    triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: '^Patch Set [0-9]+: Code-Review\+2.*start-gate-scenario:.*'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'apex'
-                branches:
-                  - 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: 'config/**'
-                  - compare-type: ANT
-                    pattern: 'apex/**'
-
-    properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-verify.*'
-        - throttle:
-            max-per-node: 1
-            max-total: 10
-            option: 'project'
-
-    builders:
-        - multijob:
-            name: deploy-virtual
-            condition: SUCCESSFUL
-            projects:
-                - name: 'apex-deploy-virtual-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    ARTIFACT_VERSION=$ARTIFACT_VERSION
-                    DEPLOY_SCENARIO=gate
-                    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
-                    GERRIT_EVENT_COMMENT_TEXT=$GERRIT_EVENT_COMMENT_TEXT
-                  node-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-                  git-revision: true
-        - shell: |
-            echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo 'os-.*') > detected_scenario
-        - inject:
-           properties-file: detected_scenario
-        - multijob:
-            name: functest-smoke
-            condition: SUCCESSFUL
-            projects:
-              - name: 'functest-apex-virtual-suite-{stream}'
-                current-parameters: false
-                predefined-parameters: |
-                  DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                  FUNCTEST_SUITE_NAME=healthcheck
-                  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
+      - 'baremetal'
+      - 'virtual'
 
 - job-template:
     name: 'apex-runner-cperf-{stream}'
@@ -356,210 +69,206 @@
     disabled: false
 
     parameters:
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Used for overriding the GIT URL coming from parameters macro."
+      - apex-parameter:
+          gs-pathname: '{gs-pathname}'
+      - project-parameter:
+          project: '{project}'
+          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:
-        - git-scm
+      - git-scm
 
     properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: false
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-deploy.*'
-        - throttle:
-            max-per-node: 1
-            max-total: 10
-            option: 'project'
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: false
+          block-level: 'NODE'
+          blocking-jobs:
+            - 'apex-deploy.*'
+      - throttle:
+          max-per-node: 1
+          max-total: 10
+          option: 'project'
 
     builders:
-        - description-setter:
-            description: "Deployed on $NODE_NAME"
-        - multijob:
-            name: 'Baremetal Deploy'
-            condition: ALWAYS
-            projects:
-                - name: 'apex-deploy-baremetal-{stream}'
-                  node-parameters: false
-                  current-parameters: true
-                  predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=
-                    OPNFV_CLEAN=yes
-                    DEPLOY_SCENARIO={verify-scenario}
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-                  git-revision: false
-        - multijob:
-            name: CPERF
-            condition: SUCCESSFUL
-            projects:
-                - name: 'cperf-apex-intel-pod2-daily-master'
-                  node-parameters: true
-                  current-parameters: false
-                  predefined-parameters:
-                    DEPLOY_SCENARIO={verify-scenario}
-                  kill-phase-on: NEVER
-                  abort-all-job: false
-                  git-revision: false
-
-# Build phase
-- job-template:
-    name: 'apex-build-{stream}'
+      - description-setter:
+          description: "Deployed on $NODE_NAME"
+      - multijob:
+          name: 'Baremetal Deploy'
+          condition: ALWAYS
+          projects:
+            - name: 'apex-deploy-baremetal-{stream}'
+              node-parameters: false
+              current-parameters: true
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=
+                OPNFV_CLEAN=yes
+                DEPLOY_SCENARIO={verify-scenario}
+              kill-phase-on: FAILURE
+              abort-all-job: true
+              git-revision: false
+      - multijob:
+          name: CPERF
+          condition: SUCCESSFUL
+          projects:
+            - name: 'cperf-apex-intel-pod2-daily-master'
+              node-parameters: true
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={verify-scenario}
+              kill-phase-on: NEVER
+              abort-all-job: false
+              git-revision: false
 
-    # Job template for builds
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-    node: '{build-slave}'
+# Deploy job
+- job-template:
+    name: 'apex-deploy-{platform}-{stream}'
 
-    disabled: false
+    node: 'apex-{platform}-{stream}'
 
     concurrent: true
 
-    parameters:
-        - '{project}-defaults'
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
-
+    disabled: false
+    quiet-period: 30
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     wrappers:
-        - timeout:
-            timeout: 150
-            fail: true
-
-    properties:
-        - logrotate-default
-        - throttle:
-            max-per-node: {concurrent-builds}
-            max-total: 10
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-verify-iso-{stream}'
-
-    builders:
-        - 'apex-build'
-        - inject:
-           properties-content: ARTIFACT_TYPE=rpm
-        - 'apex-upload-artifact'
-
-# ISO verify job
-- job-template:
-    name: 'apex-verify-iso-{stream}'
-
-    # Job template for builds
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-    node: '{virtual-slave}'
-
-    disabled: false
-
-    concurrent: true
+      - timeout:
+          timeout: 140
+          fail: true
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Used for overriding the GIT URL coming from parameters macro."
-
-    scm:
-        - git-scm
-
+      - '{project}-{platform}-{stream}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - apex-parameter:
+          gs-pathname: '{gs-pathname}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{verify-scenario}'
+          description: "Scenario to deploy with."
+      # yamllint disable rule:line-length
+      - 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"
+
+    # yamllint enable rule:line-length
     properties:
-        - logrotate-default
-        - throttle:
-            max-per-node: 1
-            max-total: 10
-            option: 'project'
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          block-level: 'NODE'
+          blocking-jobs:
+            - 'apex-deploy.*'
+            - 'functest.*'
+            - 'yardstick.*'
+            - 'dovetail.*'
+            - 'storperf.*'
+      - throttle:
+          max-per-node: 1
+          max-total: 10
+          option: 'project'
 
     builders:
-        - 'apex-iso-verify'
-        - inject:
-           properties-content: ARTIFACT_TYPE=iso
-        - 'apex-upload-artifact'
+      - description-setter:
+          description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
+      - 'apex-download-artifact'
+      - 'apex-deploy'
+      - 'clean-workspace'
 
-# Deploy job
+
+# Virtual Deploy and Test
 - job-template:
-    name: 'apex-deploy-{platform}-{stream}'
+    name: 'apex-virtual-{stream}'
 
-    node: 'apex-{platform}-{stream}'
+    node: 'apex-virtual-master'
 
-    concurrent: true
+    project-type: 'multijob'
 
     disabled: false
-    quiet-period: 30
-    scm:
-        - git-scm-gerrit
 
-    wrappers:
-        - timeout:
-            timeout: 140
-            fail: true
+    scm:
+      - git-scm-gerrit
 
     parameters:
-        - '{project}-{platform}-{stream}-defaults'
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: '{verify-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"
+      - '{project}-defaults'
+      - '{project}-virtual-{stream}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - apex-parameter:
+          gs-pathname: '{gs-pathname}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{verify-scenario}'
+          description: "Scenario to deploy with."
+      - string:
+          name: ARTIFACT_VERSION
+          default: dev
+          description: "Used for overriding the ARTIFACT_VERSION"
 
     properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-deploy.*'
-                - 'functest.*'
-                - 'yardstick.*'
-                - 'dovetail.*'
-                - 'storperf.*'
-        - throttle:
-            max-per-node: 1
-            max-total: 10
-            option: 'project'
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          block-level: 'NODE'
+          blocking-jobs:
+            - 'apex-runner.*'
+            - 'apex-.*-promote.*'
+            - 'apex-run.*'
+            - 'apex-virtual-.*'
+            - 'apex-verify-gate-.*'
+      - throttle:
+          max-per-node: 1
+          max-total: 10
+          option: 'project'
 
     builders:
-        - description-setter:
-            description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-        - 'apex-download-artifact'
-        - 'apex-deploy'
-        - 'apex-workspace-cleanup'
-
+      - description-setter:
+          description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
+      - multijob:
+          name: deploy-virtual
+          condition: SUCCESSFUL
+          projects:
+            - name: 'apex-deploy-virtual-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                ARTIFACT_VERSION=$ARTIFACT_VERSION
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                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
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+              git-revision: true
+      - multijob:
+          name: functest-smoke
+          condition: SUCCESSFUL
+          projects:
+            - name: 'functest-apex-virtual-suite-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                FUNCTEST_SUITE_NAME=healthcheck
+                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
 
 # Baremetal Deploy and Test
 - job-template:
@@ -570,69 +279,71 @@
     disabled: false
 
     scm:
-        - git-scm
+      - git-scm
 
     parameters:
-        - '{project}-defaults'
-        - '{project}-baremetal-{scenario_stream}-defaults'
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: '{scenario}'
-            description: "Scenario to deploy with."
+      - '{project}-defaults'
+      - '{project}-baremetal-{scenario_stream}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - apex-parameter:
+          gs-pathname: '{gs-pathname}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
+          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.*'
-                - 'apex-.+-baremetal-.+'
-        - throttle:
-            max-per-node: 1
-            max-total: 10
-            option: 'project'
+      - 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-{scenario_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: 'OPNFV Test Suite'
-            projects:
-                - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
-                  node-parameters: true
-                  current-parameters: false
-                  predefined-parameters:
-                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                  kill-phase-on: NEVER
-                  abort-all-job: true
-                  git-revision: false
+      - description-setter:
+          description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
+      - multijob:
+          name: 'Baremetal Deploy'
+          condition: SUCCESSFUL
+          projects:
+            - name: 'apex-deploy-baremetal-{scenario_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: 'OPNFV Test Suite'
+          projects:
+            - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
+              node-parameters: true
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
 
     publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw-escape: ./update-build-result.groovy
+      - groovy-postbuild:
+          script:
+            !include-raw-escape: ./update-build-result.groovy
 
 # Baremetal test job
 - job-template:
@@ -643,84 +354,87 @@
     disabled: false
 
     parameters:
-        - '{project}-defaults'
-        - '{project}-baremetal-{scenario_stream}-defaults'
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: '{scenario}'
-            description: "Scenario to deploy with."
+      - '{project}-defaults'
+      - '{project}-baremetal-{scenario_stream}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - apex-parameter:
+          gs-pathname: '{gs-pathname}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
+          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.*'
-                - 'apex-testsuite-.+-baremetal-.+'
-        - throttle:
-            max-per-node: 1
-            max-total: 10
-            option: 'project'
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          block-level: 'NODE'
+          blocking-jobs:
+            - 'apex-verify.*'
+            - 'apex-runner.*'
+            - 'apex-.*-promote.*'
+            - 'apex-run.*'
+            - 'apex-testsuite-.+-baremetal-.+'
+      - throttle:
+          max-per-node: 1
+          max-total: 10
+          option: 'project'
+
     builders:
-        - description-setter:
-            description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-        - multijob:
-            name: Functest
-            condition: ALWAYS
-            projects:
-                - name: 'functest-apex-baremetal-daily-{scenario_stream}'
-                  node-parameters: true
-                  current-parameters: false
-                  predefined-parameters:
-                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                  kill-phase-on: NEVER
-                  abort-all-job: false
-                  git-revision: false
-        - multijob:
-            name: Yardstick
-            condition: ALWAYS
-            projects:
-                - name: 'yardstick-apex-baremetal-daily-{scenario_stream}'
-                  node-parameters: true
-                  current-parameters: false
-                  predefined-parameters:
-                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                  kill-phase-on: NEVER
-                  abort-all-job: false
-                  git-revision: false
-        - multijob:
-            name: Dovetail
-            condition: ALWAYS
-            projects:
-                - name: 'dovetail-apex-baremetal-proposed_tests-{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|nosdn-kvm|odl_l3-fdio)-ha/"
-                  abort-all-job: false
-                  git-revision: false
-#        - multijob:
-#            name: StorPerf
-#            condition: ALWAYS
-#            projects:
-#                - name: 'storperf-apex-baremetal-daily-{scenario_stream}'
-#                  node-parameters: true
-#                  current-parameters: false
-#                  predefined-parameters:
-#                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-#                  kill-phase-on: NEVER
-#                  abort-all-job: false
-#                  git-revision: false
+      - description-setter:
+          description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
+      - multijob:
+          name: Functest
+          condition: ALWAYS
+          projects:
+            - name: 'functest-apex-baremetal-daily-{scenario_stream}'
+              node-parameters: true
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              kill-phase-on: NEVER
+              abort-all-job: false
+              git-revision: false
+      - multijob:
+          name: Yardstick
+          condition: ALWAYS
+          projects:
+            - name: 'yardstick-apex-baremetal-daily-{scenario_stream}'
+              node-parameters: true
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              kill-phase-on: NEVER
+              abort-all-job: false
+              git-revision: false
+      - multijob:
+          name: Dovetail
+          condition: ALWAYS
+          projects:
+            - name: 'dovetail-apex-baremetal-proposed_tests-{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: StorPerf
+          condition: ALWAYS
+          projects:
+            - name: 'storperf-apex-baremetal-daily-{scenario_stream}'
+              node-parameters: true
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-nosdn-nofeature-ha/"
+              kill-phase-on: NEVER
+              abort-all-job: false
+              git-revision: false
 # Build status is always success due conditional plugin prefetching
 # build status before multijob phases execute
 #        - conditional-step:
@@ -731,10 +445,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
     #
@@ -743,75 +455,66 @@
     #     branch:    branch (eg. stable)
     project-type: 'multijob'
 
-    node: '{{ build_slave[stream] }}'
+    node: '{baremetal-slave}'
 
-    disabled: false
+    disabled: '{obj:disable_daily}'
 
     scm:
-        - git-scm
+      - git-scm
 
     parameters:
-        - '{project}-defaults'
-        - '{project}-baremetal-{{ stream }}-defaults'
-        - project-parameter:
-            project: '{project}'
-            branch: '{{ branch[stream] }}'
-        - apex-parameter:
-            gs-pathname: '{{ gspathname[stream] }}'
+      - '{project}-defaults'
+      - '{project}-baremetal-{stream}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - apex-parameter:
+          gs-pathname: '{gs-pathname}'
 
     properties:
-        - logrotate-default
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          block-level: 'NODE'
+          blocking-jobs:
+            - 'apex-daily.*'
 
     triggers:
-        - 'apex-{{ stream }}'
+      - 'apex-{stream}'
 
     builders:
-        - multijob:
-            name: build
-            condition: SUCCESSFUL
-            projects:
-                - name: 'apex-build-{{ stream }}'
-                  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
-                  abort-all-job: true
-                  git-revision: true
-        - multijob:
-            name: 'Verify and upload ISO'
-            condition: SUCCESSFUL
-            projects:
-                - name: 'apex-verify-iso-{{ stream }}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    BUILD_DIRECTORY=$WORKSPACE/../apex-build-{{ stream }}/.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
-                  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 %}
+      - multijob:
+          name: build
+          condition: SUCCESSFUL
+          projects:
+            - name: 'apex-build-{stream}'
+              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
+              abort-all-job: true
+              git-revision: true
+      - multijob:
+          name: 'Verify and upload ISO'
+          condition: SUCCESSFUL
+          projects:
+            - name: 'apex-verify-iso-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                BUILD_DIRECTORY=$WORKSPACE/../apex-build-{stream}/.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
+              abort-all-job: true
+              git-revision: true
+      - apex-builder-{stream}
 
 # snapshot create
 - job-template:
@@ -825,8 +528,8 @@
     disabled: false
 
     builders:
-        - shell:
-            !include-raw-escape: ./apex-snapshot-create.sh
+      - shell:
+          !include-raw-escape: ./apex-snapshot-create.sh
 
 # snapshot upload
 - job-template:
@@ -840,9 +543,9 @@
     disabled: false
 
     builders:
-        - inject:
-           properties-content: ARTIFACT_TYPE=snapshot
-        - 'apex-upload-artifact'
+      - inject:
+          properties-content: ARTIFACT_TYPE=snapshot
+      - 'apex-upload-artifact'
 
 # CSIT promote
 - job-template:
@@ -858,103 +561,103 @@
     disabled: false
 
     scm:
-        - git-scm
+      - git-scm
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
+      - 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.*'
+      - build-blocker:
+          use-build-blocker: true
+          block-level: 'NODE'
+          blocking-jobs:
+            - 'apex-verify.*'
+            - 'apex-deploy.*'
+            - 'apex-runner.*'
+            - 'apex-daily.*'
 
     triggers:
-        - timed: '0 12 * * 0'
+      - 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
+      - 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:
@@ -970,83 +673,233 @@
     disabled: false
 
     scm:
-        - git-scm
+      - git-scm
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
+      - 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.*'
+      - 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
+      - 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 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
@@ -1054,84 +907,82 @@
 - 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."
+      - 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."
+      # yamllint disable rule:line-length
+      - 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."
+      # yamllint enable rule:line-length
+      - 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
 ########################
+{% for stream in scenarios %}
+# {{ stream }} Builder
 - builder:
-    name: 'apex-unit-test'
-    builders:
-        - shell:
-            !include-raw: ./apex-unit-test.sh
-
-- builder:
-    name: 'apex-build'
-    builders:
-        - shell:
-            !include-raw: ./apex-build.sh
-
-- builder:
-    name: 'apex-workspace-cleanup'
-    builders:
-        - shell:
-            !include-raw: ./apex-workspace-cleanup.sh
-
-- builder:
-    name: 'apex-iso-verify'
+    name: apex-builder-{{ stream }}
     builders:
-        - shell:
-            !include-raw: ./apex-iso-verify.sh
-
+      - 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-upload-artifact'
     builders:
-        - shell:
-            !include-raw: ./apex-upload-artifact.sh
+      - shell:
+          !include-raw: ./apex-upload-artifact.sh
 
 - builder:
     name: 'apex-download-artifact'
     builders:
-        - shell:
-            !include-raw: ./apex-download-artifact.sh
+      - shell:
+          !include-raw: ./apex-download-artifact.sh
 
 - builder:
     name: 'apex-deploy'
     builders:
-        - shell:
-            !include-raw: ./apex-deploy.sh
+      - shell:
+          !include-raw: ./apex-deploy.sh
 
 #######################
 # trigger macros
@@ -1139,9 +990,15 @@
 - trigger:
     name: 'apex-master'
     triggers:
-        - timed: '0 12 * * *'
+      - timed: '0 0 1-31/2 * *'
+
+- trigger:
+    name: 'apex-euphrates'
+    triggers:
+      - timed: '0 0 2-30/2 * *'
+
 - trigger:
     name: 'apex-danube'
     triggers:
-        - timed: '0 3 1 1 7'
+      - timed: '0 3 1 1 7'