Skip to content

Commit f9c2a68

Browse files
committed
Add cursive to LIBS_FROM_GIT
Allow cursive to be installed from git instead of pip. The barbican-tempest-plugin, which uses cursive indirectly through nova and glance, would benefit from the ability to use cursive from git instead of pip. Change-Id: Icae7d310f1ee392d080e7c8e421a26d7c0ef4727
1 parent 94047f4 commit f9c2a68

3 files changed

Lines changed: 7 additions & 1 deletion

File tree

lib/oslo

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ set +o xtrace
2424
# --------
2525
GITDIR["automaton"]=$DEST/automaton
2626
GITDIR["cliff"]=$DEST/cliff
27+
GITDIR["cursive"]=$DEST/cursive
2728
GITDIR["debtcollector"]=$DEST/debtcollector
2829
GITDIR["futurist"]=$DEST/futurist
2930
GITDIR["os-client-config"]=$DEST/os-client-config
@@ -72,6 +73,7 @@ function _do_install_oslo_lib {
7273
function install_oslo {
7374
_do_install_oslo_lib "automaton"
7475
_do_install_oslo_lib "cliff"
76+
_do_install_oslo_lib "cursive"
7577
_do_install_oslo_lib "debtcollector"
7678
_do_install_oslo_lib "futurist"
7779
_do_install_oslo_lib "osc-lib"

stackrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,10 @@ GITBRANCH["pbr"]=${PBR_BRANCH:-master}
483483
#
484484
##################
485485

486+
# cursive library
487+
GITREPO["cursive"]=${CURSIVE_REPO:-${GIT_BASE}/openstack/cursive.git}
488+
GITBRANCH["cursive"]=${CURSIVE_BRANCH:-master}
489+
486490
# glance store library
487491
GITREPO["glance_store"]=${GLANCE_STORE_REPO:-${GIT_BASE}/openstack/glance_store.git}
488492
GITBRANCH["glance_store"]=${GLANCE_STORE_BRANCH:-master}

tests/test_libs_from_pypi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ALL_LIBS+=" python-openstackclient osc-lib os-client-config oslo.rootwrap"
4040
ALL_LIBS+=" oslo.i18n oslo.utils python-openstacksdk python-swiftclient"
4141
ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"
4242
ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"
43-
ALL_LIBS+=" oslo.cache oslo.reports osprofiler"
43+
ALL_LIBS+=" oslo.cache oslo.reports osprofiler cursive"
4444
ALL_LIBS+=" keystoneauth ironic-lib neutron-lib oslo.privsep"
4545
ALL_LIBS+=" diskimage-builder os-vif python-brick-cinderclient-ext"
4646

0 commit comments

Comments
 (0)