diff --git a/roles/ensure-kubernetes/tasks/microk8s.yaml b/roles/ensure-kubernetes/tasks/microk8s.yaml index cc9eed699..3b747224e 100644 --- a/roles/ensure-kubernetes/tasks/microk8s.yaml +++ b/roles/ensure-kubernetes/tasks/microk8s.yaml @@ -1,7 +1,7 @@ - name: Check distro assert: - that: ansible_distribution_release == 'jammy' - msg: 'This role only supported on Jammy' + that: ansible_distribution_release in ['jammy', 'bookworm'] + msg: 'This role only supported on Jammy or Bookworm' - name: Install snapd become: yes diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml index 26d6ba804..3180b9885 100644 --- a/zuul-tests.d/container-roles-jobs.yaml +++ b/zuul-tests.d/container-roles-jobs.yaml @@ -487,6 +487,7 @@ post-run: test-playbooks/ensure-kubernetes/post.yaml # NOTE(ianw) 2022-12-08 : only supported on jammy +# NOTE(corvus) 2023-08-14 : also supported on bookworm - job: name: zuul-jobs-test-ensure-kubernetes-microk8s-ubuntu-jammy @@ -497,6 +498,15 @@ - name: 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: name: zuul-jobs-test-ensure-podman description: | @@ -622,6 +632,7 @@ - zuul-jobs-test-ensure-kubernetes-crio-ubuntu-focal - zuul-jobs-test-ensure-kubernetes-crio-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-focal - zuul-jobs-test-ensure-skopeo-ubuntu-jammy