X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml.j2;h=25b9cd9d71e4fa34aabdd9a9cd32224066e67ec6;hb=1700372dd68d072fbd77cb3b739a4cf5c9e6aec4;hp=5141eade5c23bc548b8478b21244e01f800d5956;hpb=64f150ecdd4055f4b3f817b204fee04d9527386b;p=releng.git

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 5141eade5..25b9cd9d7 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -27,6 +27,17 @@
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'master'
           disable_daily: false
+          disable_promote: false
+      - fraser: &fraser
+          branch: 'stable/fraser'
+          gs-pathname: '/fraser'
+          build-slave: 'apex-build-master'
+          virtual-slave: 'apex-virtual-master'
+          baremetal-slave: 'apex-baremetal-master'
+          verify-scenario: 'os-odl-nofeature-ha'
+          scenario_stream: 'fraser'
+          disable_daily: true
+          disable_promote: true
       - euphrates: &euphrates
           branch: 'stable/euphrates'
           gs-pathname: '/euphrates'
@@ -36,6 +47,7 @@
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'euphrates'
           disable_daily: true
+          disable_promote: true
       - danube: &danube
           branch: 'stable/danube'
           gs-pathname: '/danube'
@@ -46,6 +58,7 @@
           scenario_stream: 'danube'
           disabled: true
           disable_daily: true
+          disable_promote: true
 
     scenario:
       {%- for stream in scenarios %}
@@ -59,6 +72,10 @@
       - 'baremetal'
       - 'virtual'
 
+    os_version:
+      - 'pike'
+      - 'queens'
+      - 'master'
 - job-template:
     name: 'apex-runner-cperf-{stream}'
 
@@ -166,6 +183,7 @@
           block-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
+            - 'functest.*'
             - 'yardstick.*'
             - 'dovetail.*'
             - 'storperf.*'
@@ -249,23 +267,23 @@
               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
+      - 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:
@@ -382,18 +400,18 @@
     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: 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
@@ -407,7 +425,7 @@
               abort-all-job: false
               git-revision: false
       - multijob:
-          name: Dovetail
+          name: Dovetail-proposed_tests
           condition: ALWAYS
           projects:
             - name: 'dovetail-apex-baremetal-proposed_tests-{scenario_stream}'
@@ -416,7 +434,22 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
+                                 && $BUILD_NUMBER % 2 == 1"
+              abort-all-job: false
+              git-revision: false
+      - multijob:
+          name: Dovetail-default
+          condition: ALWAYS
+          projects:
+            - name: 'dovetail-apex-baremetal-default-{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/
+                                 && $BUILD_NUMBER % 2 == 0"
               abort-all-job: false
               git-revision: false
       - multijob:
@@ -553,7 +586,7 @@
     #     branch:    branch (eg. stable)
     node: '{virtual-slave}'
     project-type: 'multijob'
-    disabled: false
+    disabled: '{disable_promote}'
 
     scm:
       - git-scm
@@ -580,55 +613,40 @@
 
     builders:
       - multijob:
-          name: build
+          name: deploy-virtual
           condition: SUCCESSFUL
           projects:
-            - name: 'apex-build-{stream}'
+            - name: 'apex-deploy-virtual-{stream}'
               current-parameters: false
               predefined-parameters: |
+                DEPLOY_SCENARIO=os-odl-{os_version}_upstream-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
-              node-parameters: false
+                PROMOTE=True
+              node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
-              git-revision: true
+              git-revision: false
       - multijob:
-          name: deploy-virtual
+          name: functest-smoke
           condition: SUCCESSFUL
           projects:
-            - name: 'apex-deploy-virtual-{stream}'
+            - name: 'functest-apex-virtual-suite-{stream}'
               current-parameters: false
               predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl_l3-csit-noha
-                OPNFV_CLEAN=yes
+                DEPLOY_SCENARIO=os-odl-{os_version}_upstream-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
-                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
@@ -780,7 +798,7 @@
       - string:
           name: SSH_KEY
           default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex.'
+          description: 'SSH key to use for Apex'
 
     properties:
       - logrotate-default
@@ -987,6 +1005,11 @@
     triggers:
       - timed: '0 0 1-31/2 * *'
 
+- trigger:
+    name: 'apex-fraser'
+    triggers:
+      - timed: '0 0 2-30/2 * *'
+
 - trigger:
     name: 'apex-euphrates'
     triggers: