summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex-project-jobs.yml5
-rw-r--r--jjb/apex/apex-verify-jobs.yml5
-rw-r--r--jjb/apex/apex.yml204
-rw-r--r--jjb/apex/apex.yml.j215
-rw-r--r--jjb/apex/scenarios.yaml.hidden19
-rw-r--r--jjb/global/slave-params.yml30
6 files changed, 278 insertions, 0 deletions
diff --git a/jjb/apex/apex-project-jobs.yml b/jjb/apex/apex-project-jobs.yml
index 58072865d..700ff60e8 100644
--- a/jjb/apex/apex-project-jobs.yml
+++ b/jjb/apex/apex-project-jobs.yml
@@ -9,6 +9,11 @@
gs-pathname: ''
concurrent-builds: 3
disabled: false
+ - fraser: &fraser
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ concurrent-builds: 3
+ disabled: false
- euphrates: &euphrates
branch: 'stable/euphrates'
gs-pathname: '/euphrates'
diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml
index 302932246..3a693c87e 100644
--- a/jjb/apex/apex-verify-jobs.yml
+++ b/jjb/apex/apex-verify-jobs.yml
@@ -12,6 +12,11 @@
gs-pathname: ''
verify-scenario: 'os-odl-nofeature-ha'
disabled: false
+ - fraser: &fraser
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ verify-scenario: 'os-odl-nofeature-ha'
+ disabled: false
- danube: &danube
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 428835683..a4c68600f 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -28,6 +28,16 @@
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'
@@ -52,6 +62,42 @@
scenario:
- 'os-nosdn-nofeature-noha':
+ <<: *fraser
+ - 'os-nosdn-nofeature-ha':
+ <<: *fraser
+ - 'os-odl-nofeature-ha':
+ <<: *fraser
+ - 'os-odl-nofeature-noha':
+ <<: *fraser
+ - 'os-odl-bgpvpn-ha':
+ <<: *fraser
+ - 'os-ovn-nofeature-noha':
+ <<: *fraser
+ - 'os-nosdn-fdio-noha':
+ <<: *fraser
+ - 'os-nosdn-fdio-ha':
+ <<: *fraser
+ - 'os-nosdn-bar-ha':
+ <<: *fraser
+ - 'os-nosdn-bar-noha':
+ <<: *fraser
+ - 'os-nosdn-nofeature-ha-ipv6':
+ <<: *fraser
+ - 'os-nosdn-ovs_dpdk-noha':
+ <<: *fraser
+ - 'os-nosdn-ovs_dpdk-ha':
+ <<: *fraser
+ - 'os-nosdn-kvm_ovs_dpdk-noha':
+ <<: *fraser
+ - 'os-nosdn-kvm_ovs_dpdk-ha':
+ <<: *fraser
+ - 'os-odl-sfc-noha':
+ <<: *fraser
+ - 'os-odl-sfc-ha':
+ <<: *fraser
+ - 'os-nosdn-calipso-noha':
+ <<: *fraser
+ - 'os-nosdn-nofeature-noha':
<<: *danube
- 'os-nosdn-nofeature-ha':
<<: *danube
@@ -1071,6 +1117,159 @@
# 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-noha-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-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-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-nofeature-noha-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
+ - name: 'apex-os-ovn-nofeature-noha-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-nosdn-fdio-noha-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-nosdn-fdio-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-nosdn-bar-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-nosdn-bar-noha-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-nosdn-nofeature-ha-ipv6-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-nosdn-ovs_dpdk-noha-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-nosdn-ovs_dpdk-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-nosdn-kvm_ovs_dpdk-noha-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-nosdn-kvm_ovs_dpdk-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-sfc-noha-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-sfc-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-nosdn-calipso-noha-baremetal-fraser'
+ 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
@@ -1636,6 +1835,11 @@
- timed: '0 0 1-31/2 * *'
- trigger:
+ name: 'apex-fraser'
+ triggers:
+ - timed: '0 0 2-30/2 * *'
+
+- trigger:
name: 'apex-euphrates'
triggers:
- timed: '0 0 2-30/2 * *'
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 0bedd3560..25b9cd9d7 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -28,6 +28,16 @@
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'
@@ -996,6 +1006,11 @@
- timed: '0 0 1-31/2 * *'
- trigger:
+ name: 'apex-fraser'
+ triggers:
+ - timed: '0 0 2-30/2 * *'
+
+- trigger:
name: 'apex-euphrates'
triggers:
- timed: '0 0 2-30/2 * *'
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index 93ce931eb..58f1c64f4 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -19,6 +19,25 @@ master:
- 'os-odl-sfc-noha'
- 'os-odl-sfc-ha'
- 'os-nosdn-calipso-noha'
+fraser:
+ - 'os-nosdn-nofeature-noha'
+ - 'os-nosdn-nofeature-ha'
+ - 'os-odl-nofeature-ha'
+ - 'os-odl-nofeature-noha'
+ - 'os-odl-bgpvpn-ha'
+ - 'os-ovn-nofeature-noha'
+ - 'os-nosdn-fdio-noha'
+ - 'os-nosdn-fdio-ha'
+ - 'os-nosdn-bar-ha'
+ - 'os-nosdn-bar-noha'
+ - 'os-nosdn-nofeature-ha-ipv6'
+ - 'os-nosdn-ovs_dpdk-noha'
+ - 'os-nosdn-ovs_dpdk-ha'
+ - 'os-nosdn-kvm_ovs_dpdk-noha'
+ - 'os-nosdn-kvm_ovs_dpdk-ha'
+ - 'os-odl-sfc-noha'
+ - 'os-odl-sfc-ha'
+ - 'os-nosdn-calipso-noha'
euphrates:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 6171a6abd..628c13f79 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -20,6 +20,21 @@
description: 'SSH key to use for Apex'
- parameter:
+ name: 'apex-baremetal-fraser-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'apex-baremetal-master'
+ - 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-euphrates-defaults'
parameters:
- label:
@@ -66,6 +81,21 @@
description: 'SSH key to use for Apex'
- parameter:
+ name: 'apex-virtual-fraser-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'apex-virtual-master'
+ - 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-euphrates-defaults'
parameters:
- label: