Merge ~raharper/curtin:fix/bionic-no-vlan-package into curtin:master

[Ryan Harper]

vmtest: bionic images no longer use the vlan package

Bionic images do not use the 'vlan' package to provide vlan
network configuration; skip this on bionic images.

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

FAILED: Continuous integration, rev:4c1eadc9dbdc9b8c6ecb3ac6222631632dd2af37
https://jenkins.ubuntu.com/server/job/curtin-ci/898/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/898
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/898
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/898
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/898/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Approve (continuous-integration)

645c55f... by Ryan Harper on 2018-04-16

Refactor release check to be forward looking

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

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

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

review: Approve (continuous-integration)

[Scott Moser (smoser)]

woudl be good make target_release always set to the right thing or some other way abstract that differencx.e
h

review: Approve

[Ryan Harper (raharper)]

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/curtin/commit/?id=fc19cecd

diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
index 24a01ec..00eb445 100644
--- a/tests/vmtests/test_network_vlan.py
+++ b/tests/vmtests/test_network_vlan.py
@@ -3,6 +3,7 @@
 from .releases import base_vm_classes as relbase
 from .releases import centos_base_vm_classes as centos_relbase
 from .test_network import TestNetworkBaseTestsAbs
+from unittest import SkipTest
 
 import textwrap
 import yaml
@@ -34,6 +35,11 @@ class TestNetworkVlanAbs(TestNetworkBaseTestsAbs):
         self.output_files_exist(link_files)
 
     def test_vlan_installed(self):
+        release = self.target_release if self.target_release else self.release
+        if release not in ('precise', 'trusty', 'xenial', 'artful'):
+            raise SkipTest("release '%s' does not need the vlan package" %
+                           release)
+
         self.assertIn("vlan", self.debian_packages, "vlan deb not installed")
 
     def test_vlan_enabled(self):