From 03b56cf59015e8bbb302506fb88be2682b9787f8 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Wed, 24 Nov 2021 07:57:22 +0100 Subject: [PATCH] Run bifrost on CentOS Stream 9 - Adjust bindep packages - Remove unneded trousers package - Enable CRB repository for CentOS Stream 9 for libvirt packages - Allow ssh-rsa algorithm for CentOS Stream 9 - Create a voting CentOS Stream 9 job Change-Id: I718262b40e268836812d4c38df79c8d9d8f36513 --- bindep.txt | 7 +++++-- .../defaults/required_defaults_CentOS.yml | 1 - .../roles/bifrost-create-vm-nodes/tasks/main.yml | 6 ++++++ .../bifrost-prepare-for-test-dynamic/tasks/main.yml | 11 +++++++++++ releasenotes/notes/centos9-16c9853d1dd0554b.yaml | 4 ++++ zuul.d/bifrost-jobs.yaml | 5 +++++ zuul.d/project.yaml | 2 ++ 7 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/centos9-16c9853d1dd0554b.yaml diff --git a/bindep.txt b/bindep.txt index b16442023..a30ab32a0 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,4 +1,6 @@ -epel-release [platform:centos platform:rhel] +# NOTE(rpittau): the EPEL repository for centos 9 stream should be +# epel-next but it's not ready yet +epel-release [(platform:centos !platform:centos-9) (platform:rhel !platform:centos-9)] gcc git libffi-devel [platform:redhat platform:suse] @@ -8,7 +10,8 @@ libselinux-utils [platform:redhat] openssl-devel [platform:redhat] libssl-dev [platform:dpkg] lsb-release [platform:suse platform:dpkg] -redhat-lsb [platform:redhat] +# NOTE(rpittau): lsb-release is not maintained anymore for centos 9 stream +redhat-lsb [(platform:redhat !platform:centos-9)] make python3 [platform:rpm] python3-apt [platform:dpkg] diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml index c8917036b..6361fdd31 100644 --- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml +++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml @@ -21,6 +21,5 @@ required_packages: - libvirt-daemon-kvm - pkgconfig - libvirt-devel - - trousers - edk2-ovmf test_vm_emulator: "/usr/libexec/qemu-kvm" diff --git a/playbooks/roles/bifrost-create-vm-nodes/tasks/main.yml b/playbooks/roles/bifrost-create-vm-nodes/tasks/main.yml index b9bd00808..685a3d6ee 100644 --- a/playbooks/roles/bifrost-create-vm-nodes/tasks/main.yml +++ b/playbooks/roles/bifrost-create-vm-nodes/tasks/main.yml @@ -17,6 +17,12 @@ update_cache: yes when: ansible_os_family == "Debian" +- name: "Enable CRB repository for CentOS Stream 9" + command: dnf config-manager --set-enabled crb + when: + - ansible_distribution == "CentOS" + - ansible_distribution_version|int >= 9 + - name: "Load distribution defaults" include_vars: "{{ item }}" with_first_found: diff --git a/playbooks/roles/bifrost-prepare-for-test-dynamic/tasks/main.yml b/playbooks/roles/bifrost-prepare-for-test-dynamic/tasks/main.yml index 82a4342b0..fa903935f 100644 --- a/playbooks/roles/bifrost-prepare-for-test-dynamic/tasks/main.yml +++ b/playbooks/roles/bifrost-prepare-for-test-dynamic/tasks/main.yml @@ -54,3 +54,14 @@ - name: "Add testvm hosts from SSH known_hosts file." shell: ssh-keyscan "{{ ipv4_address }}" >> "{{ ansible_env.HOME }}/.ssh/known_hosts" when: ipv4_address is defined +- name: "Allow ssh-rsa algorithm for CentOS Stream 9" + block: + - name: "Add ssh-rsa algorithm to ssh config" + shell: echo "PubkeyAcceptedKeyTypes +ssh-rsa" >> ~/.ssh/config + - name: "Set correct permissions for ssh config" + file: + path: ~/.ssh/config + mode: '0600' + when: + - ansible_distribution == "CentOS" + - ansible_distribution_version|int >= 9 \ No newline at end of file diff --git a/releasenotes/notes/centos9-16c9853d1dd0554b.yaml b/releasenotes/notes/centos9-16c9853d1dd0554b.yaml new file mode 100644 index 000000000..a9bdf4d78 --- /dev/null +++ b/releasenotes/notes/centos9-16c9853d1dd0554b.yaml @@ -0,0 +1,4 @@ +--- +other: + - | + Adds basic support for running bifrost on CentOS Stream 9. diff --git a/zuul.d/bifrost-jobs.yaml b/zuul.d/bifrost-jobs.yaml index c14248bbc..408ef202b 100644 --- a/zuul.d/bifrost-jobs.yaml +++ b/zuul.d/bifrost-jobs.yaml @@ -136,6 +136,11 @@ test_driver: redfish use_vmedia: true +- job: + name: bifrost-integration-tinyipa-centos-9 + parent: bifrost-integration-tinyipa + nodeset: centos-9-stream + #NOTE(rpittau): remove buster support in Z or later - job: name: bifrost-integration-tinyipa-debian-buster diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 35b8c7b14..d055d697a 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -7,6 +7,7 @@ check: jobs: - bifrost-tox-linters + - bifrost-integration-tinyipa-centos-9 - bifrost-integration-tinyipa-ubuntu-focal - bifrost-integration-tinyipa-centos-8 - bifrost-integration-tinyipa-keystone-ubuntu-focal @@ -59,6 +60,7 @@ gate: jobs: - bifrost-tox-linters + - bifrost-integration-tinyipa-centos-9 - bifrost-integration-tinyipa-ubuntu-focal - bifrost-integration-tinyipa-centos-8 - bifrost-integration-tinyipa-keystone-ubuntu-focal