Change-Id: I912b79983b11d79a2f2cfca499a48625b7cef13e
| ... | ... |
@@ -51,7 +51,7 @@ pass_fail $? 0 bash8 |
| 51 | 51 |
|
| 52 | 52 |
echo "Ensuring we don't have crazy refs" |
| 53 | 53 |
|
| 54 |
-REFS=`grep BRANCH stackrc | grep -v -- '-master'` |
|
| 54 |
+REFS=`grep BRANCH stackrc | grep -v -- '-master|-stable/juno'` |
|
| 55 | 55 |
rc=$? |
| 56 | 56 |
pass_fail $rc 1 crazy-refs |
| 57 | 57 |
if [[ $rc -eq 0 ]]; then |
| ... | ... |
@@ -131,47 +131,47 @@ GIT_BASE=${GIT_BASE:-git://git.openstack.org}
|
| 131 | 131 |
|
| 132 | 132 |
# metering service |
| 133 | 133 |
CEILOMETER_REPO=${CEILOMETER_REPO:-${GIT_BASE}/openstack/ceilometer.git}
|
| 134 |
-CEILOMETER_BRANCH=${CEILOMETER_BRANCH:-master}
|
|
| 134 |
+CEILOMETER_BRANCH=${CEILOMETER_BRANCH:-stable/juno}
|
|
| 135 | 135 |
|
| 136 | 136 |
# volume service |
| 137 | 137 |
CINDER_REPO=${CINDER_REPO:-${GIT_BASE}/openstack/cinder.git}
|
| 138 |
-CINDER_BRANCH=${CINDER_BRANCH:-master}
|
|
| 138 |
+CINDER_BRANCH=${CINDER_BRANCH:-stable/juno}
|
|
| 139 | 139 |
|
| 140 | 140 |
# image catalog service |
| 141 | 141 |
GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git}
|
| 142 |
-GLANCE_BRANCH=${GLANCE_BRANCH:-master}
|
|
| 142 |
+GLANCE_BRANCH=${GLANCE_BRANCH:-stable/juno}
|
|
| 143 | 143 |
|
| 144 | 144 |
# heat service |
| 145 | 145 |
HEAT_REPO=${HEAT_REPO:-${GIT_BASE}/openstack/heat.git}
|
| 146 |
-HEAT_BRANCH=${HEAT_BRANCH:-master}
|
|
| 146 |
+HEAT_BRANCH=${HEAT_BRANCH:-stable/juno}
|
|
| 147 | 147 |
|
| 148 | 148 |
# django powered web control panel for openstack |
| 149 | 149 |
HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git}
|
| 150 |
-HORIZON_BRANCH=${HORIZON_BRANCH:-master}
|
|
| 150 |
+HORIZON_BRANCH=${HORIZON_BRANCH:-stable/juno}
|
|
| 151 | 151 |
|
| 152 | 152 |
# baremetal provisioning service |
| 153 | 153 |
IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git}
|
| 154 |
-IRONIC_BRANCH=${IRONIC_BRANCH:-master}
|
|
| 154 |
+IRONIC_BRANCH=${IRONIC_BRANCH:-stable/juno}
|
|
| 155 | 155 |
|
| 156 | 156 |
# unified auth system (manages accounts/tokens) |
| 157 | 157 |
KEYSTONE_REPO=${KEYSTONE_REPO:-${GIT_BASE}/openstack/keystone.git}
|
| 158 |
-KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master}
|
|
| 158 |
+KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-stable/juno}
|
|
| 159 | 159 |
|
| 160 | 160 |
# neutron service |
| 161 | 161 |
NEUTRON_REPO=${NEUTRON_REPO:-${GIT_BASE}/openstack/neutron.git}
|
| 162 |
-NEUTRON_BRANCH=${NEUTRON_BRANCH:-master}
|
|
| 162 |
+NEUTRON_BRANCH=${NEUTRON_BRANCH:-stable/juno}
|
|
| 163 | 163 |
|
| 164 | 164 |
# compute service |
| 165 | 165 |
NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git}
|
| 166 |
-NOVA_BRANCH=${NOVA_BRANCH:-master}
|
|
| 166 |
+NOVA_BRANCH=${NOVA_BRANCH:-stable/juno}
|
|
| 167 | 167 |
|
| 168 | 168 |
# storage service |
| 169 | 169 |
SWIFT_REPO=${SWIFT_REPO:-${GIT_BASE}/openstack/swift.git}
|
| 170 |
-SWIFT_BRANCH=${SWIFT_BRANCH:-master}
|
|
| 170 |
+SWIFT_BRANCH=${SWIFT_BRANCH:-stable/juno}
|
|
| 171 | 171 |
|
| 172 | 172 |
# trove service |
| 173 | 173 |
TROVE_REPO=${TROVE_REPO:-${GIT_BASE}/openstack/trove.git}
|
| 174 |
-TROVE_BRANCH=${TROVE_BRANCH:-master}
|
|
| 174 |
+TROVE_BRANCH=${TROVE_BRANCH:-stable/juno}
|
|
| 175 | 175 |
|
| 176 | 176 |
############## |
| 177 | 177 |
# |
| ... | ... |
@@ -181,7 +181,7 @@ TROVE_BRANCH=${TROVE_BRANCH:-master}
|
| 181 | 181 |
|
| 182 | 182 |
# consolidated openstack requirements |
| 183 | 183 |
REQUIREMENTS_REPO=${REQUIREMENTS_REPO:-${GIT_BASE}/openstack/requirements.git}
|
| 184 |
-REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-master}
|
|
| 184 |
+REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-stable/juno}
|
|
| 185 | 185 |
|
| 186 | 186 |
# Tempest test suite |
| 187 | 187 |
TEMPEST_REPO=${TEMPEST_REPO:-${GIT_BASE}/openstack/tempest.git}
|