summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/apex/apex.yml254
-rw-r--r--jjb/apex/apex.yml.j213
-rw-r--r--jjb/apex/scenarios.yaml.hidden22
-rw-r--r--jjb/global/slave-params.yml46
4 files changed, 333 insertions, 2 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 4e358bfd4..ededa7e42 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -27,7 +27,14 @@
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'master'
-
+ - euphrates: &euphrates
+ branch: 'stable/euphrates'
+ gs-pathname: ''
+ build-slave: 'apex-build-master'
+ virtual-slave: 'apex-virtual-master'
+ baremetal-slave: 'apex-baremetal-master'
+ verify-scenario: 'os-odl-nofeature-ha'
+ scenario_stream: 'euphrates'
- danube: &danube
branch: 'stable/danube'
gs-pathname: '/danube'
@@ -133,6 +140,48 @@
<<: *master
- 'os-odl-fdio-dvr-ha':
<<: *master
+ - 'os-nosdn-nofeature-noha':
+ <<: *euphrates
+ - 'os-nosdn-nofeature-ha':
+ <<: *euphrates
+ - 'os-odl-nofeature-ha':
+ <<: *euphrates
+ - 'os-odl-nofeature-noha':
+ <<: *euphrates
+ - 'os-odl-bgpvpn-ha':
+ <<: *euphrates
+ - 'os-ovn-nofeature-noha':
+ <<: *euphrates
+ - 'os-nosdn-fdio-noha':
+ <<: *euphrates
+ - 'os-nosdn-fdio-ha':
+ <<: *euphrates
+ - 'os-odl-fdio-noha':
+ <<: *euphrates
+ - 'os-odl-fdio-ha':
+ <<: *euphrates
+ - 'os-nosdn-bar-ha':
+ <<: *euphrates
+ - 'os-nosdn-bar-noha':
+ <<: *euphrates
+ - 'os-nosdn-nofeature-ha-ipv6':
+ <<: *euphrates
+ - 'os-nosdn-ovs_dpdk-noha':
+ <<: *euphrates
+ - 'os-nosdn-ovs_dpdk-ha':
+ <<: *euphrates
+ - 'os-nosdn-kvm_ovs_dpdk-noha':
+ <<: *euphrates
+ - 'os-nosdn-kvm_ovs_dpdk-ha':
+ <<: *euphrates
+ - 'os-odl-sfc-noha':
+ <<: *euphrates
+ - 'os-odl-sfc-ha':
+ <<: *euphrates
+ - 'os-odl-fdio-dvr-noha':
+ <<: *euphrates
+ - 'os-odl-fdio-dvr-ha':
+ <<: *euphrates
platform:
- 'baremetal'
@@ -1709,6 +1758,205 @@
git-revision: false
+# euphrates Builder
+- builder:
+ name: apex-builder-euphrates
+ builders:
+ - multijob:
+ name: Baremetal Deploy and Test Phase
+ condition: SUCCESSFUL
+ projects:
+
+ - name: 'apex-os-nosdn-nofeature-noha-baremetal-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-fdio-noha-baremetal-euphrates'
+ 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-fdio-ha-baremetal-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-euphrates'
+ 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-fdio-dvr-noha-baremetal-euphrates'
+ 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-fdio-dvr-ha-baremetal-euphrates'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+
+
- builder:
name: 'apex-unit-test'
@@ -1740,6 +1988,10 @@
- trigger:
name: 'apex-master'
triggers:
+ - timed: '0 3 1 1 7'
+- trigger:
+ name: 'apex-euphrates'
+ triggers:
- timed: '0 12 * * *'
- trigger:
name: 'apex-danube'
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 410241c44..cd27c2c63 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -27,7 +27,14 @@
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'master'
-
+ - euphrates: &euphrates
+ branch: 'stable/euphrates'
+ gs-pathname: ''
+ build-slave: 'apex-build-master'
+ virtual-slave: 'apex-virtual-master'
+ baremetal-slave: 'apex-baremetal-master'
+ verify-scenario: 'os-odl-nofeature-ha'
+ scenario_stream: 'euphrates'
- danube: &danube
branch: 'stable/danube'
gs-pathname: '/danube'
@@ -1228,6 +1235,10 @@
- trigger:
name: 'apex-master'
triggers:
+ - timed: '0 3 1 1 7'
+- trigger:
+ name: 'apex-euphrates'
+ triggers:
- timed: '0 12 * * *'
- trigger:
name: 'apex-danube'
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index def4e796a..e7fe92375 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -20,6 +20,28 @@ master:
- 'os-odl-sfc-ha'
- 'os-odl-fdio-dvr-noha'
- 'os-odl-fdio-dvr-ha'
+euphrates:
+ - '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-odl-fdio-noha'
+ - 'os-odl-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-odl-fdio-dvr-noha'
+ - 'os-odl-fdio-dvr-ha'
danube:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 19d5a9545..2018dd582 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -27,6 +27,28 @@
- lf-pod1
- parameter:
+ name: 'apex-baremetal-euphrates-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'
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - lf-pod1
+ default-slaves:
+ - lf-pod1
+
+- parameter:
name: 'apex-baremetal-danube-defaults'
parameters:
- label:
@@ -73,6 +95,30 @@
- lf-virtual3
- parameter:
+ name: 'apex-virtual-euphrates-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'
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - lf-virtual2
+ - lf-virtual3
+ default-slaves:
+ - lf-virtual2
+ - lf-virtual3
+
+- parameter:
name: 'apex-virtual-danube-defaults'
parameters:
- label: