summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml64
-rw-r--r--jjb/compass4nfv/compass-deploy.sh1
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml2
-rw-r--r--jjb/joid/joid-deploy.sh7
4 files changed, 63 insertions, 11 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 6bfc73778..500984ada 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -63,6 +63,12 @@
- 'os-onos-sfc-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ - 'os-odl_l2-moon-noha':
+ disabled: false
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ - 'os-nosdn-kvm-ha':
+ disabled: false
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
jobs:
- 'compass-{scenario}-{pod}-daily-{stream}'
@@ -236,11 +242,11 @@
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-master-trigger'
triggers:
- - timed: '0 21 * * *'
+ - timed: '0 23 * * *'
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger'
triggers:
- - timed: ''
+ - timed: '0 19 * * *'
- trigger:
name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger'
triggers:
@@ -248,10 +254,18 @@
- trigger:
name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger'
triggers:
- - timed: ''
+ - timed: '0 11 * * *'
- trigger:
name: 'compass-os-onos-sfc-ha-huawei-pod2-master-trigger'
triggers:
+ - timed: '0 7 * * *'
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-huawei-pod2-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-huawei-pod2-master-trigger'
+ triggers:
- timed: ''
- trigger:
@@ -261,11 +275,11 @@
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
triggers:
- - timed: '0 21 * * *'
+ - timed: '0 23 * * *'
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
triggers:
- - timed: ''
+ - timed: '0 19 * * *'
- trigger:
name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger'
triggers:
@@ -273,10 +287,18 @@
- trigger:
name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger'
triggers:
- - timed: '0 9 * * *'
+ - timed: '0 11 * * *'
- trigger:
name: 'compass-os-onos-sfc-ha-baremetal-master-trigger'
triggers:
+ - timed: '0 7 * * *'
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-baremetal-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
+ triggers:
- timed: ''
- trigger:
@@ -303,6 +325,14 @@
name: 'compass-os-onos-sfc-ha-baremetal-brahmaputra-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-baremetal-brahmaputra-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-baremetal-brahmaputra-trigger'
+ triggers:
+ - timed: ''
- trigger:
name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger'
@@ -311,11 +341,11 @@
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
triggers:
- - timed: '0 21 * * *'
+ - timed: '0 23 * * *'
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
triggers:
- - timed: ''
+ - timed: '0 19 * * *'
- trigger:
name: 'compass-os-onos-nofeature-ha-virtual-master-trigger'
triggers:
@@ -323,10 +353,18 @@
- trigger:
name: 'compass-os-ocl-nofeature-ha-virtual-master-trigger'
triggers:
- - timed: '0 9 * * *'
+ - timed: '0 11 * * *'
- trigger:
name: 'compass-os-onos-sfc-ha-virtual-master-trigger'
triggers:
+ - timed: '0 7 * * *'
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
+ triggers:
- timed: ''
- trigger:
@@ -353,3 +391,11 @@
name: 'compass-os-onos-sfc-ha-virtual-brahmaputra-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-virtual-brahmaputra-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-virtual-brahmaputra-trigger'
+ triggers:
+ - timed: ''
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index 0231ea588..c70a4ec53 100644
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -48,6 +48,7 @@ export OS_VERSION=${COMPASS_OS_VERSION}
export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" ]]; then
export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${COMPASS_OS_VERSION_OPTION}
+ export OS_VERSION=${COMPASS_OS_VERSION_OPTION}
fi
./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF}
if [ $? -ne 0 ]; then
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 6e10e2fc2..e92c7653b 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -170,7 +170,7 @@
branch: '{branch}'
triggers:
- - timed: 'H 14 * * *'
+ - timed: 'H 8 * * *'
builders:
- shell:
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 6d9e8aeba..4b8e3ffda 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -135,6 +135,11 @@ echo "------ Set ceph disks ------"
sed -i -- "s@osd-devices: /srv@osd-devices: $CEPH_DISKS@" $SRCBUNDLE
sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE
+# temporary sfc feature is availble only on onos and trusty
+if [ "$NFV_FEATURES" == 'sfc' ] && [ "$SDN_CONTROLLER" == 'onos' ];then
+ UBUNTU_DISTRO=trusty
+fi
+
##
## Configure Joid deployment
##
@@ -182,7 +187,7 @@ export OS_USERNAME=admin
export OS_PASSWORD=$OS_ADMIN_PASSWORD
export OS_TENANT_NAME=admin
export OS_AUTH_URL=http://$KEYSTONE:35357/v2.0
-export OS_REGION_NAME=Canonical
+export OS_REGION_NAME=RegionOne
export OS_ENDPOINT_TYPE='adminURL'
export CINDER_ENDPOINT_TYPE='adminURL'
export GLANCE_ENDPOINT_TYPE='adminURL'