From a2a9b7267bbc79c31c0c8a9628a5bbc9d9273d1f Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Fri, 27 Aug 2021 09:57:02 +0200 Subject: [PATCH] Support debian 11 "bullseye" Change-Id: Iebf15915ac6cd1c6a575923bf1b4828fab7b1385 --- doc/source/install/index.rst | 8 +++++--- doc/source/user/howto.rst | 2 +- playbooks/roles/bifrost-create-dib-image/README.md | 4 ++-- playbooks/roles/bifrost-create-dib-image/tasks/main.yml | 4 ++-- .../defaults/required_defaults_Debian_family.yml | 7 +++---- .../defaults/required_defaults_Debian_family.yml | 5 ++--- releasenotes/notes/bullseye-9112536e10e18417.yaml | 4 ++++ zuul.d/bifrost-jobs.yaml | 6 ++++++ zuul.d/project.yaml | 3 +++ 9 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 releasenotes/notes/bullseye-9112536e10e18417.yaml diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst index e53ae6b31..af500f08f 100644 --- a/doc/source/install/index.rst +++ b/doc/source/install/index.rst @@ -16,13 +16,15 @@ Supported operating systems * CentOS Stream 8 * Ubuntu 20.04 "Focal" -* Debian 10 "Buster" +* Debian 11 "Bullseye" -2nd tier support (limited testing or known issues): +2nd tier support (limited testing): * Ubuntu 18.04 "Bionic" +* Debian 10 "Buster - Tested in the Bifrost CI, but no longer tested in the ironic upstream CI. + Tested in the Bifrost CI only as non-voting jobs (does not block CI in case + of failure). * RHEL 8 and regular CentOS 8 diff --git a/doc/source/user/howto.rst b/doc/source/user/howto.rst index 0c70a4a91..bd95587ac 100644 --- a/doc/source/user/howto.rst +++ b/doc/source/user/howto.rst @@ -231,7 +231,7 @@ Bifrost supports the ability for a user to build a custom IPA ramdisk utilizing diskimage-builder and ironic-python-agent-builder. In order to utilize this feature, the ``download_ipa`` setting must be set to ``false`` and the create_ipa_image must be set to "true". By default, the install -playbook will build a Debian Buster based IPA image, if a pre-existing IPA +playbook will build a Debian Bullseye based IPA image, if a pre-existing IPA image is not present on disk. If you wish to explicitly set a specific release to be passed to diskimage-create, then the setting ``dib_os_release`` can be set in addition to ``dib_os_element``. diff --git a/playbooks/roles/bifrost-create-dib-image/README.md b/playbooks/roles/bifrost-create-dib-image/README.md index de14a666a..f5691a275 100644 --- a/playbooks/roles/bifrost-create-dib-image/README.md +++ b/playbooks/roles/bifrost-create-dib-image/README.md @@ -59,9 +59,9 @@ dib_os_release can be utilized to set the DIB_RELEASE environment variable for semi-dynamic disk image creation by a user or the test script. By default, it is not set, but an example if dib_os_element is set to ``debian``, then a user could choose -the ``buster`` release. +the ``bullseye`` release. -dib_os_release: buster +dib_os_release: bullseye All the other command-line options to disk-image-create or ramdisk-image-create can be used by the role. The following is a list diff --git a/playbooks/roles/bifrost-create-dib-image/tasks/main.yml b/playbooks/roles/bifrost-create-dib-image/tasks/main.yml index e12c50019..04794b798 100644 --- a/playbooks/roles/bifrost-create-dib-image/tasks/main.yml +++ b/playbooks/roles/bifrost-create-dib-image/tasks/main.yml @@ -108,9 +108,9 @@ when: - dib_packages is defined - dib_packages | length > 0 -- name: "Set default of Debian Buster if building debian and not explicitly set, overwride with dib_os_release setting" +- name: "Set default of Debian Bullseye if building debian and not explicitly set, override with dib_os_release setting" set_fact: - dib_os_release: "buster" + dib_os_release: "bullseye" when: dib_os_element == "debian" and dib_os_release is undefined - name: "Initialize DIB source-repository variables" set_fact: diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml index e1f067d2f..18e281b09 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml @@ -10,9 +10,8 @@ grub_efi_binary: /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed shim_efi_binary: /usr/lib/shim/shimx64.efi.signed required_packages: - mariadb-server - - python-dev - - python-mysqldb - - python-configparser + - python3-dev + - python3-mysqldb - libffi-dev - libxslt1-dev - libssl-dev @@ -28,7 +27,7 @@ required_packages: - uuid-runtime - curl - socat - - python-pip + - python3-pip - gcc - dnsmasq - apache2-utils diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml index d3472155a..8855935e2 100644 --- a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml +++ b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml @@ -3,9 +3,8 @@ init_dest_dir: /lib/systemd/system/ mysql_service_name: mysql required_packages: - mariadb-server - - python-dev - - python-mysqldb - - python-configparser + - python3-dev + - python3-mysqldb - libffi-dev - libxslt1-dev - libssl-dev diff --git a/releasenotes/notes/bullseye-9112536e10e18417.yaml b/releasenotes/notes/bullseye-9112536e10e18417.yaml new file mode 100644 index 000000000..b82bb6849 --- /dev/null +++ b/releasenotes/notes/bullseye-9112536e10e18417.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Debian Bullseye (11.0) is now supported as a base operating system. diff --git a/zuul.d/bifrost-jobs.yaml b/zuul.d/bifrost-jobs.yaml index 4727883c1..3baf942d8 100644 --- a/zuul.d/bifrost-jobs.yaml +++ b/zuul.d/bifrost-jobs.yaml @@ -154,11 +154,17 @@ test_driver: redfish use_vmedia: 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 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 9df1df5eb..35b8c7b14 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -11,6 +11,7 @@ - bifrost-integration-tinyipa-centos-8 - bifrost-integration-tinyipa-keystone-ubuntu-focal - bifrost-integration-tinyipa-keystone-centos-8 + - bifrost-integration-tinyipa-debian-bullseye - bifrost-integration-redfish-vmedia-uefi-ubuntu-focal - bifrost-integration-redfish-vmedia-uefi-centos-8 - bifrost-upgrade-ubuntu-focal @@ -22,6 +23,7 @@ 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: @@ -61,6 +63,7 @@ - bifrost-integration-tinyipa-centos-8 - bifrost-integration-tinyipa-keystone-ubuntu-focal - bifrost-integration-tinyipa-keystone-centos-8 + - bifrost-integration-tinyipa-debian-bullseye - bifrost-integration-redfish-vmedia-uefi-ubuntu-focal - bifrost-integration-redfish-vmedia-uefi-centos-8 - bifrost-upgrade-ubuntu-focal