From f21e6dddfcb66f8e976f2b480aa142505d89ec6d Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Fri, 10 Sep 2021 12:15:05 +0200 Subject: [PATCH] Stop explicitly supported Fedora It's a moving target that keeps breaking. Right now it's broken because removing openssl-devel causes removal of dkms, which DIB insists on installing. Document the supported distributions based on what the CI runs (yes, it's Ubuntu Bionic and openSUSE 15.1, there is no mistake). Change-Id: I08263751ca158db5883d95407ad0f3c9807826eb --- .../build-succeeds-fedora/element-deps | 2 -- .../build-succeeds-fedora/element-type | 1 - doc/source/admin/dib.rst | 13 +++++++++++-- releasenotes/notes/no-fedora-aa65bcc43f9d56fa.yaml | 4 ++++ zuul.d/ironic-python-agent-builder-jobs.yaml | 9 --------- zuul.d/project.yaml | 2 -- 6 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 dib/ironic-python-agent-ramdisk/test-elements/build-succeeds-fedora/element-deps delete mode 100644 dib/ironic-python-agent-ramdisk/test-elements/build-succeeds-fedora/element-type create mode 100644 releasenotes/notes/no-fedora-aa65bcc43f9d56fa.yaml diff --git a/dib/ironic-python-agent-ramdisk/test-elements/build-succeeds-fedora/element-deps b/dib/ironic-python-agent-ramdisk/test-elements/build-succeeds-fedora/element-deps deleted file mode 100644 index 33b0844..0000000 --- a/dib/ironic-python-agent-ramdisk/test-elements/build-succeeds-fedora/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -fedora-minimal -openstack-ci-mirrors diff --git a/dib/ironic-python-agent-ramdisk/test-elements/build-succeeds-fedora/element-type b/dib/ironic-python-agent-ramdisk/test-elements/build-succeeds-fedora/element-type deleted file mode 100644 index fb12a1f..0000000 --- a/dib/ironic-python-agent-ramdisk/test-elements/build-succeeds-fedora/element-type +++ /dev/null @@ -1 +0,0 @@ -ramdisk diff --git a/doc/source/admin/dib.rst b/doc/source/admin/dib.rst index 9b5c82f..918cefc 100644 --- a/doc/source/admin/dib.rst +++ b/doc/source/admin/dib.rst @@ -2,7 +2,16 @@ diskimage-builder images ======================== Images built using diskimage-builder_ are recommended for production use on -real hardware. +real hardware. The recommended distributions are: + +* CentOS 8 (regular and stream) +* Debian Buster (``debian-minimal`` element) + +The following should work but receive only limited testing and support: + +* CentOS 7 (using Python 3.6) +* openSUSE Leap 15.1 +* Ubuntu Bionic Building -------- @@ -34,7 +43,7 @@ variable (default is amd64): .. code-block:: shell export ARCH=aarch64 - ironic-python-agent-builder -o my-ipa fedora + ironic-python-agent-builder -o my-ipa --release 8-stream centos ... with diskimage-builder ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/releasenotes/notes/no-fedora-aa65bcc43f9d56fa.yaml b/releasenotes/notes/no-fedora-aa65bcc43f9d56fa.yaml new file mode 100644 index 0000000..05b3280 --- /dev/null +++ b/releasenotes/notes/no-fedora-aa65bcc43f9d56fa.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + Fedora is no longer explicitly supported for DIB-based builds. diff --git a/zuul.d/ironic-python-agent-builder-jobs.yaml b/zuul.d/ironic-python-agent-builder-jobs.yaml index 9966630..c616427 100644 --- a/zuul.d/ironic-python-agent-builder-jobs.yaml +++ b/zuul.d/ironic-python-agent-builder-jobs.yaml @@ -112,15 +112,6 @@ vars: extra_elements: ["extra-hardware"] -- job: - name: ironic-python-agent-check-image-dib-fedora - parent: ironic-python-agent-check-image-base - required-projects: - - openstack/diskimage-builder - vars: - image_type: 'dib' - image_distro: 'fedora' - - job: name: ironic-python-agent-check-image-dib-opensuse parent: ironic-python-agent-check-image-base diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index dd48f38..30927af 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -17,8 +17,6 @@ # Non-voting jobs - ironic-python-agent-check-image-dib-centos7-python3: voting: false - - ironic-python-agent-check-image-dib-fedora: - voting: false - ironic-python-agent-check-image-dib-ubuntu: voting: false - ironic-python-agent-check-image-dib-opensuse: