Merge "Add oslo.concurrency and oslo.middleware"

This commit is contained in:
Jenkins 2014-09-07 13:00:02 +00:00 committed by Gerrit Code Review
commit 1821200bc5
2 changed files with 16 additions and 0 deletions

View File

@ -22,8 +22,10 @@ set +o xtrace
# --------
CLIFF_DIR=$DEST/cliff
OSLOCFG_DIR=$DEST/oslo.config
OSLOCON_DIR=$DEST/oslo.concurrency
OSLODB_DIR=$DEST/oslo.db
OSLOI18N_DIR=$DEST/oslo.i18n
OSLOMID_DIR=$DEST/oslo.middleware
OSLOMSG_DIR=$DEST/oslo.messaging
OSLORWRAP_DIR=$DEST/oslo.rootwrap
OSLOSERIALIZATION_DIR=$DEST/oslo.serialization
@ -56,6 +58,12 @@ function install_oslo {
git_clone $OSLOCFG_REPO $OSLOCFG_DIR $OSLOCFG_BRANCH
setup_install $OSLOCFG_DIR
git_clone $OSLOCON_REPO $OSLOCON_DIR $OSLOCON_BRANCH
setup_install $OSLOCON_DIR
git_clone $OSLOMID_REPO $OSLOMID_DIR $OSLOMID_BRANCH
setup_install $OSLOMID_DIR
git_clone $OSLOMSG_REPO $OSLOMSG_DIR $OSLOMSG_BRANCH
setup_install $OSLOMSG_DIR

View File

@ -220,6 +220,10 @@ ORC_BRANCH=${ORC_BRANCH:-master}
CLIFF_REPO=${CLIFF_REPO:-${GIT_BASE}/openstack/cliff.git}
CLIFF_BRANCH=${CLIFF_BRANCH:-master}
# oslo.concurrency
OSLOCON_REPO=${OSLOCON_REPO:-${GIT_BASE}/openstack/oslo.concurrency.git}
OSLOCON_BRANCH=${OSLOCON_BRANCH:-master}
# oslo.config
OSLOCFG_REPO=${OSLOCFG_REPO:-${GIT_BASE}/openstack/oslo.config.git}
OSLOCFG_BRANCH=${OSLOCFG_BRANCH:-master}
@ -236,6 +240,10 @@ OSLOI18N_BRANCH=${OSLOI18N_BRANCH:-master}
OSLOMSG_REPO=${OSLOMSG_REPO:-${GIT_BASE}/openstack/oslo.messaging.git}
OSLOMSG_BRANCH=${OSLOMSG_BRANCH:-master}
# oslo.middleware
OSLOMID_REPO=${OSLOMID_REPO:-${GIT_BASE}/openstack/oslo.middleware.git}
OSLOMID_BRANCH=${OSLOMID_BRANCH:-master}
# oslo.rootwrap
OSLORWRAP_REPO=${OSLORWRAP_REPO:-${GIT_BASE}/openstack/oslo.rootwrap.git}
OSLORWRAP_BRANCH=${OSLORWRAP_BRANCH:-master}