The default branches of Sahara and Zaqar are still set to master
and they cannot be run due to global-requirements conflict.
Change-Id: I2d05118537b68bef0e3c6686b7263e1dc445d39e
| ... | ... |
@@ -23,7 +23,7 @@ set +o xtrace |
| 23 | 23 |
|
| 24 | 24 |
# Set up default repos |
| 25 | 25 |
SAHARA_REPO=${SAHARA_REPO:-${GIT_BASE}/openstack/sahara.git}
|
| 26 |
-SAHARA_BRANCH=${SAHARA_BRANCH:-master}
|
|
| 26 |
+SAHARA_BRANCH=${SAHARA_BRANCH:-stable/juno}
|
|
| 27 | 27 |
|
| 28 | 28 |
SAHARA_PYTHONCLIENT_REPO=${SAHARA_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-saharaclient.git}
|
| 29 | 29 |
SAHARA_PYTHONCLIENT_BRANCH=${SAHARA_PYTHONCLIENT_BRANCH:-master}
|
| ... | ... |
@@ -48,7 +48,7 @@ ZAQAR_BACKEND=${ZAQAR_BACKEND:-mongodb}
|
| 48 | 48 |
|
| 49 | 49 |
# Set Zaqar repository |
| 50 | 50 |
ZAQAR_REPO=${ZAQAR_REPO:-${GIT_BASE}/openstack/zaqar.git}
|
| 51 |
-ZAQAR_BRANCH=${ZAQAR_BRANCH:-master}
|
|
| 51 |
+ZAQAR_BRANCH=${ZAQAR_BRANCH:-stable/juno}
|
|
| 52 | 52 |
|
| 53 | 53 |
# Set client library repository |
| 54 | 54 |
ZAQARCLIENT_REPO=${ZAQARCLIENT_REPO:-${GIT_BASE}/openstack/python-zaqarclient.git}
|