Ubuntu
placement package

Merge ~jadonn/ubuntu/+source/placement:master into ubuntu/+source/placement:ubuntu/devel

  1. Git
  2. lp:~jadonn/ubuntu/+source/placement
  3. master
  4. Merge into ubuntu/devel
Proposed by Jadon Naas
Status: Needs review
Proposed branch: ~jadonn/ubuntu/+source/placement:master
Merge into: ubuntu/+source/placement:ubuntu/devel
Diff against target: 491 lines (+311/-1) (has conflicts)
14 files modified
.launchpad.yaml (+86/-0)
.zuul.yaml (+10/-0)
ChangeLog (+13/-0)
PKG-INFO (+78/-0)
debian/changelog (+9/-0)
debian/patches/install-missing-db-files.patch (+7/-0)
openstack_placement.egg-info/PKG-INFO (+78/-0)
openstack_placement.egg-info/entry_points.txt (+4/-0)
openstack_placement.egg-info/pbr.json (+5/-1)
releasenotes/source/victoria.rst (+4/-0)
releasenotes/source/wallaby.rst (+4/-0)
releasenotes/source/xena.rst (+4/-0)
releasenotes/source/yoga.rst (+4/-0)
setup.cfg (+5/-0)
Conflict in .zuul.yaml
Conflict in ChangeLog
Conflict in PKG-INFO
Conflict in debian/changelog
Conflict in debian/patches/install-missing-db-files.patch
Conflict in openstack_placement.egg-info/PKG-INFO
Conflict in openstack_placement.egg-info/entry_points.txt
Conflict in openstack_placement.egg-info/pbr.json
Conflict in releasenotes/source/victoria.rst
Conflict in releasenotes/source/wallaby.rst
Conflict in releasenotes/source/xena.rst
Conflict in releasenotes/source/yoga.rst
Conflict in setup.cfg
Reviewer Review Type Date Requested Status
James Page Pending
Review via email: mp+462799@code.launchpad.net

Commit message

New release candidate for OpenStack Caracal

To post a comment you must log in.

Unmerged commits

e91d16d... by Jadon Naas

New upstream snapshot for OpenStack Caracal

Failed
[FAILED] ubuntu-build:0 (build)
[WAITING] ubuntu-autopkgtest:0 (build)
[WAITING] cloud-archive-build:0 (build)
[WAITING] cloud-archive-autopkgtest:0 (build)
1 → 4 of 4 results First • Previous • Next • Last
1031d6b... by Jadon Naas

Merge tag '11.0.0_rc1'

Upstream version 11.0.0~rc1

8957edc... by James Page

New upstream version 11.0.0~rc1

4b94ee7... by James Page

New upstream version 10.0.0+git2024030811.8e705fa4

90757f8... by James Page

releasing package placement version 1:10.0.0+git2024020611.e10099bd-0ubuntu1

7be0e1e... by James Page

d/rules: Use --with sphinxdoc to tidy generated documentation.

ddcb299... by James Page

New upstream snapshot for OpenStack Caracal.

60709dc... by James Page

Merge tag '10.0.0+git2024020611.e10099bd'

Upstream version 10.0.0+git2024020611.e10099bd

8052722... by James Page

New upstream version 10.0.0+git2024020611.e10099bd

1f43469... by Corey Bryant

d/gbp.conf, .launchpad.yaml: Sync from cloud-archive-tools for caracal.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.launchpad.yaml b/.launchpad.yaml
2new file mode 100644
3index 0000000..eebe217
4--- /dev/null
5+++ b/.launchpad.yaml
6@@ -0,0 +1,86 @@
7+# This file is managed centrally by cloud-archive-tools and should not be
8+# modified within individual package repos. See the 'cloud_global' dir:
9+# https://git.launchpad.net/~ubuntu-cloud-archive/+git/cloud-archive-tools
10+#
11+# Pipelines can be run locally with:
12+# lpci run --output-directory out
13+
14+pipeline:
15+- ubuntu-build
16+- ubuntu-autopkgtest
17+- cloud-archive-build
18+- cloud-archive-autopkgtest
19+
20+jobs:
21+ ubuntu-build:
22+ series: devel
23+ architectures: amd64
24+ packages:
25+ - lsb-release
26+ environment:
27+ no_proxy: localhost,127.0.0.0/8
28+ run: |
29+ cat <<EOF >/etc/apt/sources.list.d/ubuntu-$(lsb_release -cs)-proposed.list
30+ deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs)-proposed restricted main multiverse universe
31+ EOF
32+ apt update
33+ apt build-dep ./ --yes
34+ rm -rf .git
35+ dpkg-buildpackage -b -uc -us
36+ mv ../*.deb ../*.changes ./
37+ output:
38+ paths: ["*.deb", "*.changes"]
39+
40+ ubuntu-autopkgtest:
41+ series: devel
42+ architectures: amd64
43+ packages:
44+ - autopkgtest
45+ environment:
46+ no_proxy: localhost,127.0.0.0/8
47+ input:
48+ job-name: ubuntu-build
49+ target-directory: ./
50+ run: |
51+ [ ! -d debian/tests ] || autopkgtest ./files/*.changes -- null
52+
53+ cloud-archive-build:
54+ series: jammy
55+ architectures: amd64
56+ packages:
57+ - dirmngr
58+ - git
59+ - software-properties-common
60+ environment:
61+ no_proxy: localhost,127.0.0.0/8
62+ run: |
63+ openstack_series="caracal"
64+ package_name=$(dpkg-parsechangelog --show-field Source)
65+ ca_patches="https://git.launchpad.net/~ubuntu-cloud-archive/+git/ca-patches"
66+ [ ! -d $HOME/ca-patches ] && git clone "$ca_patches" $HOME/ca-patches
67+ patch_file="$HOME/ca-patches/${openstack_series}/${package_name}.patch"
68+ [ -e "$patch_file" ] && patch -p1 -t --verbose < $patch_file
69+ add-apt-repository ppa:ubuntu-cloud-archive/${openstack_series}-staging --yes
70+ apt build-dep ./ --yes
71+ rm -rf .git
72+ dpkg-buildpackage -b -uc -us
73+ mv ../*.deb ../*.changes ./
74+ output:
75+ paths: ["*.deb", "*.changes"]
76+
77+ cloud-archive-autopkgtest:
78+ series: jammy
79+ architectures: amd64
80+ packages:
81+ - autopkgtest
82+ - dirmngr
83+ - software-properties-common
84+ environment:
85+ no_proxy: localhost,127.0.0.0/8
86+ input:
87+ job-name: cloud-archive-build
88+ target-directory: ./
89+ run: |
90+ openstack_series="caracal"
91+ add-apt-repository ppa:ubuntu-cloud-archive/${openstack_series}-staging --yes
92+ [ ! -d debian/tests ] || autopkgtest ./files/*.changes -- null
93diff --git a/.zuul.yaml b/.zuul.yaml
94index dcee77e..cdb9f63 100644
95--- a/.zuul.yaml
96+++ b/.zuul.yaml
97@@ -43,6 +43,11 @@
98 - ^tox.ini$
99 - grenade:
100 irrelevant-files: *gate-irrelevant-files
101+<<<<<<< .zuul.yaml
102+=======
103+ - grenade-skip-level:
104+ irrelevant-files: *gate-irrelevant-files
105+>>>>>>> .zuul.yaml
106 - tempest-ipv6-only:
107 irrelevant-files: *gate-irrelevant-files
108 gate:
109@@ -55,6 +60,11 @@
110 irrelevant-files: *gate-irrelevant-files
111 - grenade:
112 irrelevant-files: *gate-irrelevant-files
113+<<<<<<< .zuul.yaml
114+=======
115+ - grenade-skip-level:
116+ irrelevant-files: *gate-irrelevant-files
117+>>>>>>> .zuul.yaml
118 - tempest-ipv6-only:
119 irrelevant-files: *gate-irrelevant-files
120 periodic-weekly:
121diff --git a/ChangeLog b/ChangeLog
122index da58129..ab477c9 100644
123--- a/ChangeLog
124+++ b/ChangeLog
125@@ -1,7 +1,20 @@
126 CHANGES
127 =======
128
129+<<<<<<< ChangeLog
130 * Bump hacking
131+=======
132+11.0.0.0rc1
133+-----------
134+
135+* reno: Update master for unmaintained/xena
136+* reno: Update master for unmaintained/wallaby
137+* reno: Update master for unmaintained/victoria
138+* reno: Update master for unmaintained/yoga
139+* Add upgrade job from 2023.1
140+* Bump hacking
141+* Update python classifier in setup.cfg
142+>>>>>>> ChangeLog
143 * Add job to test with SQLAlchemy master (2.x)
144 * db: Wrap raw SQL query in sqlalchemy.text
145 * Update master for stable/2023.2
146diff --git a/PKG-INFO b/PKG-INFO
147index 4a1418a..87aa654 100644
148--- a/PKG-INFO
149+++ b/PKG-INFO
150@@ -1,15 +1,87 @@
151+<<<<<<< PKG-INFO
152 Metadata-Version: 2.1
153 Name: openstack-placement
154 Version: 10.1.0.dev7
155+=======
156+Metadata-Version: 1.2
157+Name: openstack-placement
158+Version: 11.0.0.0rc1
159+>>>>>>> PKG-INFO
160 Summary: Resource provider inventory usage and allocation service
161 Home-page: https://docs.openstack.org/placement/latest/
162 Author: OpenStack
163 Author-email: openstack-discuss@lists.openstack.org
164+<<<<<<< PKG-INFO
165+=======
166+License: UNKNOWN
167+>>>>>>> PKG-INFO
168 Project-URL: Bug Tracker, https://bugs.launchpad.net/placement
169 Project-URL: Documentation, https://docs.openstack.org/placement/latest/
170 Project-URL: API Reference, https://docs.openstack.org/api-ref/placement/
171 Project-URL: Source Code, https://opendev.org/openstack/placement
172 Project-URL: Release Notes, https://docs.openstack.org/releasenotes/placement/
173+<<<<<<< PKG-INFO
174+=======
175+Description: If you are viewing this README on GitHub, please be aware that placement
176+ development happens on `OpenStack git
177+ <https://opendev.org/openstack/placement/>`_ and `OpenStack
178+ gerrit <https://review.opendev.org>`_.
179+
180+ ===================
181+ OpenStack Placement
182+ ===================
183+
184+ .. image:: https://governance.openstack.org/tc/badges/placement.svg
185+ :target: https://governance.openstack.org/tc/reference/tags/index.html
186+
187+ OpenStack Placement provides an HTTP service for managing, selecting,
188+ and claiming providers of classes of inventory representing available
189+ resources in a cloud.
190+
191+ API
192+ ---
193+
194+ To learn how to use Placement's API, consult the documentation available
195+ online at:
196+
197+ - `Placement API Reference <https://docs.openstack.org/api-ref/placement/>`__
198+
199+ For more information on OpenStack APIs, SDKs and CLIs in general, refer to:
200+
201+ - `OpenStack for App Developers <https://www.openstack.org/appdev/>`__
202+ - `Development resources for OpenStack clouds
203+ <https://developer.openstack.org/>`__
204+
205+ Operators
206+ ---------
207+
208+ To learn how to deploy and configure OpenStack Placement, consult the
209+ documentation available online at:
210+
211+ - `OpenStack Placement <https://docs.openstack.org/placement/>`__
212+
213+ In the unfortunate event that bugs are discovered, they should be reported to
214+ the appropriate bug tracker. If you obtained the software from a 3rd party
215+ operating system vendor, it is often wise to use their own bug tracker for
216+ reporting problems. In all other cases use the master OpenStack bug tracker,
217+ available at:
218+
219+ - `Bug Tracker <https://bugs.launchpad.net/placement>`__
220+ - `File new Bug <https://bugs.launchpad.net/placement/+filebug>`__
221+
222+ Developers
223+ ----------
224+
225+ For information on how to contribute to Placement, please see the contents of
226+ CONTRIBUTING.rst.
227+
228+ Further developer focused documentation is available at:
229+
230+ - `Official Placement Documentation <https://docs.openstack.org/placement/>`__
231+
232+
233+Platform: UNKNOWN
234+>>>>>>> PKG-INFO
235 Classifier: Development Status :: 5 - Production/Stable
236 Classifier: Environment :: OpenStack
237 Classifier: Intended Audience :: Information Technology
238@@ -22,6 +94,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
239 Classifier: Programming Language :: Python :: 3
240 Classifier: Programming Language :: Python :: 3.8
241 Classifier: Programming Language :: Python :: 3.9
242+<<<<<<< PKG-INFO
243 Requires-Python: >=3.8
244 License-File: LICENSE
245
246@@ -82,3 +155,8 @@ Further developer focused documentation is available at:
247
248 - `Official Placement Documentation <https://docs.openstack.org/placement/>`__
249
250+=======
251+Classifier: Programming Language :: Python :: 3.10
252+Classifier: Programming Language :: Python :: 3.11
253+Requires-Python: >=3.8
254+>>>>>>> PKG-INFO
255diff --git a/debian/changelog b/debian/changelog
256index 5ec7fb1..b493bd0 100644
257--- a/debian/changelog
258+++ b/debian/changelog
259@@ -1,3 +1,12 @@
260+<<<<<<< debian/changelog
261+=======
262+placement (1:11.0.0~rc1-0ubuntu1) UNRELEASED; urgency=medium
263+
264+ * New upstream snapshot for OpenStack Caracal
265+
266+ -- Jadon Naas <jadon.naas@canonical.com> Tue, 19 Mar 2024 18:28:23 +0000
267+
268+>>>>>>> debian/changelog
269 placement (1:10.0.0+git2024020611.e10099bd-0ubuntu1) noble; urgency=medium
270
271 [ Corey Bryant ]
272diff --git a/debian/patches/install-missing-db-files.patch b/debian/patches/install-missing-db-files.patch
273index 97bdfe7..9f69a47 100644
274--- a/debian/patches/install-missing-db-files.patch
275+++ b/debian/patches/install-missing-db-files.patch
276@@ -2,7 +2,14 @@ Description: Install missing db files, including
277 placement/db/sqlalchemy/alembic.ini.
278 Author: Corey Bryant <corey.bryant@canonical.com>
279
280+<<<<<<< debian/patches/install-missing-db-files.patch
281 --- /dev/null
282 +++ b/MANIFEST.in
283+=======
284+Index: placement/MANIFEST.in
285+===================================================================
286+--- /dev/null
287++++ placement/MANIFEST.in
288+>>>>>>> debian/patches/install-missing-db-files.patch
289 @@ -0,0 +1 @@
290 +recursive-include placement/db/ *
291diff --git a/openstack_placement.egg-info/PKG-INFO b/openstack_placement.egg-info/PKG-INFO
292index 4a1418a..c90b99c 100644
293--- a/openstack_placement.egg-info/PKG-INFO
294+++ b/openstack_placement.egg-info/PKG-INFO
295@@ -1,15 +1,87 @@
296+<<<<<<< openstack_placement.egg-info/PKG-INFO
297 Metadata-Version: 2.1
298 Name: openstack-placement
299 Version: 10.1.0.dev7
300+=======
301+Metadata-Version: 1.2
302+Name: openstack-placement
303+Version: 11.0.0.0rc1
304+>>>>>>> openstack_placement.egg-info/PKG-INFO
305 Summary: Resource provider inventory usage and allocation service
306 Home-page: https://docs.openstack.org/placement/latest/
307 Author: OpenStack
308 Author-email: openstack-discuss@lists.openstack.org
309+<<<<<<< openstack_placement.egg-info/PKG-INFO
310+=======
311+License: UNKNOWN
312+>>>>>>> openstack_placement.egg-info/PKG-INFO
313 Project-URL: Bug Tracker, https://bugs.launchpad.net/placement
314 Project-URL: Documentation, https://docs.openstack.org/placement/latest/
315 Project-URL: API Reference, https://docs.openstack.org/api-ref/placement/
316 Project-URL: Source Code, https://opendev.org/openstack/placement
317 Project-URL: Release Notes, https://docs.openstack.org/releasenotes/placement/
318+<<<<<<< openstack_placement.egg-info/PKG-INFO
319+=======
320+Description: If you are viewing this README on GitHub, please be aware that placement
321+ development happens on `OpenStack git
322+ <https://opendev.org/openstack/placement/>`_ and `OpenStack
323+ gerrit <https://review.opendev.org>`_.
324+
325+ ===================
326+ OpenStack Placement
327+ ===================
328+
329+ .. image:: https://governance.openstack.org/tc/badges/placement.svg
330+ :target: https://governance.openstack.org/tc/reference/tags/index.html
331+
332+ OpenStack Placement provides an HTTP service for managing, selecting,
333+ and claiming providers of classes of inventory representing available
334+ resources in a cloud.
335+
336+ API
337+ ---
338+
339+ To learn how to use Placement's API, consult the documentation available
340+ online at:
341+
342+ - `Placement API Reference <https://docs.openstack.org/api-ref/placement/>`__
343+
344+ For more information on OpenStack APIs, SDKs and CLIs in general, refer to:
345+
346+ - `OpenStack for App Developers <https://www.openstack.org/appdev/>`__
347+ - `Development resources for OpenStack clouds
348+ <https://developer.openstack.org/>`__
349+
350+ Operators
351+ ---------
352+
353+ To learn how to deploy and configure OpenStack Placement, consult the
354+ documentation available online at:
355+
356+ - `OpenStack Placement <https://docs.openstack.org/placement/>`__
357+
358+ In the unfortunate event that bugs are discovered, they should be reported to
359+ the appropriate bug tracker. If you obtained the software from a 3rd party
360+ operating system vendor, it is often wise to use their own bug tracker for
361+ reporting problems. In all other cases use the master OpenStack bug tracker,
362+ available at:
363+
364+ - `Bug Tracker <https://bugs.launchpad.net/placement>`__
365+ - `File new Bug <https://bugs.launchpad.net/placement/+filebug>`__
366+
367+ Developers
368+ ----------
369+
370+ For information on how to contribute to Placement, please see the contents of
371+ CONTRIBUTING.rst.
372+
373+ Further developer focused documentation is available at:
374+
375+ - `Official Placement Documentation <https://docs.openstack.org/placement/>`__
376+
377+
378+Platform: UNKNOWN
379+>>>>>>> openstack_placement.egg-info/PKG-INFO
380 Classifier: Development Status :: 5 - Production/Stable
381 Classifier: Environment :: OpenStack
382 Classifier: Intended Audience :: Information Technology
383@@ -22,6 +94,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
384 Classifier: Programming Language :: Python :: 3
385 Classifier: Programming Language :: Python :: 3.8
386 Classifier: Programming Language :: Python :: 3.9
387+<<<<<<< openstack_placement.egg-info/PKG-INFO
388 Requires-Python: >=3.8
389 License-File: LICENSE
390
391@@ -82,3 +155,8 @@ Further developer focused documentation is available at:
392
393 - `Official Placement Documentation <https://docs.openstack.org/placement/>`__
394
395+=======
396+Classifier: Programming Language :: Python :: 3.10
397+Classifier: Programming Language :: Python :: 3.11
398+Requires-Python: >=3.8
399+>>>>>>> openstack_placement.egg-info/PKG-INFO
400diff --git a/openstack_placement.egg-info/entry_points.txt b/openstack_placement.egg-info/entry_points.txt
401index 89edc37..1188085 100644
402--- a/openstack_placement.egg-info/entry_points.txt
403+++ b/openstack_placement.egg-info/entry_points.txt
404@@ -16,3 +16,7 @@ placement = placement.policies:list_rules
405
406 [wsgi_scripts]
407 placement-api = placement.wsgi:init_application
408+<<<<<<< openstack_placement.egg-info/entry_points.txt
409+=======
410+
411+>>>>>>> openstack_placement.egg-info/entry_points.txt
412diff --git a/openstack_placement.egg-info/pbr.json b/openstack_placement.egg-info/pbr.json
413index 339be1b..ae2544c 100644
414--- a/openstack_placement.egg-info/pbr.json
415+++ b/openstack_placement.egg-info/pbr.json
416@@ -1 +1,5 @@
417-{"git_version": "e10099bd", "is_release": false}
418\ No newline at end of file
419+<<<<<<< openstack_placement.egg-info/pbr.json
420+{"git_version": "e10099bd", "is_release": false}
421+=======
422+{"git_version": "6ac0521e", "is_release": true}
423+>>>>>>> openstack_placement.egg-info/pbr.json
424diff --git a/releasenotes/source/victoria.rst b/releasenotes/source/victoria.rst
425index 4efc7b6..d4b81d6 100644
426--- a/releasenotes/source/victoria.rst
427+++ b/releasenotes/source/victoria.rst
428@@ -3,4 +3,8 @@ Victoria Series Release Notes
429 =============================
430
431 .. release-notes::
432+<<<<<<< releasenotes/source/victoria.rst
433 :branch: stable/victoria
434+=======
435+ :branch: unmaintained/victoria
436+>>>>>>> releasenotes/source/victoria.rst
437diff --git a/releasenotes/source/wallaby.rst b/releasenotes/source/wallaby.rst
438index d77b565..64d5431 100644
439--- a/releasenotes/source/wallaby.rst
440+++ b/releasenotes/source/wallaby.rst
441@@ -3,4 +3,8 @@ Wallaby Series Release Notes
442 ============================
443
444 .. release-notes::
445+<<<<<<< releasenotes/source/wallaby.rst
446 :branch: stable/wallaby
447+=======
448+ :branch: unmaintained/wallaby
449+>>>>>>> releasenotes/source/wallaby.rst
450diff --git a/releasenotes/source/xena.rst b/releasenotes/source/xena.rst
451index 1be85be..8ccc7f0 100644
452--- a/releasenotes/source/xena.rst
453+++ b/releasenotes/source/xena.rst
454@@ -3,4 +3,8 @@ Xena Series Release Notes
455 =========================
456
457 .. release-notes::
458+<<<<<<< releasenotes/source/xena.rst
459 :branch: stable/xena
460+=======
461+ :branch: unmaintained/xena
462+>>>>>>> releasenotes/source/xena.rst
463diff --git a/releasenotes/source/yoga.rst b/releasenotes/source/yoga.rst
464index 7cd5e90..2b7e9ed 100644
465--- a/releasenotes/source/yoga.rst
466+++ b/releasenotes/source/yoga.rst
467@@ -3,4 +3,8 @@ Yoga Series Release Notes
468 =========================
469
470 .. release-notes::
471+<<<<<<< releasenotes/source/yoga.rst
472 :branch: stable/yoga
473+=======
474+ :branch: unmaintained/yoga
475+>>>>>>> releasenotes/source/yoga.rst
476diff --git a/setup.cfg b/setup.cfg
477index 463eba3..9930385 100644
478--- a/setup.cfg
479+++ b/setup.cfg
480@@ -26,6 +26,11 @@ classifier =
481 Programming Language :: Python :: 3
482 Programming Language :: Python :: 3.8
483 Programming Language :: Python :: 3.9
484+<<<<<<< setup.cfg
485+=======
486+ Programming Language :: Python :: 3.10
487+ Programming Language :: Python :: 3.11
488+>>>>>>> setup.cfg
489
490 [files]
491 packages =

Subscribers

People subscribed via source and target branches