cloud-init

Merge ~smoser/cloud-init:ubuntu/bionic-1770712-full-pkg-version into cloud-init:ubuntu/bionic

  1. Git
  2. lp:~smoser/cloud-init
  3. ubuntu/bionic-1770712-full-pkg-version
  4. Merge into ubuntu/bionic
Proposed by Scott Moser
Status: Merged
Approved by: Chad Smith
Approved revision: 16934fc181214429d513486c5897a078c0d23aa9
Merged at revision: 16934fc181214429d513486c5897a078c0d23aa9
Proposed branch: ~smoser/cloud-init:ubuntu/bionic-1770712-full-pkg-version
Merge into: cloud-init:ubuntu/bionic
Diff against target: 32 lines (+9/-0)
2 files modified
debian/changelog (+7/-0)
debian/rules (+2/-0)
Reviewer Review Type Date Requested Status
Chad Smith Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+347381@code.launchpad.net

Commit message

debian/rules: update version.version_string to contain packaged version.

This is the debian packaging portion of upstream commit 5446c7881604.

The end result is that we will see the debian package and full upstream
version wherever cloud-init reports its version.

LP: #1770712

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:16934fc181214429d513486c5897a078c0d23aa9
https://jenkins.ubuntu.com/server/job/cloud-init-ci/50/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/50/rebuild

review: Approve (continuous-integration)
Revision history for this message
Chad Smith (chad.smith) wrote :

approving under expectation that we aren't releasing today and we'll be pulling this content in on next new-upstream-snapshot.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 0989d73..49d7a49 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+cloud-init (18.2-27-g6ef92c98-0ubuntu1~18.04.2) UNRELEASED; urgency=medium
7+
8+ * debian/rules: update version.version_string to contain packaged version.
9+ (LP: #1770712)
10+
11+ -- Scott Moser <smoser@ubuntu.com> Mon, 04 Jun 2018 10:10:59 -0400
12+
13 cloud-init (18.2-27-g6ef92c98-0ubuntu1~18.04.1) bionic; urgency=medium
14
15 * debian/control: add missing dependency on iproute2. (LP: #1766711)
16diff --git a/debian/rules b/debian/rules
17index 3e03fed..c5c873d 100755
18--- a/debian/rules
19+++ b/debian/rules
20@@ -1,6 +1,7 @@
21 #!/usr/bin/make -f
22 INIT_SYSTEM ?= systemd
23 export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
24+DEB_VERSION := $(shell dpkg-parsechangelog --show-field=Version)
25
26 %:
27 dh $@ --with python3,systemd --buildsystem pybuild
28@@ -21,3 +22,4 @@ override_dh_auto_install:
29 install -D ./tools/Z99-cloud-locale-test.sh debian/cloud-init/etc/profile.d/Z99-cloud-locale-test.sh
30 install -D ./tools/Z99-cloudinit-warnings.sh debian/cloud-init/etc/profile.d/Z99-cloudinit-warnings.sh
31 install -m 0644 -D debian/apport-launcher.py debian/cloud-init/usr/share/apport/package-hooks/cloud-init.py
32+ flist=$$(find $(CURDIR)/debian/ -type f -name version.py) && sed -i 's,@@PACKAGED_VERSION@@,$(DEB_VERSION),' $${flist:-did-not-find-version-py-for-replacement}

Subscribers

People subscribed via source and target branches