Merge lp:~smoser/curtin/trunk.lp1662346 into lp:~curtin-dev/curtin/trunk

[Scott Moser]

Install zipl in target on s390x arch.

Add installation of zipl via install_missing_packages.

[lp:~smoser/curtin/trunk.lp1662346]

450. By Scott Moser on 2017-02-07

merge from trunk

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

FAILED: Continuous integration, rev:450
https://jenkins.ubuntu.com/server/job/curtin-ci/320/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/320/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/320/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/320/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-amd64/320/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/320/console

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

review: Needs Fixing (continuous-integration)

[lp:~smoser/curtin/trunk.lp1662346]

451. By Scott Moser on 2017-02-07

fix variable name

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

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

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

review: Approve (continuous-integration)

[Joshua Powers (powersj)]

Simple failed, https://jenkins.ubuntu.com/server/job/curtin-vmtest-s390x/9/console zipl is in s390-tools

[lp:~smoser/curtin/trunk.lp1662346]

452. By Scott Moser on 2017-02-07

zipl is in s390-tools

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

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

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

review: Approve (continuous-integration)

[Joshua Powers (powersj)]

Pass vmtest XenialTestSimple on s390x:
https://jenkins.ubuntu.com/server/job/curtin-vmtest-s390x/10/console

review: Approve

=== modified file 'curtin/commands/curthooks.py'
--- curtin/commands/curthooks.py	2017-02-06 20:58:54 +0000
+++ curtin/commands/curthooks.py	2017-02-07 19:12:43 +0000
@@ -621,6 +621,15 @@
                pkg not in installed_packages:
                 needed_packages.append(pkg)
 
+    arch_packages = {
+        's390x': [('s390-tools', 'zipl')],
+    }
+
+    for pkg, cmd in arch_packages.get(platform.machine(), []):
+        if not util.which(cmd, target=target):
+            if pkg not in needed_packages:
+                needed_packages.append(pkg)
+
     if needed_packages:
         state = util.load_command_environment()
         with events.ReportEventStack(