summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml28
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml40
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml2
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml422
-rw-r--r--jjb/joid/joid-ci-jobs.yml93
-rw-r--r--jjb/opnfv/installer-params.yml12
-rw-r--r--jjb/opnfv/slave-params.yml24
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml4
8 files changed, 494 insertions, 131 deletions
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 686b7d45c..4bc56ab1b 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -18,8 +18,8 @@
gs-packagepath: '/{suite}'
#docker tag used for version control
docker-tag: 'latest'
- brahmaputra: &brahmaputra
- stream: brahmaputra
+ colorado: &colorado
+ stream: colorado
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
gs-packagepath: '/{stream}/{suite}'
@@ -48,26 +48,26 @@
slave-label: compass-baremetal
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *brahmaputra
+ <<: *colorado
- virtual:
slave-label: compass-virtual
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *brahmaputra
+ <<: *colorado
#--------------------------------
# None-CI PODs
#--------------------------------
- - orange-pod2:
- slave-label: '{pod}'
- installer: joid
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *brahmaputra
- - orange-pod2:
- slave-label: '{pod}'
- installer: joid
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *master
+ # - orange-pod2:
+ # slave-label: '{pod}'
+ # installer: joid
+ # auto-trigger-name: 'daily-trigger-disabled'
+ # <<: *colorado
+ # - orange-pod2:
+ # slave-label: '{pod}'
+ # installer: joid
+ # auto-trigger-name: 'daily-trigger-disabled'
+ # <<: *master
- huawei-pod2:
slave-label: '{pod}'
installer: compass
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index efd1fc150..426e59777 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -10,8 +10,8 @@
stream: master
branch: '{stream}'
gs-pathname: ''
- brahmaputra: &brahmaputra
- stream: brahmaputra
+ colorado: &colorado
+ stream: colorado
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
#--------------------------------
@@ -31,11 +31,11 @@
- baremetal:
slave-label: compass-baremetal
os-version: 'trusty'
- <<: *brahmaputra
+ <<: *colorado
- virtual:
slave-label: compass-virtual
os-version: 'trusty'
- <<: *brahmaputra
+ <<: *colorado
#--------------------------------
# master
#--------------------------------
@@ -311,35 +311,35 @@
- timed: ''
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-baremetal-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-baremetal-brahmaputra-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-baremetal-brahmaputra-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-baremetal-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-baremetal-brahmaputra-trigger'
+ name: 'compass-os-onos-nofeature-ha-baremetal-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-ocl-nofeature-ha-baremetal-brahmaputra-trigger'
+ name: 'compass-os-ocl-nofeature-ha-baremetal-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-sfc-ha-baremetal-brahmaputra-trigger'
+ name: 'compass-os-onos-sfc-ha-baremetal-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l2-moon-ha-baremetal-brahmaputra-trigger'
+ name: 'compass-os-odl_l2-moon-ha-baremetal-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-kvm-ha-baremetal-brahmaputra-trigger'
+ name: 'compass-os-nosdn-kvm-ha-baremetal-colorado-trigger'
triggers:
- timed: ''
@@ -377,34 +377,34 @@
- timed: ''
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
+ name: 'compass-os-onos-nofeature-ha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-ocl-nofeature-ha-virtual-brahmaputra-trigger'
+ name: 'compass-os-ocl-nofeature-ha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-sfc-ha-virtual-brahmaputra-trigger'
+ name: 'compass-os-onos-sfc-ha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l2-moon-ha-virtual-brahmaputra-trigger'
+ name: 'compass-os-odl_l2-moon-ha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-kvm-ha-virtual-brahmaputra-trigger'
+ name: 'compass-os-nosdn-kvm-ha-virtual-colorado-trigger'
triggers:
- timed: ''
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index e92c7653b..bede7de46 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -12,7 +12,7 @@
- master:
branch: '{stream}'
gs-pathname: ''
- - brahmaputra:
+ - colorado:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index f086aa4e3..0d31c99b4 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -20,7 +20,6 @@
branch: 'stable/{stream}'
disabled: false
gs-pathname: '/{stream}'
- auto-trigger-name: 'daily-trigger-disabled'
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
@@ -256,49 +255,46 @@
########################
# trigger macros
########################
-# os-nosdn-nofeature-ha trigger
-# CI PODs
#-----------------------------------------------
# Triggers for job running on fuel-baremetal against master branch
#-----------------------------------------------
-
# HA Scenarios
- trigger:
name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '0 20 * * *'
+ - timed: '5 20 * * *'
- trigger:
name: 'fuel-os-odl_l2-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '0 23 * * *'
+ - timed: '5 23 * * *'
- trigger:
name: 'fuel-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '0 2 * * *'
+ - timed: '5 2 * * *'
- trigger:
name: 'fuel-os-onos-sfc-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '0 5 * * *'
+ - timed: '5 5 * * *'
- trigger:
name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '0 8 * * *'
+ - timed: '5 8 * * *'
- trigger:
name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '0 11 * * *'
+ - timed: '5 11 * * *'
- trigger:
name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '0 14 * * *'
+ - timed: '5 14 * * *'
- trigger:
name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '0 17 * * *'
+ - timed: '5 17 * * *'
- trigger:
name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '0 20 * * *'
+ - timed: '5 20 * * *'
# NOHA Scenarios
- trigger:
@@ -338,6 +334,84 @@
triggers:
- timed: ''
#-----------------------------------------------
+# Triggers for job running on fuel-baremetal against colorado branch
+#-----------------------------------------------
+# HA Scenarios
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: '0 20 * * *'
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-ha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: '0 23 * * *'
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-ha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: '0 2 * * *'
+- trigger:
+ name: 'fuel-os-onos-sfc-ha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: '0 5 * * *'
+- trigger:
+ name: 'fuel-os-onos-nofeature-ha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: '0 8 * * *'
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: '0 11 * * *'
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: '0 14 * * *'
+- trigger:
+ name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: '0 17 * * *'
+- trigger:
+ name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: '0 20 * * *'
+
+# NOHA Scenarios
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-noha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-noha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-sfc-noha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-nofeature-noha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-noha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-noha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+#-----------------------------------------------
# Triggers for job running on fuel-virtual against master branch
#-----------------------------------------------
- trigger:
@@ -376,45 +450,119 @@
name: 'fuel-os-nosdn-ovs-ha-virtual-daily-master-trigger'
triggers:
- timed: ''
-
# NOHA Scenarios
- trigger:
name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-master-trigger'
triggers:
- - timed: '0 13 * * *'
+ - timed: '5 13 * * *'
- trigger:
name: 'fuel-os-odl_l2-nofeature-noha-virtual-daily-master-trigger'
triggers:
- - timed: '30 15 * * *'
+ - timed: '35 15 * * *'
- trigger:
name: 'fuel-os-odl_l3-nofeature-noha-virtual-daily-master-trigger'
triggers:
- - timed: '0 18 * * *'
+ - timed: '5 18 * * *'
- trigger:
name: 'fuel-os-onos-sfc-noha-virtual-daily-master-trigger'
triggers:
- - timed: '30 20 * * *'
+ - timed: '35 20 * * *'
- trigger:
name: 'fuel-os-onos-nofeature-noha-virtual-daily-master-trigger'
triggers:
- - timed: '0 23 * * *'
+ - timed: '5 23 * * *'
- trigger:
name: 'fuel-os-odl_l2-sfc-noha-virtual-daily-master-trigger'
triggers:
- - timed: '30 1 * * *'
+ - timed: '35 1 * * *'
- trigger:
name: 'fuel-os-odl_l2-bgpvpn-noha-virtual-daily-master-trigger'
triggers:
- - timed: '0 4 * * *'
+ - timed: '5 4 * * *'
- trigger:
name: 'fuel-os-nosdn-kvm-noha-virtual-daily-master-trigger'
triggers:
- - timed: '30 6 * * *'
+ - timed: '35 6 * * *'
- trigger:
name: 'fuel-os-nosdn-ovs-noha-virtual-daily-master-trigger'
triggers:
+ - timed: '5 9 * * *'
+#-----------------------------------------------
+# Triggers for job running on fuel-virtual against colorado branch
+#-----------------------------------------------
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-ha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-ha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-sfc-ha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-nofeature-ha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-ha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-kvm-ha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-ha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+# NOHA Scenarios
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: '0 13 * * *'
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-noha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: '30 15 * * *'
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-noha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: '0 18 * * *'
+- trigger:
+ name: 'fuel-os-onos-sfc-noha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: '30 20 * * *'
+- trigger:
+ name: 'fuel-os-onos-nofeature-noha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: '0 23 * * *'
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-noha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: '30 1 * * *'
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-noha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: '0 4 * * *'
+- trigger:
+ name: 'fuel-os-nosdn-kvm-noha-virtual-daily-colorado-trigger'
+ triggers:
+ - timed: '30 6 * * *'
+- trigger:
+ name: 'fuel-os-nosdn-ovs-noha-virtual-daily-colorado-trigger'
+ triggers:
- timed: '0 9 * * *'
-
#-----------------------------------------------
# ZTE POD1 Triggers running against master branch
#-----------------------------------------------
@@ -644,4 +792,232 @@
name: 'fuel-os-nosdn-ovs-noha-zte-pod3-daily-master-trigger'
triggers:
- timed: ''
+#-----------------------------------------------
+# ZTE POD1 Triggers running against colorado branch
+#-----------------------------------------------
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-sfc-ha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-nofeature-ha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-ha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-kvm-ha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-ha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+# NOHA Scenarios
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-noha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-noha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-noha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-sfc-noha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-nofeature-noha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-noha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-kvm-noha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-noha-zte-pod1-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+#-----------------------------------------------
+# ZTE POD2 Triggers running against colorado branch
+#-----------------------------------------------
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-ha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-ha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-ha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-sfc-ha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-nofeature-ha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-ha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-kvm-ha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-ha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+# NOHA Scenarios
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-noha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-noha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-noha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-sfc-noha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-nofeature-noha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-noha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-kvm-noha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-noha-zte-pod2-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+#-----------------------------------------------
+# ZTE POD3 Triggers running against colorado branch
+#-----------------------------------------------
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-ha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-ha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-ha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-sfc-ha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-nofeature-ha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-ha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-kvm-ha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-ha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+# NOHA Scenarios
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-noha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-noha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-noha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-sfc-noha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-nofeature-noha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-noha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-kvm-noha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-noha-zte-pod3-daily-colorado-trigger'
+ triggers:
+ - timed: ''
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index f022ce305..6d0370983 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -22,7 +22,6 @@
branch: 'stable/{stream}'
disabled: false
gs-pathname: '/{stream}'
- auto-trigger-name: 'daily-trigger-disabled'
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
@@ -47,14 +46,9 @@
- orange-pod1:
slave-label: orange-pod1
<<: *master
- - orange-pod2:
- slave-label: orange-pod2
- <<: *master
- - juniper-pod1:
- slave-label: juniper-pod1
- <<: *master
#--------------------------------
-# new scenario descriptions
+# scenarios
+#--------------------------------
scenario:
- 'os-nosdn-nofeature-noha':
auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
@@ -224,7 +218,7 @@
- trigger:
name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger'
triggers:
- - timed: '0 2 * * *'
+ - timed: '5 2 * * *'
- trigger:
name: 'joid-os-nosdn-nofeature-ha-virtual-master-trigger'
triggers:
@@ -233,20 +227,24 @@
name: 'joid-os-nosdn-nofeature-ha-orange-pod1-master-trigger'
triggers:
- timed: ''
+# os-nosdn-nofeature-ha trigger - branch: colorado
+- trigger:
+ name: 'joid-os-nosdn-nofeature-ha-baremetal-colorado-trigger'
+ triggers:
+ - timed: '0 2 * * *'
- trigger:
- name: 'joid-os-nosdn-nofeature-ha-orange-pod2-master-trigger'
+ name: 'joid-os-nosdn-nofeature-ha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-master-trigger'
+ name: 'joid-os-nosdn-nofeature-ha-orange-pod1-colorado-trigger'
triggers:
- timed: ''
-
# os-odl_l2-nofeature-ha trigger - branch: master
- trigger:
name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger'
triggers:
- - timed: '0 7 * * *'
+ - timed: '5 7 * * *'
- trigger:
name: 'joid-os-odl_l2-nofeature-ha-virtual-master-trigger'
triggers:
@@ -255,20 +253,24 @@
name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-master-trigger'
triggers:
- timed: ''
+# os-odl_l2-nofeature-ha trigger - branch: colorado
- trigger:
- name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-master-trigger'
+ name: 'joid-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
+ triggers:
+ - timed: '0 7 * * *'
+- trigger:
+ name: 'joid-os-odl_l2-nofeature-ha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-master-trigger'
+ name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-colorado-trigger'
triggers:
- timed: ''
-
# os-onos-nofeature-ha trigger - branch: master
- trigger:
name: 'joid-os-onos-nofeature-ha-baremetal-master-trigger'
triggers:
- - timed: '0 12 * * *'
+ - timed: '5 12 * * *'
- trigger:
name: 'joid-os-onos-nofeature-ha-virtual-master-trigger'
triggers:
@@ -277,20 +279,24 @@
name: 'joid-os-onos-nofeature-ha-orange-pod1-master-trigger'
triggers:
- timed: ''
+# os-onos-nofeature-ha trigger - branch: colorado
- trigger:
- name: 'joid-os-onos-nofeature-ha-orange-pod2-master-trigger'
+ name: 'joid-os-onos-nofeature-ha-baremetal-colorado-trigger'
+ triggers:
+ - timed: '0 12 * * *'
+- trigger:
+ name: 'joid-os-onos-nofeature-ha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'joid-os-onos-nofeature-ha-juniper-pod1-master-trigger'
+ name: 'joid-os-onos-nofeature-ha-orange-pod1-colorado-trigger'
triggers:
- timed: ''
-
# os-onos-sfc-ha trigger - branch: master
- trigger:
name: 'joid-os-onos-sfc-ha-baremetal-master-trigger'
triggers:
- - timed: '0 17 * * *'
+ - timed: '5 17 * * *'
- trigger:
name: 'joid-os-onos-sfc-ha-virtual-master-trigger'
triggers:
@@ -299,20 +305,24 @@
name: 'joid-os-onos-sfc-ha-orange-pod1-master-trigger'
triggers:
- timed: ''
+# os-onos-sfc-ha trigger - branch: colorado
- trigger:
- name: 'joid-os-onos-sfc-ha-orange-pod2-master-trigger'
+ name: 'joid-os-onos-sfc-ha-baremetal-colorado-trigger'
+ triggers:
+ - timed: '0 17 * * *'
+- trigger:
+ name: 'joid-os-onos-sfc-ha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'joid-os-onos-sfc-ha-juniper-pod1-master-trigger'
+ name: 'joid-os-onos-sfc-ha-orange-pod1-colorado-trigger'
triggers:
- timed: ''
-
# os-nosdn-lxd-noha trigger - branch: master
- trigger:
name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger'
triggers:
- - timed: '0 22 * * *'
+ - timed: '5 22 * * *'
- trigger:
name: 'joid-os-nosdn-lxd-noha-virtual-master-trigger'
triggers:
@@ -321,20 +331,24 @@
name: 'joid-os-nosdn-lxd-noha-orange-pod1-master-trigger'
triggers:
- timed: ''
+# os-nosdn-lxd-noha trigger - branch: colorado
- trigger:
- name: 'joid-os-nosdn-lxd-noha-orange-pod2-master-trigger'
+ name: 'joid-os-nosdn-lxd-noha-baremetal-colorado-trigger'
+ triggers:
+ - timed: '0 22 * * *'
+- trigger:
+ name: 'joid-os-nosdn-lxd-noha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'joid-os-nosdn-lxd-noha-juniper-pod1-master-trigger'
+ name: 'joid-os-nosdn-lxd-noha-orange-pod1-colorado-trigger'
triggers:
- timed: ''
-
# os-nosdn-lxd-ha trigger - branch: master
- trigger:
name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger'
triggers:
- - timed: '0 10 * * *'
+ - timed: '5 10 * * *'
- trigger:
name: 'joid-os-nosdn-lxd-ha-virtual-master-trigger'
triggers:
@@ -343,20 +357,24 @@
name: 'joid-os-nosdn-lxd-ha-orange-pod1-master-trigger'
triggers:
- timed: ''
+# os-nosdn-lxd-ha trigger - branch: colorado
- trigger:
- name: 'joid-os-nosdn-lxd-ha-orange-pod2-master-trigger'
+ name: 'joid-os-nosdn-lxd-ha-baremetal-colorado-trigger'
+ triggers:
+ - timed: '0 10 * * *'
+- trigger:
+ name: 'joid-os-nosdn-lxd-ha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'joid-os-nosdn-lxd-ha-juniper-pod1-master-trigger'
+ name: 'joid-os-nosdn-lxd-ha-orange-pod1-colorado-trigger'
triggers:
- timed: ''
-
# os-nosdn-nofeature-noha trigger - branch: master
- trigger:
name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger'
triggers:
- - timed: '0 4 * * *'
+ - timed: '5 4 * * *'
- trigger:
name: 'joid-os-nosdn-nofeature-noha-virtual-master-trigger'
triggers:
@@ -365,11 +383,16 @@
name: 'joid-os-nosdn-nofeature-noha-orange-pod1-master-trigger'
triggers:
- timed: ''
+# os-nosdn-nofeature-noha trigger - branch: colorado
+- trigger:
+ name: 'joid-os-nosdn-nofeature-noha-baremetal-colorado-trigger'
+ triggers:
+ - timed: '0 4 * * *'
- trigger:
- name: 'joid-os-nosdn-nofeature-noha-orange-pod2-master-trigger'
+ name: 'joid-os-nosdn-nofeature-noha-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'joid-os-nosdn-nofeature-noha-juniper-pod1-master-trigger'
+ name: 'joid-os-nosdn-nofeature-noha-orange-pod1-colorado-trigger'
triggers:
- timed: ''
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 833a1d449..d1225dcab 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -70,22 +70,10 @@
default: 'mitaka'
description: 'OpenStack release (liberty|mitaka)'
- string:
- name: EXTERNAL_NETWORK
- default: ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24
- description: "External network to create (name;type;first ip;last ip; gateway;network)"
- - string:
- name: CEPH_DISKS
- default: '/srv'
- description: "Disks to use by ceph by default (space separated list)"
- - string:
name: LAB_CONFIG
default: "$HOME/joid_config"
description: "Local lab config and Openstack openrc location"
- string:
- name: CEPH_REFORMAT
- default: 'false'
- description: "Format or not disk before using ceph [true/false] (must be done the first time)"
- - string:
name: MAAS_REINSTALL
default: 'false'
description: "Reinstall MAAS and Bootstrap before deploy [true/false]"
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index dd94679a3..019148a96 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -160,14 +160,6 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- - string:
- name: CEPH_DISKS
- default: /srv
- description: "Disks to use by ceph (comma separated list)"
- - string:
- name: EXTERNAL_NETWORK
- default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24
- description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)"
#####################################################
# Parameters for CI virtual PODs
#####################################################
@@ -480,14 +472,6 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- - string:
- name: CEPH_DISKS
- default: /dev/sdb /dev/sdc
- description: "Disks to use by ceph by default (space separated list)"
- - string:
- name: EXTERNAL_NETWORK
- default: ext-net;flat;161.105.231.2;161.105.231.62;161.105.231.1;161.105.231.0/26
- description: "External network to create (name;type;first ip;last ip; gateway;network)"
- parameter:
name: 'orange-pod2-defaults'
parameters:
@@ -502,14 +486,6 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- - string:
- name: CEPH_DISKS
- default: /dev/sdb /dev/sdc
- description: "Disks to use by ceph by default (space separated list)"
- - string:
- name: EXTERNAL_NETWORK
- default: ext-net;flat;161.105.231.2;161.105.231.62;161.105.231.1;161.105.231.0/26
- description: "External network to create (name;type;first ip;last ip; gateway;network)"
- parameter:
name: 'orange-pod5-defaults'
parameters:
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index eacb790a2..d9fb43555 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -1,5 +1,5 @@
###################################
-# job configuration for functest
+# job configuration for yardstick
###################################
- project:
name: yardstick
@@ -18,7 +18,7 @@
stream: colorado
branch: 'stable/{stream}'
gs-pathname: '{stream}'
- docker-tag: 'colorado.1.0'
+ docker-tag: 'stable'
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------