From a1bfca602238ffb8ca487cf2a9be025da6c7ef3f Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Thu, 7 May 2015 21:49:09 +0000 Subject: [PATCH] Add tests for building *-minimal images Lets make sure these images can be built. Change-Id: Idbd07b98c0181738d002a53373425e056390beea --- .../test-elements/build-succeeds/README.rst | 1 + .../test-elements/build-succeeds/README.rst | 1 + .../environment.d/10-fedora-pin-mirror.bash | 2 ++ .../test-elements/build-succeeds/README.rst | 1 + tests/install_test_deps.sh | 9 +++++++-- tests/run_functests.sh | 2 ++ 6 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 elements/centos-minimal/test-elements/build-succeeds/README.rst create mode 100644 elements/fedora-minimal/test-elements/build-succeeds/README.rst create mode 100644 elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash create mode 100644 elements/ubuntu-minimal/test-elements/build-succeeds/README.rst diff --git a/elements/centos-minimal/test-elements/build-succeeds/README.rst b/elements/centos-minimal/test-elements/build-succeeds/README.rst new file mode 100644 index 00000000..fa1e50dc --- /dev/null +++ b/elements/centos-minimal/test-elements/build-succeeds/README.rst @@ -0,0 +1 @@ +Verify we can build a centos-minimal image. diff --git a/elements/fedora-minimal/test-elements/build-succeeds/README.rst b/elements/fedora-minimal/test-elements/build-succeeds/README.rst new file mode 100644 index 00000000..a1e8d60a --- /dev/null +++ b/elements/fedora-minimal/test-elements/build-succeeds/README.rst @@ -0,0 +1 @@ +Verify we can build a fedora-minimal image. diff --git a/elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash b/elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash new file mode 100644 index 00000000..13224cfa --- /dev/null +++ b/elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash @@ -0,0 +1,2 @@ +# Pin to this mirror because the roundrobin is fairly unreliable +export DIB_DISTRIBUTION_MIRROR=http://dl.fedoraproject.org/pub/fedora/linux diff --git a/elements/ubuntu-minimal/test-elements/build-succeeds/README.rst b/elements/ubuntu-minimal/test-elements/build-succeeds/README.rst new file mode 100644 index 00000000..b7190827 --- /dev/null +++ b/elements/ubuntu-minimal/test-elements/build-succeeds/README.rst @@ -0,0 +1 @@ +Verify we can build a ubuntu-minimal image. diff --git a/tests/install_test_deps.sh b/tests/install_test_deps.sh index 85082bd9..34dfc9b4 100755 --- a/tests/install_test_deps.sh +++ b/tests/install_test_deps.sh @@ -11,8 +11,11 @@ sudo apt-get install -y --force-yes \ inetutils-ping \ lsb-release \ kpartx \ + python-lzma \ qemu-utils \ - uuid-runtime || \ + rpm \ + uuid-runtime \ + yum-utils || \ sudo yum -y install \ debootstrap \ docker \ @@ -22,4 +25,6 @@ sudo apt-get install -y --force-yes \ app-emulation/qemu \ dev-python/pyyaml \ sys-block/parted \ - sys-fs/multipath-tools + sys-fs/multipath-tools \ + qemu-img \ + yum-utils diff --git a/tests/run_functests.sh b/tests/run_functests.sh index f43c1e2f..7a51f23b 100755 --- a/tests/run_functests.sh +++ b/tests/run_functests.sh @@ -21,6 +21,8 @@ DEFAULT_SKIP_TESTS=( # good to have the test case around - but because of changes # in testing does not work always. debian-minimal/testing-build-succeeds + # Currently failing due to bug in locale generation + centos-minimal/build-succeeds ) # run_disk_element_test