Merge ~chad.smith/curtin:release-18.1 into curtin:master

[Chad Smith]

Release curtin version 18.1.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:a6226d3fe9dac08626701ec6bf514cb23e1bb34b
https://jenkins.ubuntu.com/server/job/curtin-ci/884/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/884
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/884
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/884
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/884

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/884/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

The previous version bump also modified debian/changelog.trunk

see git hash 6fa50287352caca26f9e47f5d4012873dcb7b207

review: Needs Fixing

[Scott Moser (smoser)]

change to debian/changelog.trunk is no longer needed. in the transition to git we did this:

-curtin (17.1~bzrREVNO-0ubuntu1) UNRELEASED; urgency=low
+curtin (UPSTREAM_VER-0ubuntu1) UNRELEASED; urgency=low

and then corresponding change in tools/build-deb to replace UPSTREAM_VER with the output of
 git describe --long --abbrev=8 "--match=[0-9][0-9]*" "$ref"

review: Approve

[Scott Moser (smoser)]

We decided to pull the zfs branch in
 https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/341687
so this one will need re-basing.
not sure how the lander will handle the tags anad such. but either way, lets hold this for now.

[Scott Moser (smoser)]

I started a jenkins run of trunk at
https://jenkins.ubuntu.com/server/view/curtin/job/curtin-vmtest-devel-amd64/347/
the previous took just under 4 hours, so expect ~ 16:30 Eastern we can grab this.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:ad8bccacd0c9b608c13f33ea7693823ce2410ff1
https://jenkins.ubuntu.com/server/job/curtin-ci/885/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/885
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/885
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/885
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/885

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/885/rebuild

review: Approve (continuous-integration)

diff --git a/curtin/__init__.py b/curtin/__init__.py
index 478ab78..002454b 100644
--- a/curtin/__init__.py
+++ b/curtin/__init__.py
@@ -28,6 +28,6 @@ FEATURES = [
     'HAS_VERSION_MODULE',
 ]
 
-__version__ = "17.1"
+__version__ = "18.1"
 
 # vi: ts=4 expandtab syntax=python