Support ensure-kubernetes on bookworm

Change-Id: I88cd78e73611f97ad0cfb1eebe86626b79fd1699
This commit is contained in:
James E. Blair 2023-08-14 10:46:57 -07:00
parent 03b12b2b3b
commit 56653e0470
2 changed files with 13 additions and 2 deletions

View File

@ -1,7 +1,7 @@
- name: Check distro - name: Check distro
assert: assert:
that: ansible_distribution_release == 'jammy' that: ansible_distribution_release in ['jammy', 'bookworm']
msg: 'This role only supported on Jammy' msg: 'This role only supported on Jammy or Bookworm'
- name: Install snapd - name: Install snapd
become: yes become: yes

View File

@ -487,6 +487,7 @@
post-run: test-playbooks/ensure-kubernetes/post.yaml post-run: test-playbooks/ensure-kubernetes/post.yaml
# NOTE(ianw) 2022-12-08 : only supported on jammy # NOTE(ianw) 2022-12-08 : only supported on jammy
# NOTE(corvus) 2023-08-14 : also supported on bookworm
- job: - job:
name: zuul-jobs-test-ensure-kubernetes-microk8s-ubuntu-jammy name: zuul-jobs-test-ensure-kubernetes-microk8s-ubuntu-jammy
@ -497,6 +498,15 @@
- name: ubuntu-jammy - name: ubuntu-jammy
label: ubuntu-jammy label: ubuntu-jammy
- job:
name: zuul-jobs-test-ensure-kubernetes-microk8s-debian-bookworm
description: Test the ensure-kubernetes role with docker on debian-bookworm
parent: zuul-jobs-test-ensure-kubernetes-microk8s
nodeset:
nodes:
- name: debian-bookworm
label: debian-bookworm
- job: - job:
name: zuul-jobs-test-ensure-podman name: zuul-jobs-test-ensure-podman
description: | description: |
@ -622,6 +632,7 @@
- zuul-jobs-test-ensure-kubernetes-crio-ubuntu-focal - zuul-jobs-test-ensure-kubernetes-crio-ubuntu-focal
- zuul-jobs-test-ensure-kubernetes-crio-ubuntu-jammy - zuul-jobs-test-ensure-kubernetes-crio-ubuntu-jammy
- zuul-jobs-test-ensure-kubernetes-microk8s-ubuntu-jammy - zuul-jobs-test-ensure-kubernetes-microk8s-ubuntu-jammy
- zuul-jobs-test-ensure-kubernetes-microk8s-debian-bookworm
- zuul-jobs-test-ensure-skopeo-ubuntu-bionic - zuul-jobs-test-ensure-skopeo-ubuntu-bionic
- zuul-jobs-test-ensure-skopeo-ubuntu-focal - zuul-jobs-test-ensure-skopeo-ubuntu-focal
- zuul-jobs-test-ensure-skopeo-ubuntu-jammy - zuul-jobs-test-ensure-skopeo-ubuntu-jammy