Install the oslo.concurrency and oslo.middleware libraries from source so
the gate tests are run against master.
Change-Id: I194fc160127ab8b4b7d0086586d8ba7f92c67076
... | ... |
@@ -22,8 +22,10 @@ set +o xtrace |
22 | 22 |
# -------- |
23 | 23 |
CLIFF_DIR=$DEST/cliff |
24 | 24 |
OSLOCFG_DIR=$DEST/oslo.config |
25 |
+OSLOCON_DIR=$DEST/oslo.concurrency |
|
25 | 26 |
OSLODB_DIR=$DEST/oslo.db |
26 | 27 |
OSLOI18N_DIR=$DEST/oslo.i18n |
28 |
+OSLOMID_DIR=$DEST/oslo.middleware |
|
27 | 29 |
OSLOMSG_DIR=$DEST/oslo.messaging |
28 | 30 |
OSLORWRAP_DIR=$DEST/oslo.rootwrap |
29 | 31 |
OSLOVMWARE_DIR=$DEST/oslo.vmware |
... | ... |
@@ -48,6 +50,12 @@ function install_oslo { |
48 | 48 |
git_clone $OSLOCFG_REPO $OSLOCFG_DIR $OSLOCFG_BRANCH |
49 | 49 |
setup_install $OSLOCFG_DIR |
50 | 50 |
|
51 |
+ git_clone $OSLOCON_REPO $OSLOCON_DIR $OSLOCON_BRANCH |
|
52 |
+ setup_install $OSLOCON_DIR |
|
53 |
+ |
|
54 |
+ git_clone $OSLOMID_REPO $OSLOMID_DIR $OSLOMID_BRANCH |
|
55 |
+ setup_install $OSLOMID_DIR |
|
56 |
+ |
|
51 | 57 |
git_clone $OSLOMSG_REPO $OSLOMSG_DIR $OSLOMSG_BRANCH |
52 | 58 |
setup_install $OSLOMSG_DIR |
53 | 59 |
|
... | ... |
@@ -220,6 +220,10 @@ ORC_BRANCH=${ORC_BRANCH:-master} |
220 | 220 |
CLIFF_REPO=${CLIFF_REPO:-${GIT_BASE}/openstack/cliff.git} |
221 | 221 |
CLIFF_BRANCH=${CLIFF_BRANCH:-master} |
222 | 222 |
|
223 |
+# oslo.concurrency |
|
224 |
+OSLOCON_REPO=${OSLOCON_REPO:-${GIT_BASE}/openstack/oslo.concurrency.git} |
|
225 |
+OSLOCON_BRANCH=${OSLOCON_BRANCH:-master} |
|
226 |
+ |
|
223 | 227 |
# oslo.config |
224 | 228 |
OSLOCFG_REPO=${OSLOCFG_REPO:-${GIT_BASE}/openstack/oslo.config.git} |
225 | 229 |
OSLOCFG_BRANCH=${OSLOCFG_BRANCH:-master} |
... | ... |
@@ -236,6 +240,10 @@ OSLOI18N_BRANCH=${OSLOI18N_BRANCH:-master} |
236 | 236 |
OSLOMSG_REPO=${OSLOMSG_REPO:-${GIT_BASE}/openstack/oslo.messaging.git} |
237 | 237 |
OSLOMSG_BRANCH=${OSLOMSG_BRANCH:-master} |
238 | 238 |
|
239 |
+# oslo.middleware |
|
240 |
+OSLOMID_REPO=${OSLOMID_REPO:-${GIT_BASE}/openstack/oslo.middleware.git} |
|
241 |
+OSLOMID_BRANCH=${OSLOMID_BRANCH:-master} |
|
242 |
+ |
|
239 | 243 |
# oslo.rootwrap |
240 | 244 |
OSLORWRAP_REPO=${OSLORWRAP_REPO:-${GIT_BASE}/openstack/oslo.rootwrap.git} |
241 | 245 |
OSLORWRAP_BRANCH=${OSLORWRAP_BRANCH:-master} |