summaryrefslogtreecommitdiffstats
path: root/jjb/apex/apex.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/apex/apex.yml')
-rw-r--r--jjb/apex/apex.yml255
1 files changed, 68 insertions, 187 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index a4c68600f..849720336 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -3,6 +3,7 @@
name: 'apex'
project: 'apex'
jobs:
+ - 'apex-fetch-logs-{stream}'
- 'apex-runner-cperf-{stream}'
- 'apex-virtual-{stream}'
- 'apex-deploy-{platform}-{stream}'
@@ -36,7 +37,7 @@
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'fraser'
- disable_daily: true
+ disable_daily: false
disable_promote: true
- euphrates: &euphrates
branch: 'stable/euphrates'
@@ -149,45 +150,9 @@
<<: *danube
- 'os-ovn-nofeature-noha':
<<: *danube
- - 'os-nosdn-nofeature-noha':
- <<: *master
- - 'os-nosdn-nofeature-ha':
- <<: *master
- - 'os-odl-nofeature-ha':
- <<: *master
- - 'os-odl-nofeature-noha':
- <<: *master
- - 'os-odl-bgpvpn-ha':
- <<: *master
- - 'os-odl-bgpvpn-noha':
- <<: *master
- - 'os-odl-sriov-noha':
- <<: *master
- - 'os-odl-ovs_offload-noha':
- <<: *master
- - 'os-ovn-nofeature-noha':
- <<: *master
- - 'os-nosdn-fdio-noha':
- <<: *master
- - 'os-nosdn-fdio-ha':
- <<: *master
- - 'os-nosdn-bar-ha':
- <<: *master
- - 'os-nosdn-bar-noha':
- <<: *master
- - 'os-nosdn-ovs_dpdk-noha':
- <<: *master
- - 'os-nosdn-ovs_dpdk-ha':
- <<: *master
- - 'os-odl-ovs_dpdk-noha':
- <<: *master
- - 'os-odl-ovs_dpdk-ha':
- <<: *master
- - 'os-odl-sfc-noha':
- <<: *master
- - 'os-odl-sfc-ha':
+ - 'os-odl-master_upstream-noha':
<<: *master
- - 'os-nosdn-calipso-noha':
+ - 'os-odl-queens_upstream-noha':
<<: *master
- 'os-nosdn-nofeature-noha':
<<: *euphrates
@@ -234,6 +199,34 @@
- '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}'
@@ -427,7 +420,7 @@
git-revision: true
- multijob:
name: functest-smoke
- condition: SUCCESSFUL
+ condition: ALWAYS
projects:
- name: 'functest-apex-virtual-suite-{stream}'
current-parameters: false
@@ -442,6 +435,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:
@@ -503,6 +510,7 @@
git-revision: false
- multijob:
name: 'OPNFV Test Suite'
+ condition: ALWAYS
projects:
- name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
node-parameters: true
@@ -512,7 +520,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:
@@ -1495,135 +1514,7 @@
name: Baremetal Deploy and Test Phase
condition: SUCCESSFUL
projects:
- - name: 'apex-os-nosdn-nofeature-noha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-nofeature-ha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-odl-nofeature-ha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-odl-nofeature-noha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-odl-bgpvpn-ha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-odl-bgpvpn-noha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-odl-sriov-noha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-odl-ovs_offload-noha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-ovn-nofeature-noha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-fdio-noha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-fdio-ha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-bar-ha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-bar-noha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-ovs_dpdk-ha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-odl-ovs_dpdk-noha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-odl-ovs_dpdk-ha-baremetal-master'
+ - name: 'apex-os-odl-master_upstream-noha-baremetal-master'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1631,23 +1522,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-sfc-noha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-odl-sfc-ha-baremetal-master'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-calipso-noha-baremetal-master'
+ - name: 'apex-os-odl-queens_upstream-noha-baremetal-master'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1826,6 +1701,12 @@
- shell:
!include-raw: ./apex-deploy.sh
+- builder:
+ name: 'apex-fetch-logs'
+ builders:
+ - shell:
+ !include-raw: ./apex-fetch-logs.sh
+
#######################
# trigger macros
########################