X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml.j2;h=4620bbc7e0a852e247fea9830231def5deaaa84e;hb=e1151b3fa1630e01523175dab065d7ff115aec0a;hp=27a854dd720ad64c0a4d425624972962ef536ae4;hpb=8a2c682eb920ba5741577161ea23a678356da204;p=releng.git

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 27a854dd7..4620bbc7e 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -3,6 +3,7 @@
     name: 'apex'
     project: 'apex'
     jobs:
+      - 'apex-fetch-logs-{stream}'
       - 'apex-runner-cperf-{stream}'
       - 'apex-virtual-{stream}'
       - 'apex-deploy-{platform}-{stream}'
@@ -27,6 +28,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: false
+          disable_promote: true
       - euphrates: &euphrates
           branch: 'stable/euphrates'
           gs-pathname: '/euphrates'
@@ -36,6 +48,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 +59,7 @@
           scenario_stream: 'danube'
           disabled: true
           disable_daily: true
+          disable_promote: true
 
     scenario:
       {%- for stream in scenarios %}
@@ -59,6 +73,38 @@
       - 'baremetal'
       - 'virtual'
 
+    os_version:
+      - 'pike'
+      - 'queens'
+      - 'master'
+
+
+# Fetch Logs Job
+- job-template:
+    name: 'apex-fetch-logs-{stream}'
+
+    concurrent: true
+
+    disabled: false
+    scm:
+      - git-scm-gerrit
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - apex-parameter:
+          gs-pathname: '{gs-pathname}'
+    # yamllint enable rule:line-length
+    properties:
+      - logrotate-default
+      - throttle:
+          max-per-node: 1
+          max-total: 10
+          option: 'project'
+
+    builders:
+      - 'apex-fetch-logs'
+
 - job-template:
     name: 'apex-runner-cperf-{stream}'
 
@@ -129,8 +175,6 @@
 - job-template:
     name: 'apex-deploy-{platform}-{stream}'
 
-    node: 'apex-{platform}-{stream}'
-
     concurrent: true
 
     disabled: false
@@ -189,10 +233,10 @@
 - job-template:
     name: 'apex-virtual-{stream}'
 
-    node: 'apex-virtual-master'
-
     project-type: 'multijob'
 
+    concurrent: true
+
     disabled: false
 
     scm:
@@ -254,7 +298,7 @@
               git-revision: true
       - multijob:
           name: functest-smoke
-          condition: SUCCESSFUL
+          condition: ALWAYS
           projects:
             - name: 'functest-apex-virtual-suite-{stream}'
               current-parameters: false
@@ -269,6 +313,20 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+      - multijob:
+          name: apex-fetch-logs
+          projects:
+            - name: 'apex-fetch-logs-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
 
 # Baremetal Deploy and Test
 - job-template:
@@ -316,6 +374,7 @@
       - multijob:
           name: 'Baremetal Deploy'
           condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'apex-deploy-baremetal-{scenario_stream}'
               node-parameters: true
@@ -325,11 +384,21 @@
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-fetch-logs-{scenario_stream}'
+              current-parameters: true
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=
+              node-parameters: true
+              kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
       - multijob:
           name: 'OPNFV Test Suite'
+          condition: ALWAYS
           projects:
             - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
               node-parameters: true
@@ -339,7 +408,18 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-
+      - multijob:
+          name: apex-fetch-logs
+          projects:
+            - name: 'apex-fetch-logs-{scenario_stream}'
+              current-parameters: true
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
     publishers:
       - groovy-postbuild:
           script:
@@ -410,7 +490,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}'
@@ -419,7 +499,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:
@@ -455,8 +550,6 @@
     #     branch:    branch (eg. stable)
     project-type: 'multijob'
 
-    node: '{baremetal-slave}'
-
     disabled: '{obj:disable_daily}'
 
     scm:
@@ -558,7 +651,7 @@
     #     branch:    branch (eg. stable)
     node: '{virtual-slave}'
     project-type: 'multijob'
-    disabled: false
+    disabled: '{disable_promote}'
 
     scm:
       - git-scm
@@ -584,21 +677,6 @@
       - 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
@@ -606,7 +684,7 @@
             - name: 'apex-deploy-virtual-{stream}'
               current-parameters: false
               predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl_l3-csit-noha
+                DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha
                 OPNFV_CLEAN=yes
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -624,7 +702,7 @@
             - name: 'functest-apex-virtual-suite-{stream}'
               current-parameters: false
               predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
+                DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha
                 FUNCTEST_SUITE_NAME=tempest_smoke_serial
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -984,6 +1062,12 @@
       - shell:
           !include-raw: ./apex-deploy.sh
 
+- builder:
+    name: 'apex-fetch-logs'
+    builders:
+      - shell:
+          !include-raw: ./apex-fetch-logs.sh
+
 #######################
 # trigger macros
 ########################
@@ -992,6 +1076,11 @@
     triggers:
       - timed: '0 0 1-31/2 * *'
 
+- trigger:
+    name: 'apex-fraser'
+    triggers:
+      - timed: '0 0 2-30/2 * *'
+
 - trigger:
     name: 'apex-euphrates'
     triggers: