From d265cbdc640d455a4feb62c4f98b7f609c3522f7 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Thu, 16 Oct 2014 10:01:11 -0500 Subject: [PATCH] Set defaults for stable/juno branch Change-Id: I912b79983b11d79a2f2cfca499a48625b7cef13e --- .gitreview | 1 + run_tests.sh | 2 +- stackrc | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitreview b/.gitreview index 570d31a987..184f94e076 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.openstack.org port=29418 project=openstack-dev/devstack.git +defaultbranch=stable/juno diff --git a/run_tests.sh b/run_tests.sh index b1aef4f81f..d479b947ce 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -51,7 +51,7 @@ pass_fail $? 0 bash8 echo "Ensuring we don't have crazy refs" -REFS=`grep BRANCH stackrc | grep -v -- '-master'` +REFS=`grep BRANCH stackrc | grep -v -- '-master|-stable/juno'` rc=$? pass_fail $rc 1 crazy-refs if [[ $rc -eq 0 ]]; then diff --git a/stackrc b/stackrc index 389952508d..da4393ecd1 100644 --- a/stackrc +++ b/stackrc @@ -131,47 +131,47 @@ GIT_BASE=${GIT_BASE:-git://git.openstack.org} # metering service CEILOMETER_REPO=${CEILOMETER_REPO:-${GIT_BASE}/openstack/ceilometer.git} -CEILOMETER_BRANCH=${CEILOMETER_BRANCH:-master} +CEILOMETER_BRANCH=${CEILOMETER_BRANCH:-stable/juno} # volume service CINDER_REPO=${CINDER_REPO:-${GIT_BASE}/openstack/cinder.git} -CINDER_BRANCH=${CINDER_BRANCH:-master} +CINDER_BRANCH=${CINDER_BRANCH:-stable/juno} # image catalog service GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git} -GLANCE_BRANCH=${GLANCE_BRANCH:-master} +GLANCE_BRANCH=${GLANCE_BRANCH:-stable/juno} # heat service HEAT_REPO=${HEAT_REPO:-${GIT_BASE}/openstack/heat.git} -HEAT_BRANCH=${HEAT_BRANCH:-master} +HEAT_BRANCH=${HEAT_BRANCH:-stable/juno} # django powered web control panel for openstack HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git} -HORIZON_BRANCH=${HORIZON_BRANCH:-master} +HORIZON_BRANCH=${HORIZON_BRANCH:-stable/juno} # baremetal provisioning service IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git} -IRONIC_BRANCH=${IRONIC_BRANCH:-master} +IRONIC_BRANCH=${IRONIC_BRANCH:-stable/juno} # unified auth system (manages accounts/tokens) KEYSTONE_REPO=${KEYSTONE_REPO:-${GIT_BASE}/openstack/keystone.git} -KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master} +KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-stable/juno} # neutron service NEUTRON_REPO=${NEUTRON_REPO:-${GIT_BASE}/openstack/neutron.git} -NEUTRON_BRANCH=${NEUTRON_BRANCH:-master} +NEUTRON_BRANCH=${NEUTRON_BRANCH:-stable/juno} # compute service NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git} -NOVA_BRANCH=${NOVA_BRANCH:-master} +NOVA_BRANCH=${NOVA_BRANCH:-stable/juno} # storage service SWIFT_REPO=${SWIFT_REPO:-${GIT_BASE}/openstack/swift.git} -SWIFT_BRANCH=${SWIFT_BRANCH:-master} +SWIFT_BRANCH=${SWIFT_BRANCH:-stable/juno} # trove service TROVE_REPO=${TROVE_REPO:-${GIT_BASE}/openstack/trove.git} -TROVE_BRANCH=${TROVE_BRANCH:-master} +TROVE_BRANCH=${TROVE_BRANCH:-stable/juno} ############## # @@ -181,7 +181,7 @@ TROVE_BRANCH=${TROVE_BRANCH:-master} # consolidated openstack requirements REQUIREMENTS_REPO=${REQUIREMENTS_REPO:-${GIT_BASE}/openstack/requirements.git} -REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-master} +REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-stable/juno} # Tempest test suite TEMPEST_REPO=${TEMPEST_REPO:-${GIT_BASE}/openstack/tempest.git}