From 901d587f881cdb7e52e179a34d6025b772b37036 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 18 May 2022 09:36:06 +0200 Subject: [PATCH] Remove support for all distributions with Python 3.6 They are broken after setup.cfg changes have been done to projects. Change-Id: I762755024322afc6517adfb8ad79adfa3ec346cf --- doc/source/install/index.rst | 8 ++---- doc/source/install/offline-install.rst | 4 +-- doc/source/user/troubleshooting.rst | 4 +-- .../bifrost-ironic-install/defaults/main.yml | 16 +++++++---- .../notes/no-3.6-b6bb33ce08695675.yaml | 10 +++++++ zuul.d/bifrost-jobs.yaml | 28 ++++--------------- zuul.d/project.yaml | 25 ++++------------- 7 files changed, 36 insertions(+), 59 deletions(-) create mode 100644 releasenotes/notes/no-3.6-b6bb33ce08695675.yaml diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst index afcd584f6..3d7d5b96e 100644 --- a/doc/source/install/index.rst +++ b/doc/source/install/index.rst @@ -15,19 +15,15 @@ Supported operating systems Full support (fully tested in the CI, no known or potential issues): * CentOS Stream 9 -* CentOS Stream 8 (deprecated but will keep running normal CI until Z cycle) .. note:: - RHEL is assumed to work but not tested explicitly. + RHEL 9 and derivatives are assumed to work but not tested explicitly. * Ubuntu 20.04 "Focal" * Debian 11 "Bullseye" -Deprecated, support may be removed at any moment: +Limited support, may be removed at any moment: -* Ubuntu 18.04 "Bionic" -* Debian 10 "Buster -* openSUSE Leap 15.2 * Fedora 34 (32+ is supported but not recommended) .. note:: diff --git a/doc/source/install/offline-install.rst b/doc/source/install/offline-install.rst index 8a7f7d0ef..9701d5206 100644 --- a/doc/source/install/offline-install.rst +++ b/doc/source/install/offline-install.rst @@ -43,8 +43,8 @@ this. .. code-block:: yaml - ipa_kernel_upstream_url: file:///vagrant/ipa-centos8-master.kernel - ipa_ramdisk_upstream_url: file:///vagrant/ipa-centos8-master.initramfs + ipa_kernel_upstream_url: file:///vagrant/ipa-centos9-master.kernel + ipa_ramdisk_upstream_url: file:///vagrant/ipa-centos9-master.initramfs cirros_deploy_image_upstream_url: file:///vagrant/cirros-0.5.1-x86_64-disk.img dib_git_url: file:///vagrant/git/diskimage-builder ironicclient_git_url: file:///vagrant/git/python-ironicclient diff --git a/doc/source/user/troubleshooting.rst b/doc/source/user/troubleshooting.rst index b58448701..9a4e87180 100644 --- a/doc/source/user/troubleshooting.rst +++ b/doc/source/user/troubleshooting.rst @@ -156,9 +156,9 @@ DIB-based or any other IPA image, you will need to take the following steps: file and update the ``ipa_kernel_upstream_url`` and ``ipa_kernel_upstream_url`` settings to a new URL. For DIB-based images, these urls would be, - ``https://tarballs.opendev.org/openstack/ironic-python-agent/dib/files/ipa-centos8-master.kernel`` + ``https://tarballs.opendev.org/openstack/ironic-python-agent/dib/files/ipa-centos9-master.kernel`` and - ``https://tarballs.opendev.org/openstack/ironic-python-agent/dib/files/ipa-centos8-master.initramfs`` + ``https://tarballs.opendev.org/openstack/ironic-python-agent/dib/files/ipa-centos9-master.initramfs`` respectively. #. Execute the installation playbook, and the set files will be automatically downloaded again. If the files are not removed prior to (re)installation, diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index 82f3f515a..77386761b 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml @@ -78,13 +78,19 @@ ipa_download_headers: {} ipa_kernel: "{{http_boot_folder}}/ipa.kernel" ipa_ramdisk: "{{http_boot_folder}}/ipa.initramfs" ipa_kernel_url: "{{ ipa_file_protocol }}://{{ internal_ip }}:{{ file_url_port }}/ipa.kernel" +ipa_download_distro: >- + {%- if ipa_upstream_release == "stable-train" -%} + centos7 + {%- elif ipa_upstream_release in ["stable-ussuri", "stable-victoria", "stable-wallaby", "stable-xena", "stable-yoga"] -%} + centos8 + {%- else -%} + centos9 + {%- endif -%} ipa_kernel_upstream_url: >- {%- if use_tinyipa | bool -%} {{tarballs_base_url}}/tinyipa/files/tinyipa-{{ ipa_upstream_release }}.vmlinuz - {%- elif ipa_upstream_release == "stable-train" -%} - {{tarballs_base_url}}/dib/files/ipa-centos7-{{ ipa_upstream_release }}.kernel {%- else -%} - {{tarballs_base_url}}/dib/files/ipa-centos8-{{ ipa_upstream_release }}.kernel + {{tarballs_base_url}}/dib/files/ipa-{{ ipa_download_distro }}-{{ ipa_upstream_release }}.kernel {%- endif -%} ipa_kernel_upstream_checksum_algo: "sha256" ipa_kernel_upstream_checksum_url: "{{ ipa_kernel_upstream_url }}.{{ ipa_kernel_upstream_checksum_algo }}" @@ -92,10 +98,8 @@ ipa_ramdisk_url: "{{ ipa_file_protocol }}://{{ internal_ip }}:{{ file_url_port } ipa_ramdisk_upstream_url: >- {%- if use_tinyipa | bool -%} {{tarballs_base_url}}/tinyipa/files/tinyipa-{{ ipa_upstream_release }}.gz - {%- elif ipa_upstream_release == "stable-train" -%} - {{tarballs_base_url}}/dib/files/ipa-centos7-{{ ipa_upstream_release }}.initramfs {%- else -%} - {{tarballs_base_url}}/dib/files/ipa-centos8-{{ ipa_upstream_release }}.initramfs + {{tarballs_base_url}}/dib/files/ipa-{{ ipa_download_distro }}-{{ ipa_upstream_release }}.initramfs {%- endif -%} ipa_ramdisk_upstream_checksum_algo: "sha256" ipa_ramdisk_upstream_checksum_url: "{{ ipa_ramdisk_upstream_url }}.{{ ipa_ramdisk_upstream_checksum_algo }}" diff --git a/releasenotes/notes/no-3.6-b6bb33ce08695675.yaml b/releasenotes/notes/no-3.6-b6bb33ce08695675.yaml new file mode 100644 index 000000000..0f93efc25 --- /dev/null +++ b/releasenotes/notes/no-3.6-b6bb33ce08695675.yaml @@ -0,0 +1,10 @@ +--- +upgrade: + - | + Removes support for any distributions using Python 3.6 since OpenStack no + longer supports it. This includes: + + * CentOS Stream 8, RHEL 8 and derivatives. + * OpenSUSE Leap 15 (all minor versions). + * Debian 10 "Buster". + * Ubuntu 18.04 "Bionic". diff --git a/zuul.d/bifrost-jobs.yaml b/zuul.d/bifrost-jobs.yaml index 18307558e..fa40a1934 100644 --- a/zuul.d/bifrost-jobs.yaml +++ b/zuul.d/bifrost-jobs.yaml @@ -44,11 +44,6 @@ parent: bifrost-integration-dhcp nodeset: ubuntu-focal -- job: - name: bifrost-integration-dhcp-centos-8 - parent: bifrost-integration-dhcp - nodeset: centos-8-stream - - job: name: bifrost-integration-dhcp-centos-9 parent: bifrost-integration-dhcp @@ -66,11 +61,6 @@ parent: bifrost-integration-dibipa-debian nodeset: ubuntu-focal -- job: - name: bifrost-integration-dibipa-debian-centos-8 - parent: bifrost-integration-dibipa-debian - nodeset: centos-8-stream - - job: name: bifrost-integration-dibipa-debian-centos-9 parent: bifrost-integration-dibipa-debian @@ -120,11 +110,13 @@ vars: cli_test: true +# TODO(dtantsur): remove when no longer used by child jobs - job: name: bifrost-integration-tinyipa-centos-8 parent: bifrost-integration-tinyipa nodeset: centos-8-stream +# TODO(dtantsur): remove when no longer used by IPE - job: name: bifrost-integration-tinyipa-keystone-centos-8 parent: bifrost-integration-tinyipa-centos-8 @@ -137,6 +129,7 @@ test_driver: redfish enable_prometheus_exporter: true +# TODO(dtantsur): remove when no longer used by Ironic - job: name: bifrost-integration-redfish-vmedia-uefi-centos-8 parent: bifrost-integration-tinyipa-centos-8 @@ -168,22 +161,11 @@ test_driver: redfish enable_prometheus_exporter: true -#NOTE(rpittau): remove buster support in Z or later -- job: - name: bifrost-integration-tinyipa-debian-buster - parent: bifrost-integration-tinyipa - nodeset: debian-buster - - job: name: bifrost-integration-tinyipa-debian-bullseye parent: bifrost-integration-tinyipa nodeset: debian-bullseye -- job: - name: bifrost-integration-tinyipa-opensuse-15 - parent: bifrost-integration-tinyipa - nodeset: opensuse-15 - - job: name: bifrost-integration-tinyipa-fedora-latest parent: bifrost-integration-tinyipa @@ -217,9 +199,9 @@ nodeset: ubuntu-focal - job: - name: bifrost-upgrade-keystone-centos8 + name: bifrost-upgrade-keystone-centos9 parent: bifrost-upgrade - nodeset: centos-8-stream + nodeset: centos-9-stream required-projects: - openstack/keystone vars: diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index da1dd1dd8..2fed2dbda 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -9,38 +9,26 @@ - bifrost-tox-linters - bifrost-integration-tinyipa-centos-9 - bifrost-integration-tinyipa-ubuntu-focal - - bifrost-integration-tinyipa-centos-8 - bifrost-integration-tinyipa-keystone-ubuntu-focal - - bifrost-integration-tinyipa-keystone-centos-8 - bifrost-integration-tinyipa-keystone-centos-9 - bifrost-integration-tinyipa-debian-bullseye - bifrost-integration-redfish-vmedia-uefi-ubuntu-focal - - bifrost-integration-redfish-vmedia-uefi-centos-8 - bifrost-integration-redfish-vmedia-uefi-centos-9 - bifrost-upgrade-ubuntu-focal - - bifrost-upgrade-keystone-centos8 + # FIXME(dtantsur): make this voting when Yoga is fixed + - bifrost-upgrade-keystone-centos9: + voting: false # Non-voting jobs - - bifrost-integration-tinyipa-ubuntu-bionic: - voting: false - - bifrost-integration-tinyipa-opensuse-15: - voting: false - bifrost-integration-tinyipa-fedora-latest: voting: false - #NOTE(rpittau): remove buster support in Z or later - - bifrost-integration-tinyipa-debian-buster: - voting: false - bifrost-integration-redfish-uefi-fedora-latest: voting: false - bifrost-integration-dhcp-ubuntu-focal: voting: false - - bifrost-integration-dhcp-centos-8: - voting: false - bifrost-integration-dhcp-centos-9: voting: false - bifrost-integration-dibipa-debian-ubuntu-focal: voting: false - - bifrost-integration-dibipa-debian-centos-8: - voting: false - bifrost-integration-dibipa-debian-centos-9: voting: false - bifrost-cli-ubuntu-focal: @@ -68,16 +56,13 @@ - bifrost-tox-linters - bifrost-integration-tinyipa-centos-9 - bifrost-integration-tinyipa-ubuntu-focal - - bifrost-integration-tinyipa-centos-8 - bifrost-integration-tinyipa-keystone-ubuntu-focal - - bifrost-integration-tinyipa-keystone-centos-8 - bifrost-integration-tinyipa-keystone-centos-9 - bifrost-integration-tinyipa-debian-bullseye - bifrost-integration-redfish-vmedia-uefi-ubuntu-focal - - bifrost-integration-redfish-vmedia-uefi-centos-8 - bifrost-integration-redfish-vmedia-uefi-centos-9 - bifrost-upgrade-ubuntu-focal - - bifrost-upgrade-keystone-centos8 + # - bifrost-upgrade-keystone-centos9 experimental: jobs: - - bifrost-benchmark-ironic \ No newline at end of file + - bifrost-benchmark-ironic