From ed2b4c555c4d8873cd970d57be870de191357190 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 18 May 2022 10:12:58 +0200 Subject: [PATCH 1/2] [CI] Move queue setting to project level Per [1]. [1] http://lists.zuul-ci.org/pipermail/zuul-discuss/2022-May/001801.html Change-Id: I9cab915803bab882a12841cd40ccc6af2a78dae2 (cherry picked from commit 19f783b04bc923b26a53a07150941fe0e5949f55) --- zuul.d/project.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 0b6c97837..a3f7f940b 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -1,5 +1,6 @@ --- - project: + queue: kayobe templates: - openstack-cover-jobs - openstack-python3-xena-jobs @@ -33,7 +34,6 @@ - kayobe-infra-vm-ubuntu-focal gate: - queue: kayobe jobs: - kayobe-tox-ansible-syntax - kayobe-tox-ansible From a842bf3374891946b624ab1e8e27ed47447fc5ab Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 15 Sep 2022 13:13:51 +0200 Subject: [PATCH 2/2] Update to latest CentOS Stream 8 cloud image Change-Id: I4c3afb71600781dffe8072303d775cbfad16cbac (cherry picked from commit 0db7684428d04dc8b5c24905ca3ff52ec6e63bd9) --- ansible/group_vars/all/infra-vms | 4 ++-- ansible/group_vars/all/seed-vm | 4 ++-- etc/kayobe/infra-vms.yml | 2 +- etc/kayobe/seed-vm.yml | 2 +- .../update-centos-cloud-image-20220913-4862bfdc89f8de3a.yaml | 5 +++++ 5 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/update-centos-cloud-image-20220913-4862bfdc89f8de3a.yaml diff --git a/ansible/group_vars/all/infra-vms b/ansible/group_vars/all/infra-vms index a8e67fde4..46d9ffb94 100644 --- a/ansible/group_vars/all/infra-vms +++ b/ansible/group_vars/all/infra-vms @@ -46,7 +46,7 @@ infra_vm_root_format: qcow2 # https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2 # when os_distribution is "rocky", # or -# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2" +# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2" # otherwise. infra_vm_root_image: >- {%- if os_distribution == 'ubuntu' %} @@ -54,7 +54,7 @@ infra_vm_root_image: >- {%- elif os_distribution == 'rocky' %} https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2 {%- else -%} - https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2 + https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2 {%- endif %} # Capacity of the infra VM data volume. diff --git a/ansible/group_vars/all/seed-vm b/ansible/group_vars/all/seed-vm index f777994fe..158f47b42 100644 --- a/ansible/group_vars/all/seed-vm +++ b/ansible/group_vars/all/seed-vm @@ -46,7 +46,7 @@ seed_vm_root_format: qcow2 # https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2 # when os_distribution is "rocky", # or -# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2" +# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2" # otherwise. seed_vm_root_image: >- {%- if os_distribution == 'ubuntu' %} @@ -54,7 +54,7 @@ seed_vm_root_image: >- {%- elif os_distribution == 'rocky' %} https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2 {%- else -%} - https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2 + https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2 {%- endif %} # Capacity of the seed VM data volume. diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml index d9eb9256e..a802f5acc 100644 --- a/etc/kayobe/infra-vms.yml +++ b/etc/kayobe/infra-vms.yml @@ -35,7 +35,7 @@ # https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2 # when os_distribution is "rocky", # or -# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2" +# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2" # otherwise. #infra_vm_root_image: diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml index bbd0115d6..3856d51f2 100644 --- a/etc/kayobe/seed-vm.yml +++ b/etc/kayobe/seed-vm.yml @@ -29,7 +29,7 @@ # https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2 # when os_distribution is "rocky", # or -# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2" +# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2" # otherwise. #seed_vm_root_image: diff --git a/releasenotes/notes/update-centos-cloud-image-20220913-4862bfdc89f8de3a.yaml b/releasenotes/notes/update-centos-cloud-image-20220913-4862bfdc89f8de3a.yaml new file mode 100644 index 000000000..57a386c40 --- /dev/null +++ b/releasenotes/notes/update-centos-cloud-image-20220913-4862bfdc89f8de3a.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Updates base CentOS Stream 8 cloud image to + CentOS-Stream-GenericCloud-8-20220913.0.x86_64.