summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO19
-rw-r--r--0000-fix-tests-assertItemsEqual.patch30
-rw-r--r--PKGBUILD14
3 files changed, 31 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index aad5415683f7..1d901f5e94a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = openstack-cinder
pkgdesc = OpenStack Block Storage
- pkgver = 18.0.0
+ pkgver = 18.1.0
pkgrel = 1
url = https://docs.openstack.org/cinder/latest/
arch = any
@@ -28,7 +28,7 @@ pkgbase = openstack-cinder
makedepends = python-os-api-ref
makedepends = python-sphinxcontrib-apidoc
makedepends = python-sphinx-feature-classification
- depends = qemu
+ depends = qemu-headless
depends = lvm2
depends = python
depends = python-pbr
@@ -93,7 +93,7 @@ pkgbase = openstack-cinder
depends = python-cursive
depends = python-zstd
conflicts = python-nova
- source = https://pypi.io/packages/source/c/cinder/cinder-18.0.0.tar.gz
+ source = https://pypi.io/packages/source/c/cinder/cinder-18.1.0.tar.gz
source = sudoers.conf
source = sysusers.conf
source = tmpfiles.conf
@@ -103,7 +103,7 @@ pkgbase = openstack-cinder
source = openstack-cinder-scheduler.service
source = openstack-cinder-volume.service
source = 0000-fix-tests-assertItemsEqual.patch
- md5sums = 1c9edfa61b7eef91a8163dbf124673c8
+ md5sums = 965af5d86dc86e852d9d173c6f568d33
md5sums = 081d18c05b770876e42a7d2c5d7c6369
md5sums = fac52361ddb959f0000f94f27cfa9a52
md5sums = 619a108ed34a4007dcceb5736b9f9333
@@ -112,8 +112,8 @@ pkgbase = openstack-cinder
md5sums = 266e5867fa92d49c7a1894242f1d5f89
md5sums = bdd1383229c0f41fcbe82314a54a0087
md5sums = 0f920ebfb231a55becbae65a4cfac61f
- md5sums = 9c5f1cd2f3f859ba26f65c469c99e413
- sha256sums = ebb6f9da205f11c27ae434d73f4ad7ccc3c8ba120de1f74e43d958a896579850
+ md5sums = b84575d0e6c19eebe3d963b120e0538d
+ sha256sums = bfff949d7dd48b9e2f095601aee36e2680cbb2b8962998db90a0787de75f1e80
sha256sums = 2c25a5fd7f6b442d23516d63d99dfbe506f8b55d6161a31d6611511345040f5c
sha256sums = dbd32daa64f08bb97a86ad42ea41e05bc2ca36b1c599b60bed80c3def9f79486
sha256sums = 494978135a165a725de2c55e84a5dbdbf4487348acdcbb8b94edf067cf8e403d
@@ -122,8 +122,8 @@ pkgbase = openstack-cinder
sha256sums = dadf618111c437e2edf1231b9e8a807081f7ace7ad97041e31c105a3af020272
sha256sums = 16ddcefde9a537a4d138252d467df733b70b19d7b063a3d3db2bd6c0b5cffd13
sha256sums = fd340cb5a437567c66293d486511e9a56fa3a33f8dd39788256923c7d36dc206
- sha256sums = 630dadfa9063ed95440ee218ee8794dcd5db17ec4f8ea8bbae404d2dd88e4d24
- sha512sums = acc1c93ab5b41747d6d4162612f8f8339d33f39a2bc49a51d3475813c7b38476232f5481ed481a3d05c872d8930f9dec490e84b905e3d493143cab9de365c536
+ sha256sums = 5b0d5d1c122309dfbc7d921503469a89e0c6f650113c827292a1b3f24a51dd93
+ sha512sums = e0fa24571883b5023840d88af65709448d256e24579530ccad5848c963da44e3b575aa5623cb2e298057c326b401228a7b6b5cabb8df827fc47ce49cd46f2008
sha512sums = b41cb64358fca6f5c27a17052233d41a3ab42beb74bb25a614b75645feb59e70d0adddf4eeeb5e6479cc61b6e18550452237899bed2d3892d5065e424d0cd5c0
sha512sums = 73ef8c60fe8152614f20033102b1ac7cd88afafdca5104178f208647041730079d51402ea6f97893b6e0012d11354d78d5c521d81a72d6cc8295ef595b15a710
sha512sums = 7fdb14679166b82058c11452c1b1c2c8ed198ae116e6fae18d1a78be2b27ba7a6beb091d77ebfcf2f2db1934185b027fc14219dcd2261a29d8d522e10f109218
@@ -132,9 +132,8 @@ pkgbase = openstack-cinder
sha512sums = 026621bdbca5a7a7edbb446386f4da5d49df04b5def18e5bf49b0c4d757c51f26b2c92ef6146b5ad7a5a6ea05f595e3bc63cbb1363992faba9e8275c35998323
sha512sums = a97ae6153d22a13702ea47674f5a6feb9f2200e63410e28325a0f4689300beaf68cfeceec71220763269fa4ff188a48e5c5fbbab1530e97f4632f6315c4a5a17
sha512sums = e52b76b0c9ca1d9db4dd78d75b3404751bd5b09c52838d1b43a8218bad86a347fd1d5c4d3d0e0e502209fd0ad577b4575e3da5a624fa8270760ff550f59cee7d
- sha512sums = e199be3e1cc8e272a1f2a989778e6e440b7827068cd8fc7072a7c3d54a5cb1e41b3787e5965ecb2231dc03b20d72fc0ebed8d3243f1973c40fc51b6978f91365
+ sha512sums = ea89a632d1ba7180278e5df213d49776291ca14a28ebf7dc834e22013baf3ce133afcdfcc0de3780ad2460f9f230f74627d14f04e5fe881dd4e2f8394ab0359a
pkgname = openstack-cinder
pkgname = openstack-cinder-doc
-
diff --git a/0000-fix-tests-assertItemsEqual.patch b/0000-fix-tests-assertItemsEqual.patch
index 2ff01e1a0366..4474e2e33462 100644
--- a/0000-fix-tests-assertItemsEqual.patch
+++ b/0000-fix-tests-assertItemsEqual.patch
@@ -1,7 +1,7 @@
-diff --git a/cinder-17.1.0-old/cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py b/cinder-17.1.0/cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py
+diff --git a/cinder-18.1.0/cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py b/cinder-18.1.0/cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py
index 8db1f8d..e997d5b 100644
---- a/cinder-17.1.0-old/cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py
-+++ b/cinder-17.1.0/cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py
+--- a/cinder-18.1.0/cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py
++++ b/cinder-18.1.0/cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py
@@ -4262,7 +4262,7 @@ class StorwizeSVCFcDriverTestCase(test.TestCase):
}
}
@@ -31,10 +31,10 @@ index 8db1f8d..e997d5b 100644
def test_storwize_svc_fc_host_maps(self):
# Create two volumes to be used in mappings
-diff --git a/cinder-17.1.0-old/cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py b/cinder-17.1.0/cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py
+diff --git a/cinder-18.1.0/cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py b/cinder-18.1.0/cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py
index d4c732b..0d901e5 100644
---- a/cinder-17.1.0-old/cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py
-+++ b/cinder-17.1.0/cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py
+--- a/cinder-18.1.0/cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py
++++ b/cinder-18.1.0/cinder/tests/unit/volume/drivers/inspur/instorage/test_fc_driver.py
@@ -413,7 +413,7 @@ class InStorageMCSFcDriverTestCase(test.TestCase):
}
}
@@ -44,10 +44,10 @@ index d4c732b..0d901e5 100644
def test_instorage_mcs_fc_host_maps(self):
# Create two volumes to be used in mappings
-diff --git a/cinder-17.1.0-old/cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_client_cmode.py b/cinder-17.1.0/cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_client_cmode.py
+diff --git a/cinder-18.1.0/cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_client_cmode.py b/cinder-18.1.0/cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_client_cmode.py
index 14c6bd7..609b6ef 100644
---- a/cinder-17.1.0-old/cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_client_cmode.py
-+++ b/cinder-17.1.0/cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_client_cmode.py
+--- a/cinder-18.1.0/cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_client_cmode.py
++++ b/cinder-18.1.0/cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_client_cmode.py
@@ -2267,7 +2267,7 @@ class NetAppCmodeClientTestCase(test.TestCase):
result = self.client.get_aggregate_disk_types(
fake_client.VOLUME_AGGREGATE_NAME)
@@ -66,10 +66,10 @@ index 14c6bd7..609b6ef 100644
mock_get_aggregate_disk_types.assert_has_calls([
mock.call(fake_client.VOLUME_AGGREGATE_NAME),
mock.call(fake_client.VOLUME_AGGREGATE_NAME, shared=True),
-diff --git a/cinder-17.1.0-old/cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_capabilities.py b/cinder-17.1.0/cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_capabilities.py
+diff --git a/cinder-18.1.0/cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_capabilities.py b/cinder-18.1.0/cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_capabilities.py
index 8181bf0..65ea43b 100644
---- a/cinder-17.1.0-old/cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_capabilities.py
-+++ b/cinder-17.1.0/cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_capabilities.py
+--- a/cinder-18.1.0/cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_capabilities.py
++++ b/cinder-18.1.0/cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_capabilities.py
@@ -96,7 +96,7 @@ class CapabilitiesLibraryTestCase(test.TestCase):
result = self.ssc_library.get_ssc_flexvol_names()
@@ -79,10 +79,10 @@ index 8181bf0..65ea43b 100644
def test_get_ssc_for_flexvol(self):
-diff --git a/cinder-17.1.0-old/cinder/tests/unit/volume/drivers/vmware/test_vmware_datastore.py b/cinder-17.1.0/cinder/tests/unit/volume/drivers/vmware/test_vmware_datastore.py
+diff --git a/cinder-18.1.0/cinder/tests/unit/volume/drivers/vmware/test_vmware_datastore.py b/cinder-18.1.0/cinder/tests/unit/volume/drivers/vmware/test_vmware_datastore.py
index 8824d70..403d3b7 100644
---- a/cinder-17.1.0-old/cinder/tests/unit/volume/drivers/vmware/test_vmware_datastore.py
-+++ b/cinder-17.1.0/cinder/tests/unit/volume/drivers/vmware/test_vmware_datastore.py
+--- a/cinder-18.1.0/cinder/tests/unit/volume/drivers/vmware/test_vmware_datastore.py
++++ b/cinder-18.1.0/cinder/tests/unit/volume/drivers/vmware/test_vmware_datastore.py
@@ -285,7 +285,7 @@ class DatastoreTest(test.TestCase):
datastores, valid_host_refs=[host2, host3])
diff --git a/PKGBUILD b/PKGBUILD
index 30d2d2a9ed23..bb6f60747510 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pyname=cinder
pkgbase=openstack-$_pyname
pkgname=(openstack-$_pyname{,-doc})
-pkgver=18.0.0
+pkgver=18.1.0
pkgrel=1
pkgdesc="OpenStack Block Storage"
arch=(any)
@@ -115,7 +115,7 @@ source=(
openstack-cinder-volume.service
0000-fix-tests-assertItemsEqual.patch
)
-md5sums=('1c9edfa61b7eef91a8163dbf124673c8'
+md5sums=('965af5d86dc86e852d9d173c6f568d33'
'081d18c05b770876e42a7d2c5d7c6369'
'fac52361ddb959f0000f94f27cfa9a52'
'619a108ed34a4007dcceb5736b9f9333'
@@ -124,8 +124,8 @@ md5sums=('1c9edfa61b7eef91a8163dbf124673c8'
'266e5867fa92d49c7a1894242f1d5f89'
'bdd1383229c0f41fcbe82314a54a0087'
'0f920ebfb231a55becbae65a4cfac61f'
- '9c5f1cd2f3f859ba26f65c469c99e413')
-sha256sums=('ebb6f9da205f11c27ae434d73f4ad7ccc3c8ba120de1f74e43d958a896579850'
+ 'b84575d0e6c19eebe3d963b120e0538d')
+sha256sums=('bfff949d7dd48b9e2f095601aee36e2680cbb2b8962998db90a0787de75f1e80'
'2c25a5fd7f6b442d23516d63d99dfbe506f8b55d6161a31d6611511345040f5c'
'dbd32daa64f08bb97a86ad42ea41e05bc2ca36b1c599b60bed80c3def9f79486'
'494978135a165a725de2c55e84a5dbdbf4487348acdcbb8b94edf067cf8e403d'
@@ -134,8 +134,8 @@ sha256sums=('ebb6f9da205f11c27ae434d73f4ad7ccc3c8ba120de1f74e43d958a896579850'
'dadf618111c437e2edf1231b9e8a807081f7ace7ad97041e31c105a3af020272'
'16ddcefde9a537a4d138252d467df733b70b19d7b063a3d3db2bd6c0b5cffd13'
'fd340cb5a437567c66293d486511e9a56fa3a33f8dd39788256923c7d36dc206'
- '630dadfa9063ed95440ee218ee8794dcd5db17ec4f8ea8bbae404d2dd88e4d24')
-sha512sums=('acc1c93ab5b41747d6d4162612f8f8339d33f39a2bc49a51d3475813c7b38476232f5481ed481a3d05c872d8930f9dec490e84b905e3d493143cab9de365c536'
+ '5b0d5d1c122309dfbc7d921503469a89e0c6f650113c827292a1b3f24a51dd93')
+sha512sums=('e0fa24571883b5023840d88af65709448d256e24579530ccad5848c963da44e3b575aa5623cb2e298057c326b401228a7b6b5cabb8df827fc47ce49cd46f2008'
'b41cb64358fca6f5c27a17052233d41a3ab42beb74bb25a614b75645feb59e70d0adddf4eeeb5e6479cc61b6e18550452237899bed2d3892d5065e424d0cd5c0'
'73ef8c60fe8152614f20033102b1ac7cd88afafdca5104178f208647041730079d51402ea6f97893b6e0012d11354d78d5c521d81a72d6cc8295ef595b15a710'
'7fdb14679166b82058c11452c1b1c2c8ed198ae116e6fae18d1a78be2b27ba7a6beb091d77ebfcf2f2db1934185b027fc14219dcd2261a29d8d522e10f109218'
@@ -144,7 +144,7 @@ sha512sums=('acc1c93ab5b41747d6d4162612f8f8339d33f39a2bc49a51d3475813c7b38476232
'026621bdbca5a7a7edbb446386f4da5d49df04b5def18e5bf49b0c4d757c51f26b2c92ef6146b5ad7a5a6ea05f595e3bc63cbb1363992faba9e8275c35998323'
'a97ae6153d22a13702ea47674f5a6feb9f2200e63410e28325a0f4689300beaf68cfeceec71220763269fa4ff188a48e5c5fbbab1530e97f4632f6315c4a5a17'
'e52b76b0c9ca1d9db4dd78d75b3404751bd5b09c52838d1b43a8218bad86a347fd1d5c4d3d0e0e502209fd0ad577b4575e3da5a624fa8270760ff550f59cee7d'
- 'e199be3e1cc8e272a1f2a989778e6e440b7827068cd8fc7072a7c3d54a5cb1e41b3787e5965ecb2231dc03b20d72fc0ebed8d3243f1973c40fc51b6978f91365')
+ 'ea89a632d1ba7180278e5df213d49776291ca14a28ebf7dc834e22013baf3ce133afcdfcc0de3780ad2460f9f230f74627d14f04e5fe881dd4e2f8394ab0359a')
export PBR_VERSION=$pkgver