Merge ~smoser/cloud-init:release/17.2 into cloud-init:master

Proposed by Scott Moser on 2017-12-14
Status: Merged
Approved by: Chad Smith on 2017-12-14
Approved revision: c87588bf1e118095445ed0713f60866592b36ca1
Merged at revision: c87588bf1e118095445ed0713f60866592b36ca1
Proposed branch: ~smoser/cloud-init:release/17.2
Merge into: cloud-init:master
Diff against target: 106 lines (+86/-1)
2 files modified
ChangeLog (+85/-0)
cloudinit/version.py (+1/-1)
Reviewer Review Type Date Requested Status
Chad Smith 2017-12-14 Approve on 2017-12-14
Server Team CI bot continuous-integration Approve on 2017-12-14
Review via email: mp+335233@code.launchpad.net

Commit Message

release 17.2

Bump the version in cloudinit/version.py to be 17.2 and update ChangeLog.

To post a comment you must log in.
Scott Moser (smoser) wrote :

I'd like to record tests of this here, and then we'll call this good.

Scott Moser (smoser) wrote :

I've tested under uvt-kvm with:
 $ uvt-kvm create sm-b1 release=bionic
 $ uvt-kvm wait sm-b1
 $ uvt-kvm ssh sm-b1 -- dpkg-query --show cloud-init
 cloud-init 17.1-60-ga30a3bb5-0ubuntu1
 $ uvt-kvm ssh sm-b1 -- cat /etc/cloud/build.info
 $ uvt-kvm ssh sm-b1 -- cat /etc/cloud/build.info
 build_name: server
 serial: 20171213
 $ uvt-kvm ssh sm-b1 -- cat /run/cloud-init/result.json
 {
  "v1": {
   "datasource": "DataSourceNoCloud [seed=/dev/vdb][dsmode=net]",
   "errors": []
  }
 }

PASSED: Continuous integration, rev:c87588bf1e118095445ed0713f60866592b36ca1
https://jenkins.ubuntu.com/server/job/cloud-init-ci/631/
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/631/rebuild

review: Approve (continuous-integration)
Chad Smith (chad.smith) wrote :
Download full text (8.3 KiB)

Tested the version we will update to 17.2 on GCE and Amazon:

---- EC2 BEGIN ---------------------------------------
csmith@downtown:~$ ssh <email address hidden>
Welcome to Ubuntu Bionic Beaver (development branch) (GNU/Linux 4.13.0-17-generic x86_64)

 * Documentation: https://help.ubuntu.com
 * Management: https://landscape.canonical.com
 * Support: https://ubuntu.com/advantage

  Get cloud support with Ubuntu Advantage Cloud Guest:
    http://www.ubuntu.com/business/services/cloud

0 packages can be updated.
0 updates are security updates.

Last login: Thu Dec 14 18:24:25 2017 from 67.174.121.94
ubuntu@ip-10-41-41-200:~$ dpkg-query --show cloud-init
cloud-init 17.1-60-ga30a3bb5-0ubuntu1
ubuntu@ip-10-41-41-200:~$ cat /run/cloud-init/result.json
{
 "v1": {
  "datasource": "DataSourceEc2Local",
  "errors": []
 }
}
ubuntu@ip-10-41-41-200:~$ grep Trace /var/log/cloud-init*
ubuntu@ip-10-41-41-200:~$ sudo dpkg -i cloud-init_17.2-0-gc87588bf-1~bddeb_all.deb
(Reading database ... 57064 files and directories currently installed.)
Preparing to unpack cloud-init_17.2-0-gc87588bf-1~bddeb_all.deb ...
Unpacking cloud-init (17.2-0-gc87588bf-1~bddeb) over (17.1-60-ga30a3bb5-0ubuntu1) ...
Setting up cloud-init (17.2-0-gc87588bf-1~bddeb) ...
Processing triggers for rsyslog (8.16.0-1ubuntu10) ...
ubuntu@ip-10-41-41-200:~$ echo $?
0
ubuntu@ip-10-41-41-200:~$ sudo systemctl restart cloud-init
ubuntu@ip-10-41-41-200:~$ echo $?
0
ubuntu@ip-10-41-41-200:~$ # remove artifacts and reboot for fresh cloud-init test
ubuntu@ip-10-41-41-200:~$ sudo rm -rf /var/log/cloud-init* /var/lib/cloud/; sudo reboot
Connection to ec2-18-217-153-55.us-east-2.compute.amazonaws.com closed by remote host.
Connection to ec2-18-217-153-55.us-east-2.compute.amazonaws.com closed.
csmith@downtown:~$ ssh-keygen -f "/home/csmith/.ssh/known_hosts" -R "ec2-18-217-153-55.us-east-2.compute.amazonaws.com"
# Host ec2-18-217-153-55.us-east-2.compute.amazonaws.com found: line 1174
/home/csmith/.ssh/known_hosts updated.
Original contents retained as /home/csmith/.ssh/known_hosts.old
csmith@downtown:~$ ssh <email address hidden>
The authenticity of host 'ec2-18-217-153-55.us-east-2.compute.amazonaws.com (18.217.153.55)' can't be established.
ECDSA key fingerprint is SHA256:KtYG6dJAdQ0JptyoQycgOuegd1xfbpDwjVeq7jIaAPI.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added 'ec2-18-217-153-55.us-east-2.compute.amazonaws.com,18.217.153.55' (ECDSA) to the list of known hosts.
Welcome to Ubuntu Bionic Beaver (development branch) (GNU/Linux 4.13.0-17-generic x86_64)

 * Documentation: https://help.ubuntu.com
 * Management: https://landscape.canonical.com
 * Support: https://ubuntu.com/advantage

  Get cloud support with Ubuntu Advantage Cloud Guest:
    http://www.ubuntu.com/business/services/cloud

0 packages can be updated.
0 updates are security updates.

Last login: Thu Dec 14 18:31:33 2017 from 67.174.121.94
ubuntu@ip-10-41-41-200:~$ cat /run/cloud-init/result.json
cat: /run/cloud-init/result.json: No such file or directory
ubuntu@ip-10-41-41-200:~$ cat /run/cloud-init/r...

Read more...

Chad Smith (chad.smith) wrote :
Download full text (8.1 KiB)

Verified 17.2 on azure too

root@publishing:~# az vm create --name=my-b1 --image=Canonical:UbuntuServer:18.04-DAILY-LTS:latest --admin-username=root -g srugrp10 --admin-username=ubuntu --ssh-key-value @/root/.ssh/id_rsa.pub
{
  "fqdns": "",
  "id": "/subscriptions/12aad61c-6de4-4e53-a6c6-5aff52a83777/resourceGroups/srugrp10/providers/Microsoft.Compute/virtualMachines/my-b1",
  "location": "eastus2",
  "macAddress": "00-0D-3A-03-87-C7",
  "powerState": "VM running",
  "privateIpAddress": "10.0.0.4",
  "publicIpAddress": "40.70.13.193",
  "resourceGroup": "srugrp10",
  "zones": ""
}
root@publishing:~# ssh ubuntu@40.70.13.193
Enter passphrase for key '/root/.ssh/id_rsa':
Welcome to Ubuntu Bionic Beaver (development branch) (GNU/Linux 4.13.0-17-generic x86_64)

 * Documentation: https://help.ubuntu.com
 * Management: https://landscape.canonical.com
 * Support: https://ubuntu.com/advantage

 * Ubuntu is participating in Google Code-in, a contest to introduce students
   from 13 to 17 years old to free software. You can join as a student or as a
   mentor:
   - https://ubu.one/UcodeIn

  Get cloud support with Ubuntu Advantage Cloud Guest:
    http://www.ubuntu.com/business/services/cloud

6 packages can be updated.
0 updates are security updates.

Last login: Thu Dec 14 17:30:44 2017 from 67.174.121.94
ubuntu@my-b1:~$ dpkg-query --show cloud-init
cloud-init 17.1-60-ga30a3bb5-0ubuntu1
ubuntu@my-b1:~$ grep Trace /var/log/cloud-init*
/var/log/cloud-init.log:Traceback (most recent call last):
ubuntu@my-b1:~$ grep Trace /var/log/cloud-init* -A 9
/var/log/cloud-init.log:Traceback (most recent call last):
/var/log/cloud-init.log- File "/usr/lib/python3/dist-packages/cloudinit/sources/DataSourceAzure.py", line 287, in bounce_network_with_azure_hostname
/var/log/cloud-init.log- prev_hostname=previous_hostname)
/var/log/cloud-init.log- File "/usr/lib/python3/dist-packages/cloudinit/sources/DataSourceAzure.py", line 617, in perform_hostname_bounce
/var/log/cloud-init.log- 'env': env})
/var/log/cloud-init.log- File "/usr/lib/python3/dist-packages/cloudinit/util.py", line 2279, in log_time
/var/log/cloud-init.log- ret = func(*args, **kwargs)
/var/log/cloud-init.log- File "/usr/lib/python3/dist-packages/cloudinit/util.py", line 1888, in subp
/var/log/cloud-init.log- cmd=args)
/var/log/cloud-init.log-cloudinit.util.ProcessExecutionError: Unexpected error while running command.
ubuntu@my-b1:~$ grep Trace /var/log/cloud-init* -A 11
/var/log/cloud-init.log:Traceback (most recent call last):
/var/log/cloud-init.log- File "/usr/lib/python3/dist-packages/cloudinit/sources/DataSourceAzure.py", line 287, in bounce_network_with_azure_hostname
/var/log/cloud-init.log- prev_hostname=previous_hostname)
/var/log/cloud-init.log- File "/usr/lib/python3/dist-packages/cloudinit/sources/DataSourceAzure.py", line 617, in perform_hostname_bounce
/var/log/cloud-init.log- 'env': env})
/var/log/cloud-init.log- File "/usr/lib/python3/dist-packages/cloudinit/util.py", line 2279, in log_time
/var/log/cloud-init.log- ret = func(*args, **kwargs)
/var/log/cloud-init.log- File "/usr/lib/python3/dist-packages/cloudinit/util.py", line 1888, in subp
/v...

Read more...

review: Approve
Scott Moser (smoser) wrote :

The jenkins job testing daily build installation in centos 7 has been failing for a couple days.
I've run it locally though and it passes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ChangeLog b/ChangeLog
2index 0260c57..31c2dcb 100644
3--- a/ChangeLog
4+++ b/ChangeLog
5@@ -1,3 +1,88 @@
6+17.2:
7+ - ds-identify: failure in NoCloud due to unset variable usage.
8+ (LP: #1737704)
9+ - tests: fix collect_console when not implemented [Joshua Powers]
10+ - ec2: Use instance-identity doc for region and instance-id
11+ [Andrew Jorgensen]
12+ - tests: remove leaked tmp files in config drive tests.
13+ - setup.py: Do not include rendered files in SOURCES.txt
14+ - SUSE: remove delta in systemd local template for SUSE [Robert Schweikert]
15+ - tests: move to using tox 1.7.5
16+ - OVF: improve ds-identify to support finding OVF iso transport.
17+ (LP: #1731868)
18+ - VMware: Support for user provided pre and post-customization scripts
19+ [Maitreyee Saikia]
20+ - citest: In NoCloudKVM provide keys via metadata not userdata.
21+ - pylint: Update pylint to 1.7.1, run on tests/ and tools and fix
22+ complaints.
23+ - Datasources: Formalize DataSource get_data and related properties.
24+ - cli: Add clean and status subcommands
25+ - tests: consolidate platforms into specific dirs
26+ - ec2: Fix sandboxed dhclient background process cleanup. (LP: #1735331)
27+ - tests: NoCloudKVMImage do not modify the original local cache image.
28+ - tests: Enable bionic in integration tests. [Joshua Powers]
29+ - tests: Use apt-get to install a deb so that depends get resolved.
30+ - sysconfig: Correctly render dns and dns search info.
31+ [Ryan McCabe] (LP: #1705804)
32+ - integration test: replace curtin test ppa with cloud-init test ppa.
33+ - EC2: Fix bug using fallback_nic and metadata when restoring from cache.
34+ (LP: #1732917)
35+ - EC2: Kill dhclient process used in sandbox dhclient. (LP: #1732964)
36+ - ntp: fix configuration template rendering for openSUSE and SLES
37+ (LP: #1726572)
38+ - centos: Provide the failed #include url in error messages
39+ - Catch UrlError when #include'ing URLs [Andrew Jorgensen]
40+ - hosts: Fix openSUSE and SLES setup for /etc/hosts and clarify docs.
41+ [Robert Schweikert] (LP: #1731022)
42+ - rh_subscription: Perform null checks for enabled and disabled repos.
43+ [Dave Mulford]
44+ - Improve warning message when a template is not found.
45+ [Robert Schweikert] (LP: #1731035)
46+ - Replace the temporary i9n.brickies.net with i9n.cloud-init.io.
47+ - Azure: don't generate network configuration for SRIOV devices
48+ (LP: #1721579)
49+ - tests: address some minor feedback missed in last merge.
50+ - tests: integration test cleanup and full pass of nocloud-kvm.
51+ - Gentoo: chmod +x on all files in sysvinit/gentoo/
52+ [ckonstanski] (LP: #1727126)
53+ - EC2: Limit network config to fallback nic, fix local-ipv4 only
54+ instances. (LP: #1728152)
55+ - Gentoo: Use "rc-service" rather than "service".
56+ [Carlos Konstanski] (LP: #1727121)
57+ - resizefs: Fix regression when system booted with root=PARTUUID=
58+ (LP: #1725067)
59+ - tools: make yum package installation more reliable
60+ - citest: fix remaining warnings raised by integration tests.
61+ - citest: show the class actual class name in results.
62+ - ntp: fix config module schema to allow empty ntp config (LP: #1724951)
63+ - tools: disable fastestmirror if using proxy [Joshua Powers]
64+ - schema: Log debug instead of warning when jsonschema is not available.
65+ (LP: #1724354)
66+ - simpletable: Fix get_string method to return table-formatted string
67+ (LP: #1722566)
68+ - net: Handle bridge stp values of 0 and convert to boolean type
69+ - tools: Give specific --abbrev=8 to "git describe"
70+ - network: bridge_stp value not always correct (LP: #1721157)
71+ - tests: re-enable tox with nocloud-kvm support [Joshua Powers]
72+ - systemd: remove limit on tasks created by cloud-init-final.service.
73+ [Robert Schweikert] (LP: #1717969)
74+ - suse: Support addition of zypper repos via cloud-config.
75+ [Robert Schweikert] (LP: #1718675)
76+ - tests: Combine integration configs and testcases [Joshua Powers]
77+ - Azure, CloudStack: Support reading dhcp options from systemd-networkd.
78+ [Dimitri John Ledkov] (LP: #1718029)
79+ - packages/debian/copyright: remove mention of boto and MIT license
80+ - systemd: only mention Before=apt-daily.service on debian based distros.
81+ [Robert Schweikert]
82+ - Add missing simpletable and simpletable tests for failed merge
83+ - Remove prettytable dependency, introduce simpletable [Andrew Jorgensen]
84+ - debian/copyright: dep5 updates, reorganize, add Apache 2.0 license.
85+ [Joshua Powers] (LP: #1718681)
86+ - tests: remove dependency on shlex [Joshua Powers]
87+ - AltCloud: Trust PATH for udevadm and modprobe.
88+ - DataSourceOVF: use util.find_devs_with(TYPE=iso9660) (LP: #1718287)
89+ - tests: remove a temp file used in bootcmd tests.
90+
91 17.1:
92 - doc: document GCE datasource. [Arnd Hannemann]
93 - suse: updates to templates to support openSUSE and SLES.
94diff --git a/cloudinit/version.py b/cloudinit/version.py
95index 3255f39..be6262d 100644
96--- a/cloudinit/version.py
97+++ b/cloudinit/version.py
98@@ -4,7 +4,7 @@
99 #
100 # This file is part of cloud-init. See LICENSE file for license information.
101
102-__VERSION__ = "17.1"
103+__VERSION__ = "17.2"
104
105 FEATURES = [
106 # supports network config version 1

Subscribers

People subscribed via source and target branches

to all changes: