From 327ac77674d70d6bba2f17434dab787da0fec847 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 20 Apr 2015 16:09:26 +0800 Subject: python-neutron: upgrade to 2015.1.0b3 Removed the patch neutron-test-nec-plugin-extensions-location.patch since the main codes and unit tests of NEC plugin had been removed. Signed-off-by: Jackie Huang Signed-off-by: Bruce Ashfield --- ...utron-test-nec-plugin-extensions-location.patch | 24 ---------------------- .../recipes-devtools/python/python-neutron_git.bb | 7 ++----- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 meta-openstack/recipes-devtools/python/python-neutron/neutron-test-nec-plugin-extensions-location.patch diff --git a/meta-openstack/recipes-devtools/python/python-neutron/neutron-test-nec-plugin-extensions-location.patch b/meta-openstack/recipes-devtools/python/python-neutron/neutron-test-nec-plugin-extensions-location.patch deleted file mode 100644 index bf54c79..0000000 --- a/meta-openstack/recipes-devtools/python/python-neutron/neutron-test-nec-plugin-extensions-location.patch +++ /dev/null @@ -1,24 +0,0 @@ -neutron test: nec plugin extensions location - -Some of the neutron built-in testcases failed -because they can not find nec plugin extensions -based on the given the relative path. - -So forcing these failure testcases to look for -these extensions using absolute path. - -Signed-off-by: Vu Tran - -diff --git a/neutron/tests/unit/nec/test_nec_plugin.py b/neutron/tests/unit/nec/test_nec_plugin.py -index 2f913ca..1c3f0ce 100644 ---- a/neutron/tests/unit/nec/test_nec_plugin.py -+++ b/neutron/tests/unit/nec/test_nec_plugin.py -@@ -37,7 +37,7 @@ OFC_MANAGER = 'neutron.plugins.nec.nec_plugin.ofc_manager.OFCManager' - NOTIFIER = 'neutron.plugins.nec.nec_plugin.NECPluginV2AgentNotifierApi' - NEC_PLUGIN_INI = """ - [DEFAULT] --api_extensions_path = neutron/plugins/nec/extensions -+api_extensions_path = %PYTHON_SITEPACKAGES_DIR%/neutron/plugins/nec/extensions - [OFC] - driver = neutron.tests.unit.nec.stub_ofc_driver.StubOFCDriver - enable_packet_filter = False diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index 1a5a9b2..3c64d61 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -15,14 +15,13 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://metadata_agent.ini \ file://neutron-dhcp-agent-netns-cleanup.cron \ file://0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch \ - file://neutron-test-nec-plugin-extensions-location.patch \ " # TBD: update or drop # file://uuid_wscheck.patch -SRCREV="1948efa261e47b08e2cde4828321614ee6e169be" -PV="2015.1.0b2+git${SRCPV}" +SRCREV = "e86077e8452891cc176841dd6b6316831e12abc1" +PV = "2015.1.0b3+git${SRCPV}" S = "${WORKDIR}/git" @@ -137,8 +136,6 @@ do_install_append() { sed -i '/\[keystone_authtoken\]/aidentity_uri=http://127.0.0.1:8081/keystone/admin/' ${NEUTRON_CONF_DIR}/neutron.conf cp run_tests.sh ${NEUTRON_CONF_DIR} - - sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/tests/unit/nec/test_nec_plugin.py } pkg_postinst_${SRCNAME}-setup () { -- cgit v1.2.3-54-g00ecf From 6b986ac43ecb47e99a95bb433bfea1db00bb13f8 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 20 Apr 2015 16:09:22 +0800 Subject: python-heat: upgrade to 2015.1.0b3 Signed-off-by: Jackie Huang Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-heat_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb index 87e93c7..7750c93 100644 --- a/meta-openstack/recipes-devtools/python/python-heat_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb @@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://heat-tests-change-project_dir-path.patch \ " -SRCREV="6d106dee26649202791596062b5a29049e962d80" -PV="2015.1.0b2+git${SRCPV}" +SRCREV = "34cc6d7e96e1a54dce5c91cc09583e08f2fa778e" +PV = "2015.1.0b3+git${SRCPV}" S = "${WORKDIR}/git" SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn" -- cgit v1.2.3-54-g00ecf From 41e93407508c37e0436fde665ffe38398a25a968 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 20 Apr 2015 16:09:25 +0800 Subject: python-nova: upgrade to 2015.1.0b3 Signed-off-by: Jackie Huang Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-nova_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 9926208..71b5154 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb @@ -27,8 +27,8 @@ SRC_URI += "file://nova-all \ file://nova.conf \ file://openrc \ " -SRCREV="b6e11261a97bf96d5f9866f277d8ecc3be7891e5" -PV="2015.1.0b2+git${SRCPV}" +SRCREV = "dfcfa82af96bae12265875cb313d58109e536480" +PV = "2015.1.0b3+git${SRCPV}" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From e3f2f59b184ff3f355f7fecfa0c6de464af4d53e Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 20 Apr 2015 16:09:24 +0800 Subject: python-keystone: upgrade to 2015.1.0b3 Signed-off-by: Jackie Huang Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-keystone_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index 1f012cc..70cc790 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ # file://keystone-remove-git-commands-in-tests.patch # file://keystone-explicitly-import-localcontext-from-oslo.me.patch -SRCREV="0e633302e87261fdb3b0126c632fd676fc0a4d39" -PV="2015.1.0b2+git${SRCPV}" +SRCREV = "5933546ecbdb5a52abe31413ac7a18cc49ab23df" +PV = "2015.1.0b3+git${SRCPV}" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From b106b1c7842c9ce0003f9547b08d6869987f2f17 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 20 Apr 2015 16:09:23 +0800 Subject: python-horizon: upgrade to 2015.1.0b3 Signed-off-by: Jackie Huang Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-horizon_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index d0a9bab..376a4d1 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb @@ -70,8 +70,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://horizon-use-full-package-path-to-test-directories.patch \ " -SRCREV="9b37723a21e88c29732e2a4a9eeeecb9ecf19204" -PV="2015.1.0b2+git${SRCPV}" +SRCREV = "a174b4294dd26967953d404207763828c83cc2f7" +PV = "2015.1.0b3+git${SRCPV}" S = "${WORKDIR}/git" inherit setuptools update-rc.d python-dir default_configs openstackchef monitor -- cgit v1.2.3-54-g00ecf From 17c293bb57eac8ea7c3b0b5b66c8d5b69356caca Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 20 Apr 2015 16:09:19 +0800 Subject: python-barbican: upgrade to 2015.1.0b3 Signed-off-by: Jackie Huang Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-barbican_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb index 7f5184b..24557ad 100644 --- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb +++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb @@ -15,8 +15,8 @@ SRC_URI = "git://github.com/openstack/barbican.git;branch=master \ file://barbican-handle-white-space-in-date-strings.patch \ " -SRCREV="4744374458f14cc54c53daf946e7df2916f5c713" -PV="2015.1.0b2+git${SRCPV}" +SRCREV = "12966ea7ad40622e4189d832d13f4d9bfb9f3ada" +PV = "2015.1.0b3+git${SRCPV}" S = "${WORKDIR}/git" inherit update-rc.d setuptools identity hosts useradd default_configs openstackchef monitor -- cgit v1.2.3-54-g00ecf From 34f9c9546c6fd34f9d4925880395c0e3c0b2ea0f Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 20 Apr 2015 16:09:21 +0800 Subject: python-glance: upgrade to 2015.1.0b3 Signed-off-by: Jackie Huang Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-glance_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index dd6d0ef..694a301 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb @@ -14,8 +14,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ # removed. juno uses store library: file://0001-glance-store-only-load-known-stores-not-all-stores.patch # file://glance-change-builtin-tests-config-location.patch -SRCREV="c84d8c98bc0dd64d79bd1e659b9561d47b3428c1" -PV="2015.1.0b2+git${SRCPV}" +SRCREV = "232a8786dd01d4effc2ba15802792b08d0373676" +PV = "2015.1.0b3+git${SRCPV}" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 62046ff229d04e80d34a53c406249c557bcfcc11 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 20 Apr 2015 16:09:20 +0800 Subject: python-ceilometer: upgrade to 2015.1.0b3 Signed-off-by: Jackie Huang Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb index e734d32..b5f0e22 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb @@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ # file://ceilometer-builtin-tests-config-location.patch -SRCREV="b2871217fec965c77581b0f4a33608dad7867d4b" -PV="2015.1.0b2+git${SRCPV}" +SRCREV = "348ecb0861637da5575b094f8fa3fab1e3770928" +PV = "2015.1.0b3+git${SRCPV}" S = "${WORKDIR}/git" CEILOMETER_SECRET ?= "12121212" -- cgit v1.2.3-54-g00ecf From 05b65337d6002b699a0a22c6b1184498a6eb554b Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 20 Apr 2015 16:09:18 +0800 Subject: python-keystonemiddleware: upgrade to 1.5.0 Signed-off-by: Jackie Huang Signed-off-by: Bruce Ashfield --- .../recipes-devtools/python/python-keystonemiddleware_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb index f4ce244..9c23f61 100644 --- a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb @@ -11,8 +11,8 @@ SRC_URI = "\ git://git.openstack.org/openstack/keystonemiddleware;branch=master \ " -PV="1.4.0+git${SRCPV}" -SRCREV="782fb0129d2eb7f181f890068767ce2b6906b2bd" +PV = "1.5.0+git${SRCPV}" +SRCREV = "06bdfc886fed7e30684a612a3c6ff8616eb2be34" S = "${WORKDIR}/git" inherit setuptools -- cgit v1.2.3-54-g00ecf From 6c67500cb10f66138612af3af60bc5ab2e9e0467 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 20 Apr 2015 16:09:17 +0800 Subject: python-glancestore: upgrade to 0.4.0 Signed-off-by: Jackie Huang Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-glancestore_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb index b3aa2f3..ae32037 100644 --- a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb @@ -4,8 +4,8 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" -SRCREV = "bd592d3e33e5f6d222befd53523c97aaa478b175" -PV = "0.1.11+git${SRCPV}" +SRCREV = "ea88e503b617a7ac9a0ae7e537d6517e9992a104" +PV = "0.4.0+git${SRCPV}" SRC_URI = "\ git://github.com/openstack/glance_store.git \ -- cgit v1.2.3-54-g00ecf