From 18a0d970fa1d500c58aa378e7b3f7a176cdf3ab6 Mon Sep 17 00:00:00 2001 From: Ian Wienand <iwienand@redhat.com> Date: Tue, 20 Jun 2017 21:34:57 +1000 Subject: [PATCH] Move ironic-agent test to fedora-minimal I'm uncertain as to why this is using the "fedora" element for testing ... but it requires downloading the fedora .qcow on every test which has shown to be unreliable. An easy thing to do is to switch it to fedora-minimal; that will only involve downloads from local mirrors in the gate. Add redhat-rpm-config for minimal. I admit I have not fully gone through why this is not pulled in. It's been an issue since I459f2203fa145049dda185da952813118193d573 and there's all sorts of bugs. Change-Id: I37458e3926dae32a259bd5aa9efc645561b029a0 --- .../test-elements/build-succeeds-fedora/element-deps | 3 ++- .../environment.d/10-fedora-pin-mirror.bash | 7 ------- .../elements/yum-minimal/package-installs.yaml | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash diff --git a/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps b/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps index 35a143bac..33b084418 100644 --- a/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps +++ b/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps @@ -1 +1,2 @@ -fedora +fedora-minimal +openstack-ci-mirrors diff --git a/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash b/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash deleted file mode 100644 index 3740c09df..000000000 --- a/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash +++ /dev/null @@ -1,7 +0,0 @@ -# Set DIB_DISTRIBUTION_MIRROR if running in openstack gate -if [ -f /etc/ci/mirror_info.sh ]; then - source /etc/ci/mirror_info.sh - export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_FEDORA_MIRROR -else - export DIB_DISTRIBUTION_MIRROR=http://dl.fedoraproject.org/pub/fedora/linux -fi diff --git a/diskimage_builder/elements/yum-minimal/package-installs.yaml b/diskimage_builder/elements/yum-minimal/package-installs.yaml index 8bafc7cd0..55d483d66 100644 --- a/diskimage_builder/elements/yum-minimal/package-installs.yaml +++ b/diskimage_builder/elements/yum-minimal/package-installs.yaml @@ -9,3 +9,4 @@ lsb_release: selinux-policy: selinux-policy-targeted: libselinux-python: +redhat-rpm-config: \ No newline at end of file