summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-05-07 12:31:47 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-05-07 12:31:47 -0400
commitb2114c7edfffe750960b76f9f428efd1118ffeae (patch)
tree0d764173a05ff97ef7c85b334b1c3e11dc9df2d1
parent7e553f69dbfbdd2f79c892f6d6f25e1540088659 (diff)
downloadmeta-cloud-services-b2114c7edfffe750960b76f9f428efd1118ffeae.tar.gz
tempest: update to icehouse master revision
tempest no longer branches per-release and instead ensures that the single branch works for all releases. As such, we change to master and update the SRCREV to the latest. There is one new binary part of the package, so we add it to the default tempest package. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack/recipes-extended/tempest/tempest_git.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-openstack/recipes-extended/tempest/tempest_git.bb b/meta-openstack/recipes-extended/tempest/tempest_git.bb
index 8f710ef..a1522c6 100644
--- a/meta-openstack/recipes-extended/tempest/tempest_git.bb
+++ b/meta-openstack/recipes-extended/tempest/tempest_git.bb
@@ -9,13 +9,13 @@ SRCNAME = "tempest"
9 9
10inherit setuptools identity hosts 10inherit setuptools identity hosts
11 11
12SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ 12SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
13 file://tempest.conf \ 13 file://tempest.conf \
14 file://logging.conf \ 14 file://logging.conf \
15" 15"
16 16
17SRCREV="6273339e2da725b01560b6a2db11a3bf7a6659d7" 17SRCREV="50af5d5ecc7d21d5e0d1a36fa564ef4850cf94ff"
18PV="2013.2+git${SRCPV}" 18PV="2014.1+git${SRCPV}"
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
20 20
21do_install_append() { 21do_install_append() {
@@ -62,6 +62,7 @@ FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tests/*"
62 62
63FILES_${PN} = "${libdir}/* \ 63FILES_${PN} = "${libdir}/* \
64 ${sysconfdir}/* \ 64 ${sysconfdir}/* \
65 ${bindir}/* \
65" 66"
66RDEPENDS_${PN} += " \ 67RDEPENDS_${PN} += " \
67 ${SRCNAME}-tests \ 68 ${SRCNAME}-tests \