summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex.yaml356
-rw-r--r--jjb/apex/apex.yaml.j249
-rw-r--r--jjb/apex/scenarios.yaml.hidden23
-rw-r--r--jjb/global/slave-params.yaml34
4 files changed, 199 insertions, 263 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 70a38f6b0..012d0bf1f 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -28,7 +28,17 @@
verify-scenario: 'os-nosdn-nofeature-noha'
scenario_stream: 'master'
disable_daily: false
- disable_promote: false
+ disable_promote: true
+ - hunter: &hunter
+ branch: 'stable/hunter'
+ gs-pathname: '/hunter'
+ build-slave: 'apex-build-master'
+ virtual-slave: 'apex-virtual-master'
+ baremetal-slave: 'apex-baremetal-master'
+ verify-scenario: 'os-nosdn-nofeature-ha'
+ scenario_stream: 'hunter'
+ disable_daily: false
+ disable_promote: true
- gambia: &gambia
branch: 'stable/gambia'
gs-pathname: '/gambia'
@@ -38,7 +48,7 @@
verify-scenario: 'os-nosdn-nofeature-ha'
scenario_stream: 'gambia'
disable_daily: true
- disable_promote: false
+ disable_promote: true
- fraser: &fraser
branch: 'stable/fraser'
gs-pathname: '/fraser'
@@ -72,34 +82,6 @@
disable_promote: true
scenario:
- - 'os-nosdn-nofeature-ha':
- <<: *fraser
- - 'os-odl-bgpvpn-ha':
- <<: *fraser
- - 'os-nosdn-nofeature-noha':
- <<: *gambia
- - 'os-nosdn-nofeature-ha':
- <<: *gambia
- - 'os-nosdn-nofeature-ha-ipv6':
- <<: *gambia
- - 'os-odl-nofeature-noha':
- <<: *gambia
- - 'os-odl-nofeature-ha':
- <<: *gambia
- - 'k8s-nosdn-nofeature-noha':
- <<: *gambia
- - 'os-odl-bgpvpn-ha':
- <<: *gambia
- - 'os-odl-bgpvpn-noha':
- <<: *gambia
- - 'os-odl-sfc-ha':
- <<: *gambia
- - 'os-odl-sfc-noha':
- <<: *gambia
- - 'os-nosdn-calipso-noha':
- <<: *gambia
- - 'os-ovn-nofeature-ha':
- <<: *gambia
- 'os-nosdn-nofeature-noha':
<<: *danube
- 'os-nosdn-nofeature-ha':
@@ -156,48 +138,40 @@
<<: *master
- 'os-nosdn-nofeature-ha':
<<: *master
+ - 'os-nosdn-nofeature-noha':
+ <<: *gambia
+ - 'os-nosdn-nofeature-ha':
+ <<: *gambia
- 'os-nosdn-nofeature-ha-ipv6':
- <<: *master
+ <<: *gambia
- 'os-odl-nofeature-noha':
- <<: *master
+ <<: *gambia
- 'os-odl-nofeature-ha':
- <<: *master
- - 'os-nosdn-rocky-noha':
- <<: *master
- - 'os-nosdn-rocky-ha':
- <<: *master
- - 'os-nosdn-rocky-ha-ipv6':
- <<: *master
- - 'os-odl-rocky-noha':
- <<: *master
- - 'os-odl-rocky-ha':
- <<: *master
+ <<: *gambia
- 'k8s-nosdn-nofeature-noha':
- <<: *master
+ <<: *gambia
- 'os-odl-bgpvpn-ha':
- <<: *master
+ <<: *gambia
- 'os-odl-bgpvpn-noha':
- <<: *master
- - 'os-odl-bgpvpn_queens-ha':
- <<: *master
- - 'os-odl-bgpvpn_queens-noha':
- <<: *master
+ <<: *gambia
- 'os-odl-sfc-ha':
- <<: *master
+ <<: *gambia
- 'os-odl-sfc-noha':
- <<: *master
- - 'os-odl-sfc_rocky-ha':
- <<: *master
- - 'os-odl-sfc_rocky-noha':
- <<: *master
+ <<: *gambia
- 'os-nosdn-calipso-noha':
- <<: *master
- - 'os-nosdn-calipso_rocky-noha':
- <<: *master
+ <<: *gambia
- 'os-ovn-nofeature-ha':
- <<: *master
- - 'os-ovn-rocky-ha':
- <<: *master
+ <<: *gambia
+ - 'os-nosdn-nofeature-ha':
+ <<: *fraser
+ - 'os-odl-bgpvpn-ha':
+ <<: *fraser
+ - 'os-nosdn-nofeature-noha':
+ <<: *hunter
+ - 'os-nosdn-nofeature-ha':
+ <<: *hunter
+ - 'os-ovn-nofeature-ha':
+ <<: *hunter
- 'os-nosdn-nofeature-noha':
<<: *euphrates
- 'os-nosdn-nofeature-ha':
@@ -1247,136 +1221,6 @@
# builder macros
########################
-# fraser Builder
-- builder:
- name: apex-builder-fraser
- builders:
- - multijob:
- name: Baremetal Deploy and Test Phase
- condition: SUCCESSFUL
- projects:
- - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser'
- 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-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
-
-# gambia Builder
-- builder:
- name: apex-builder-gambia
- builders:
- - multijob:
- name: Baremetal Deploy and Test Phase
- condition: SUCCESSFUL
- projects:
- - name: 'apex-os-nosdn-nofeature-noha-baremetal-gambia'
- 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-gambia'
- 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-ipv6-baremetal-gambia'
- 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-gambia'
- 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-gambia'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-gambia'
- 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-gambia'
- 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-gambia'
- 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-gambia'
- 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-noha-baremetal-gambia'
- 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-gambia'
- 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-ha-baremetal-gambia'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
-
# danube Builder
- builder:
name: apex-builder-danube
@@ -1618,39 +1462,16 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-nosdn-nofeature-ha-ipv6-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-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-nosdn-rocky-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-rocky-ha-baremetal-master'
+
+# gambia Builder
+- builder:
+ name: apex-builder-gambia
+ builders:
+ - multijob:
+ name: Baremetal Deploy and Test Phase
+ condition: SUCCESSFUL
+ projects:
+ - name: 'apex-os-nosdn-nofeature-noha-baremetal-gambia'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1658,7 +1479,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-nosdn-rocky-ha-ipv6-baremetal-master'
+ - name: 'apex-os-nosdn-nofeature-ha-baremetal-gambia'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1666,7 +1487,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-rocky-noha-baremetal-master'
+ - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-gambia'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1674,7 +1495,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-rocky-ha-baremetal-master'
+ - name: 'apex-os-odl-nofeature-noha-baremetal-gambia'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1682,7 +1503,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-master'
+ - name: 'apex-os-odl-nofeature-ha-baremetal-gambia'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1690,7 +1511,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-bgpvpn-ha-baremetal-master'
+ - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-gambia'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1698,7 +1519,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-bgpvpn-noha-baremetal-master'
+ - name: 'apex-os-odl-bgpvpn-ha-baremetal-gambia'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1706,7 +1527,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-bgpvpn_queens-ha-baremetal-master'
+ - name: 'apex-os-odl-bgpvpn-noha-baremetal-gambia'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1714,7 +1535,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-bgpvpn_queens-noha-baremetal-master'
+ - name: 'apex-os-odl-sfc-ha-baremetal-gambia'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1722,7 +1543,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-sfc-ha-baremetal-master'
+ - name: 'apex-os-odl-sfc-noha-baremetal-gambia'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1730,7 +1551,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-sfc-noha-baremetal-master'
+ - name: 'apex-os-nosdn-calipso-noha-baremetal-gambia'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1738,7 +1559,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-sfc_rocky-ha-baremetal-master'
+ - name: 'apex-os-ovn-nofeature-ha-baremetal-gambia'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1746,7 +1567,16 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-sfc_rocky-noha-baremetal-master'
+
+# fraser Builder
+- builder:
+ name: apex-builder-fraser
+ builders:
+ - multijob:
+ name: Baremetal Deploy and Test Phase
+ condition: SUCCESSFUL
+ projects:
+ - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1754,7 +1584,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-nosdn-calipso-noha-baremetal-master'
+ - name: 'apex-os-odl-bgpvpn-ha-baremetal-fraser'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1762,7 +1592,16 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-nosdn-calipso_rocky-noha-baremetal-master'
+
+# hunter Builder
+- builder:
+ name: apex-builder-hunter
+ builders:
+ - multijob:
+ name: Baremetal Deploy and Test Phase
+ condition: SUCCESSFUL
+ projects:
+ - name: 'apex-os-nosdn-nofeature-noha-baremetal-hunter'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1770,7 +1609,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-ovn-nofeature-ha-baremetal-master'
+ - name: 'apex-os-nosdn-nofeature-ha-baremetal-hunter'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1778,7 +1617,7 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-ovn-rocky-ha-baremetal-master'
+ - name: 'apex-os-ovn-nofeature-ha-baremetal-hunter'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1965,6 +1804,11 @@
- timed: '0 0 1-31/2 * *'
- trigger:
+ name: 'apex-hunter'
+ triggers:
+ - timed: '0 4 2-30/2 * *'
+
+- trigger:
name: 'apex-gambia'
triggers:
- timed: '0 4 2-30/2 * *'
@@ -2000,6 +1844,21 @@
- timed: ''
- trigger:
+ name: 'hunter-csit-master'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'hunter-csit-rocky'
+ triggers:
+ - timed: '0 5 * * *'
+
+- trigger:
+ name: 'hunter-csit-queens'
+ triggers:
+ - timed: ''
+
+- trigger:
name: 'gambia-csit-master'
triggers:
- timed: ''
@@ -2074,6 +1933,21 @@
- timed: ''
- trigger:
+ name: 'hunter-functest-master'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'hunter-functest-rocky'
+ triggers:
+ - timed: '0 3 * * *'
+
+- trigger:
+ name: 'hunter-functest-queens'
+ triggers:
+ - timed: ''
+
+- trigger:
name: 'gambia-functest-master'
triggers:
- timed: ''
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 47ea18bbf..90bfb1f91 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -28,7 +28,17 @@
verify-scenario: 'os-nosdn-nofeature-noha'
scenario_stream: 'master'
disable_daily: false
- disable_promote: false
+ disable_promote: true
+ - hunter: &hunter
+ branch: 'stable/hunter'
+ gs-pathname: '/hunter'
+ build-slave: 'apex-build-master'
+ virtual-slave: 'apex-virtual-master'
+ baremetal-slave: 'apex-baremetal-master'
+ verify-scenario: 'os-nosdn-nofeature-ha'
+ scenario_stream: 'hunter'
+ disable_daily: false
+ disable_promote: true
- gambia: &gambia
branch: 'stable/gambia'
gs-pathname: '/gambia'
@@ -38,7 +48,7 @@
verify-scenario: 'os-nosdn-nofeature-ha'
scenario_stream: 'gambia'
disable_daily: true
- disable_promote: false
+ disable_promote: true
- fraser: &fraser
branch: 'stable/fraser'
gs-pathname: '/fraser'
@@ -1147,6 +1157,11 @@
- timed: '0 0 1-31/2 * *'
- trigger:
+ name: 'apex-hunter'
+ triggers:
+ - timed: '0 4 2-30/2 * *'
+
+- trigger:
name: 'apex-gambia'
triggers:
- timed: '0 4 2-30/2 * *'
@@ -1182,6 +1197,21 @@
- timed: ''
- trigger:
+ name: 'hunter-csit-master'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'hunter-csit-rocky'
+ triggers:
+ - timed: '0 5 * * *'
+
+- trigger:
+ name: 'hunter-csit-queens'
+ triggers:
+ - timed: ''
+
+- trigger:
name: 'gambia-csit-master'
triggers:
- timed: ''
@@ -1256,6 +1286,21 @@
- timed: ''
- trigger:
+ name: 'hunter-functest-master'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'hunter-functest-rocky'
+ triggers:
+ - timed: '0 3 * * *'
+
+- trigger:
+ name: 'hunter-functest-queens'
+ triggers:
+ - timed: ''
+
+- trigger:
name: 'gambia-functest-master'
triggers:
- timed: ''
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index a221699f1..d9d32b473 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -1,27 +1,10 @@
master:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
- - 'os-nosdn-nofeature-ha-ipv6'
- - 'os-odl-nofeature-noha'
- - 'os-odl-nofeature-ha'
- - 'os-nosdn-rocky-noha'
- - 'os-nosdn-rocky-ha'
- - 'os-nosdn-rocky-ha-ipv6'
- - 'os-odl-rocky-noha'
- - 'os-odl-rocky-ha'
- - 'k8s-nosdn-nofeature-noha'
- - 'os-odl-bgpvpn-ha'
- - 'os-odl-bgpvpn-noha'
- - 'os-odl-bgpvpn_queens-ha'
- - 'os-odl-bgpvpn_queens-noha'
- - 'os-odl-sfc-ha'
- - 'os-odl-sfc-noha'
- - 'os-odl-sfc_rocky-ha'
- - 'os-odl-sfc_rocky-noha'
- - 'os-nosdn-calipso-noha'
- - 'os-nosdn-calipso_rocky-noha'
+hunter:
+ - 'os-nosdn-nofeature-noha'
+ - 'os-nosdn-nofeature-ha'
- 'os-ovn-nofeature-ha'
- - 'os-ovn-rocky-ha'
gambia:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index 4ff5d6799..c759cf3a5 100644
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -22,6 +22,23 @@
description: 'SSH key to use for Apex'
- parameter:
+ name: 'apex-baremetal-hunter-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'apex-baremetal-master'
+ all-nodes: false
+ node-eligibility: 'ignore-offline'
+ - 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'
+
+- parameter:
name: 'apex-baremetal-gambia-defaults'
parameters:
- label:
@@ -108,6 +125,23 @@
description: 'SSH key to use for Apex'
- parameter:
+ name: 'apex-virtual-hunter-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'apex-virtual-master'
+ all-nodes: false
+ node-eligibility: 'ignore-offline'
+ - 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'
+
+- parameter:
name: 'apex-virtual-gambia-defaults'
parameters:
- label: