From 5d39f83f7454a35028b6831a71df03f19921f929 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 25 May 2017 19:42:38 +0200 Subject: [PATCH] Test openSUSE 42.2/42.3 image builds Currently openSUSE 42.3 has entered feature freeze mode so it is a good point in time to verify that 42.3 builds are working successfully. Also test opensuse-minimal for platforms that support it (need working zypper package) Change-Id: I4c613e1e68cb7375c29d544bbf70b5da9bf21414 --- bindep.txt | 2 ++ .../test-elements/opensuse423-build-succeeds/README.rst | 1 + .../environment.d/10-set-distro.bash | 1 + diskimage_builder/elements/opensuse/README.rst | 4 ---- .../test-elements/opensuse423-build-succeeds/README.rst | 1 + .../environment.d/10-set-distro.bash | 1 + diskimage_builder/elements/zypper-minimal/README.rst | 4 ++-- tests/run_functests.sh | 5 +++++ 8 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 diskimage_builder/elements/opensuse-minimal/test-elements/opensuse423-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/opensuse-minimal/test-elements/opensuse423-build-succeeds/environment.d/10-set-distro.bash create mode 100644 diskimage_builder/elements/opensuse/test-elements/opensuse423-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/opensuse/test-elements/opensuse423-build-succeeds/environment.d/10-set-distro.bash diff --git a/bindep.txt b/bindep.txt index 5a9c382e..f737d2bc 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,3 +1,5 @@ # This is a cross-platform list tracking distribution packages needed by tests; # see http://docs.openstack.org/infra/bindep/ for additional information. squashfs-tools +zypper [!platform:redhat !platform:ubuntu-trusty] +gnupg2 [!platform:redhat !platform:ubuntu-trusty] diff --git a/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse423-build-succeeds/README.rst b/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse423-build-succeeds/README.rst new file mode 100644 index 00000000..b919a4d0 --- /dev/null +++ b/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse423-build-succeeds/README.rst @@ -0,0 +1 @@ +Verify we can build an openSUSE Leap 42.3 image. diff --git a/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse423-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse423-build-succeeds/environment.d/10-set-distro.bash new file mode 100644 index 00000000..b6af03b1 --- /dev/null +++ b/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse423-build-succeeds/environment.d/10-set-distro.bash @@ -0,0 +1 @@ +export DIB_RELEASE=42.3 diff --git a/diskimage_builder/elements/opensuse/README.rst b/diskimage_builder/elements/opensuse/README.rst index 586132dc..97a90fa9 100644 --- a/diskimage_builder/elements/opensuse/README.rst +++ b/diskimage_builder/elements/opensuse/README.rst @@ -6,10 +6,6 @@ located in distribution specific sub directories under http://download.opensuse.org/repositories/Cloud:/Images:/ -For example, the images of openSUSE 13.2 can be found here: - - http://download.opensuse.org/repositories/Cloud:/Images:/openSUSE_13.2/images/ - These images should be considered experimental. There are currently only x86_64 images. diff --git a/diskimage_builder/elements/opensuse/test-elements/opensuse423-build-succeeds/README.rst b/diskimage_builder/elements/opensuse/test-elements/opensuse423-build-succeeds/README.rst new file mode 100644 index 00000000..b919a4d0 --- /dev/null +++ b/diskimage_builder/elements/opensuse/test-elements/opensuse423-build-succeeds/README.rst @@ -0,0 +1 @@ +Verify we can build an openSUSE Leap 42.3 image. diff --git a/diskimage_builder/elements/opensuse/test-elements/opensuse423-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/opensuse/test-elements/opensuse423-build-succeeds/environment.d/10-set-distro.bash new file mode 100644 index 00000000..b6af03b1 --- /dev/null +++ b/diskimage_builder/elements/opensuse/test-elements/opensuse423-build-succeeds/environment.d/10-set-distro.bash @@ -0,0 +1 @@ +export DIB_RELEASE=42.3 diff --git a/diskimage_builder/elements/zypper-minimal/README.rst b/diskimage_builder/elements/zypper-minimal/README.rst index eb1c2153..8fcda2ea 100644 --- a/diskimage_builder/elements/zypper-minimal/README.rst +++ b/diskimage_builder/elements/zypper-minimal/README.rst @@ -14,6 +14,6 @@ This element expects the `ZYPPER_REPOS` variable to be exported by the operating system element. This variable contains repository mappings in the following format: `${repo_name}==>${repo_url}`. For example:: - ZYPPER_REPOS="update=>http://download.opensuse.org/update/leap/42.1/oss/ " - ZYPPER_REPOS+="oss=>http://download.opensuse.org/distribution/leap/42.1/repo/oss/" + ZYPPER_REPOS="update=>http://download.opensuse.org/update/leap/42.2/oss/ " + ZYPPER_REPOS+="oss=>http://download.opensuse.org/distribution/leap/42.2/repo/oss/" export ZYPPER_REPOS diff --git a/tests/run_functests.sh b/tests/run_functests.sh index a93a406f..ed824205 100755 --- a/tests/run_functests.sh +++ b/tests/run_functests.sh @@ -24,9 +24,14 @@ export LC_ALL= DEFAULT_SKIP_TESTS=( # we run version pinned test in gate (this just runs latest) fedora/build-succeeds + # These require "zypper" on the host which is not available on + # all platforms + opensuse-minimal/build-succeeds + opensuse-minimal/opensuse423-build-succeeds # in non-voting gentoo/build-succeeds opensuse/build-succeeds + opensuse/opensuse423-build-succeeds ubuntu-minimal/precise-build-succeeds # good to have the test case around - but because of changes # in testing does not work always.