Update branch references for stable/ocata
Change-Id: Id7400d5222a7608b992d6e0f629204265fe458c6
This commit is contained in:
parent
291d2d4c6a
commit
c1921f75b1
18
stackrc
18
stackrc
|
@ -225,35 +225,35 @@ REQUIREMENTS_DIR=$DEST/requirements
|
||||||
|
|
||||||
# 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/ocata}
|
||||||
|
|
||||||
# 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/ocata}
|
||||||
|
|
||||||
# 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/ocata}
|
||||||
|
|
||||||
# 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/ocata}
|
||||||
|
|
||||||
# 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/ocata}
|
||||||
|
|
||||||
# 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/ocata}
|
||||||
|
|
||||||
# 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/ocata}
|
||||||
|
|
||||||
# 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/ocata}
|
||||||
|
|
||||||
##############
|
##############
|
||||||
#
|
#
|
||||||
|
@ -263,7 +263,7 @@ SWIFT_BRANCH=${SWIFT_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/ocata}
|
||||||
|
|
||||||
# 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/ocata'`
|
||||||
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