diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 12 | ||||
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 23 | ||||
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 4 |
3 files changed, 8 insertions, 31 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index ddc6c1694..c861b92fe 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -203,7 +203,7 @@ - trigger: name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '' + - timed: '0 2 * * *' - trigger: name: 'joid-os-nosdn-nofeature-ha-virtual-master-trigger' triggers: @@ -221,7 +221,7 @@ - trigger: name: 'joid-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger' triggers: - - timed: '0 2 * * *' + - timed: '' - trigger: name: 'joid-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger' triggers: @@ -239,7 +239,7 @@ - trigger: name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '' + - timed: '0 10 * * *' - trigger: name: 'joid-os-odl_l2-nofeature-ha-virtual-master-trigger' triggers: @@ -257,7 +257,7 @@ - trigger: name: 'joid-os-odl_l2-nofeature-ha-baremetal-brahmaputra-trigger' triggers: - - timed: '0 10 * * *' + - timed: '' - trigger: name: 'joid-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger' triggers: @@ -275,7 +275,7 @@ - trigger: name: 'joid-os-onos-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '' + - timed: '0 18 * * *' - trigger: name: 'joid-os-onos-nofeature-ha-virtual-master-trigger' triggers: @@ -293,7 +293,7 @@ - trigger: name: 'joid-os-onos-nofeature-ha-baremetal-brahmaputra-trigger' triggers: - - timed: '0 18 * * *' + - timed: '' - trigger: name: 'joid-os-onos-nofeature-ha-virtual-brahmaputra-trigger' triggers: diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index 51a1469c4..bd2597320 100644 --- a/jjb/joid/joid-deploy.sh +++ b/jjb/joid/joid-deploy.sh @@ -223,29 +223,6 @@ curl -i -sw '%{http_code}' -H "Content-Type: application/json" -d " }" http://$KEYSTONE:5000/v3/auth/tokens |grep "HTTP/1.1 20" 2>&1 >/dev/null; exit_on_error $? "Deploy FAILED to auth to openstack" - -## -## Create external network if needed -## - -# If we have more information than only the name, try to create it -if [ -z "$EXTNET_TYPE" ]; then - echo "------ No data for external network creation, pass ------" -elif [[ "$DEPLOY_SCENARIO" =~ "onos" ]]; then - echo "------ ONOS have created the external network, pass ------" -else - echo "------ External network creation ------" - neutron net-create $EXTNET_NAME --router:external True \ - --provider:physical_network external --provider:network_type $EXTNET_TYPE - exit_on_error $? "External network creation failed" - neutron subnet-create $EXTNET_NAME --name $EXTNET_NAME \ - --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ - --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET - exit_on_error $? "External subnet creation failed" - neutron net-update $EXTNET_NAME --shared - exit_on_error $? "External network sharing failed" -fi - ## ## Exit success ## diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index c0223e235..98a15de79 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -63,8 +63,8 @@ description: 'Installer used for deploying OPNFV on this POD' - string: name: OS_RELEASE - default: 'liberty' - description: 'OpenStack release (kilo|liberty)' + 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 |