update for stable/kilo branches
This updates the default branches to be in line with stable kilo branches. Change-Id: I482a6ce04206b81e4e749a81548e3457ff6f1b2c
This commit is contained in:
parent
14d1cf90ed
commit
555ce8e640
|
@ -2,3 +2,4 @@
|
||||||
host=review.openstack.org
|
host=review.openstack.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack-dev/devstack.git
|
project=openstack-dev/devstack.git
|
||||||
|
defaultbranch=stable/kilo
|
||||||
|
|
32
stackrc
32
stackrc
|
@ -177,63 +177,63 @@ GIT_BASE=${GIT_BASE:-git://git.openstack.org}
|
||||||
|
|
||||||
# telemetry service
|
# telemetry service
|
||||||
CEILOMETER_REPO=${CEILOMETER_REPO:-${GIT_BASE}/openstack/ceilometer.git}
|
CEILOMETER_REPO=${CEILOMETER_REPO:-${GIT_BASE}/openstack/ceilometer.git}
|
||||||
CEILOMETER_BRANCH=${CEILOMETER_BRANCH:-master}
|
CEILOMETER_BRANCH=${CEILOMETER_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# block storage service
|
# block storage service
|
||||||
CINDER_REPO=${CINDER_REPO:-${GIT_BASE}/openstack/cinder.git}
|
CINDER_REPO=${CINDER_REPO:-${GIT_BASE}/openstack/cinder.git}
|
||||||
CINDER_BRANCH=${CINDER_BRANCH:-master}
|
CINDER_BRANCH=${CINDER_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# image catalog service
|
# image catalog service
|
||||||
GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git}
|
GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git}
|
||||||
GLANCE_BRANCH=${GLANCE_BRANCH:-master}
|
GLANCE_BRANCH=${GLANCE_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# heat service
|
# heat service
|
||||||
HEAT_REPO=${HEAT_REPO:-${GIT_BASE}/openstack/heat.git}
|
HEAT_REPO=${HEAT_REPO:-${GIT_BASE}/openstack/heat.git}
|
||||||
HEAT_BRANCH=${HEAT_BRANCH:-master}
|
HEAT_BRANCH=${HEAT_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# django powered web control panel for openstack
|
# django powered web control panel for openstack
|
||||||
HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git}
|
HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git}
|
||||||
HORIZON_BRANCH=${HORIZON_BRANCH:-master}
|
HORIZON_BRANCH=${HORIZON_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# baremetal provisioning service
|
# baremetal provisioning service
|
||||||
IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git}
|
IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git}
|
||||||
IRONIC_BRANCH=${IRONIC_BRANCH:-master}
|
IRONIC_BRANCH=${IRONIC_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# unified auth system (manages accounts/tokens)
|
# unified auth system (manages accounts/tokens)
|
||||||
KEYSTONE_REPO=${KEYSTONE_REPO:-${GIT_BASE}/openstack/keystone.git}
|
KEYSTONE_REPO=${KEYSTONE_REPO:-${GIT_BASE}/openstack/keystone.git}
|
||||||
KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master}
|
KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# neutron service
|
# neutron service
|
||||||
NEUTRON_REPO=${NEUTRON_REPO:-${GIT_BASE}/openstack/neutron.git}
|
NEUTRON_REPO=${NEUTRON_REPO:-${GIT_BASE}/openstack/neutron.git}
|
||||||
NEUTRON_BRANCH=${NEUTRON_BRANCH:-master}
|
NEUTRON_BRANCH=${NEUTRON_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# neutron fwaas service
|
# neutron fwaas service
|
||||||
NEUTRON_FWAAS_REPO=${NEUTRON_FWAAS_REPO:-${GIT_BASE}/openstack/neutron-fwaas.git}
|
NEUTRON_FWAAS_REPO=${NEUTRON_FWAAS_REPO:-${GIT_BASE}/openstack/neutron-fwaas.git}
|
||||||
NEUTRON_FWAAS_BRANCH=${NEUTRON_FWAAS_BRANCH:-master}
|
NEUTRON_FWAAS_BRANCH=${NEUTRON_FWAAS_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# neutron lbaas service
|
# neutron lbaas service
|
||||||
NEUTRON_LBAAS_REPO=${NEUTRON_LBAAS_REPO:-${GIT_BASE}/openstack/neutron-lbaas.git}
|
NEUTRON_LBAAS_REPO=${NEUTRON_LBAAS_REPO:-${GIT_BASE}/openstack/neutron-lbaas.git}
|
||||||
NEUTRON_LBAAS_BRANCH=${NEUTRON_LBAAS_BRANCH:-master}
|
NEUTRON_LBAAS_BRANCH=${NEUTRON_LBAAS_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# neutron vpnaas service
|
# neutron vpnaas service
|
||||||
NEUTRON_VPNAAS_REPO=${NEUTRON_VPNAAS_REPO:-${GIT_BASE}/openstack/neutron-vpnaas.git}
|
NEUTRON_VPNAAS_REPO=${NEUTRON_VPNAAS_REPO:-${GIT_BASE}/openstack/neutron-vpnaas.git}
|
||||||
NEUTRON_VPNAAS_BRANCH=${NEUTRON_VPNAAS_BRANCH:-master}
|
NEUTRON_VPNAAS_BRANCH=${NEUTRON_VPNAAS_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# compute service
|
# compute service
|
||||||
NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git}
|
NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git}
|
||||||
NOVA_BRANCH=${NOVA_BRANCH:-master}
|
NOVA_BRANCH=${NOVA_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# data processing service
|
# data processing service
|
||||||
SAHARA_REPO=${SAHARA_REPO:-${GIT_BASE}/openstack/sahara.git}
|
SAHARA_REPO=${SAHARA_REPO:-${GIT_BASE}/openstack/sahara.git}
|
||||||
SAHARA_BRANCH=${SAHARA_BRANCH:-master}
|
SAHARA_BRANCH=${SAHARA_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# object storage service
|
# object storage service
|
||||||
SWIFT_REPO=${SWIFT_REPO:-${GIT_BASE}/openstack/swift.git}
|
SWIFT_REPO=${SWIFT_REPO:-${GIT_BASE}/openstack/swift.git}
|
||||||
SWIFT_BRANCH=${SWIFT_BRANCH:-master}
|
SWIFT_BRANCH=${SWIFT_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# trove service
|
# trove service
|
||||||
TROVE_REPO=${TROVE_REPO:-${GIT_BASE}/openstack/trove.git}
|
TROVE_REPO=${TROVE_REPO:-${GIT_BASE}/openstack/trove.git}
|
||||||
TROVE_BRANCH=${TROVE_BRANCH:-master}
|
TROVE_BRANCH=${TROVE_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
|
|
||||||
##############
|
##############
|
||||||
|
@ -244,7 +244,7 @@ TROVE_BRANCH=${TROVE_BRANCH:-master}
|
||||||
|
|
||||||
# consolidated openstack requirements
|
# consolidated openstack requirements
|
||||||
REQUIREMENTS_REPO=${REQUIREMENTS_REPO:-${GIT_BASE}/openstack/requirements.git}
|
REQUIREMENTS_REPO=${REQUIREMENTS_REPO:-${GIT_BASE}/openstack/requirements.git}
|
||||||
REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-master}
|
REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-stable/kilo}
|
||||||
|
|
||||||
# Tempest test suite
|
# Tempest test suite
|
||||||
TEMPEST_REPO=${TEMPEST_REPO:-${GIT_BASE}/openstack/tempest.git}
|
TEMPEST_REPO=${TEMPEST_REPO:-${GIT_BASE}/openstack/tempest.git}
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
echo "Ensuring we don't have crazy refs"
|
echo "Ensuring we don't have crazy refs"
|
||||||
|
|
||||||
REFS=`grep BRANCH stackrc | grep -v -- '-master'`
|
REFS=`grep BRANCH stackrc | grep -v -- '-master' | grep -v -- '-stable/kilo'`
|
||||||
rc=$?
|
rc=$?
|
||||||
if [[ $rc -eq 0 ]]; then
|
if [[ $rc -eq 0 ]]; then
|
||||||
echo "Branch defaults must be master. Found:"
|
echo "Branch defaults must be master. Found:"
|
||||||
|
|
Loading…
Reference in New Issue