Reenable crio jobs

We switch the crio buildset registry job to run on debian bookworm for
the same reason we switched the other buildset registry jobs:
compatibility between skopeo and docker.

Change-Id: I25b1f3ba7ba34b0dc0043c659111ca8405b375da
This commit is contained in:
Radosław Piliszek 2024-03-21 15:14:50 +01:00 committed by Clark Boylan
parent bfb880ec4e
commit 1a1edc21f8
1 changed files with 66 additions and 57 deletions

View File

@ -375,68 +375,74 @@
- name: debian-bookworm
label: debian-bookworm
# FIXME(yoctozepto): crio jobs are disabled because their repository seems to be broken
- job:
name: zuul-jobs-test-registry-buildset-registry-k8s-crio
dependencies: zuul-jobs-test-registry-buildset-registry
description: |
Test a buildset registry with kubernetes and CRIO
# - job:
# name: zuul-jobs-test-registry-buildset-registry-k8s-crio
# dependencies: zuul-jobs-test-registry-buildset-registry
# description: |
# Test a buildset registry with kubernetes and CRIO
It is not meant to be used directly but rather run on changes
to roles in the zuul-jobs repo.
files:
- roles/pull-from-intermediate-registry/.*
- roles/push-to-intermediate-registry/.*
- roles/ensure-docker/.*
- roles/ensure-kubernetes/.*
- roles/ensure-package-repositories/.*
- roles/build-docker-image/.*
- roles/run-buildset-registry/.*
- roles/use-buildset-registry/.*
- test-playbooks/registry/.*
run: test-playbooks/registry/buildset-registry-k8s-crio.yaml
post-run:
- test-playbooks/registry/buildset-registry-k8s-crio-post.yaml
- test-playbooks/registry/test-registry-post.yaml
vars:
container_command: podman
# Override the docker_mirror_base_url back to the role default. OpenDev
# base jobs set this to the OpenDev mirrors but those mirrors only host
# Ubuntu not Debian packages.
docker_mirror_base_url: '{{ _docker_mirror_base_url }}'
nodeset:
nodes:
- name: debian-bookworm
label: debian-bookworm
# It is not meant to be used directly but rather run on changes
# to roles in the zuul-jobs repo.
# files:
# - roles/pull-from-intermediate-registry/.*
# - roles/push-to-intermediate-registry/.*
# - roles/ensure-docker/.*
# - roles/ensure-kubernetes/.*
# - roles/ensure-package-repositories/.*
# - roles/build-docker-image/.*
# - roles/run-buildset-registry/.*
# - roles/use-buildset-registry/.*
# - test-playbooks/registry/.*
# run: test-playbooks/registry/buildset-registry-k8s-crio.yaml
# post-run:
# - test-playbooks/registry/buildset-registry-k8s-crio-post.yaml
# - test-playbooks/registry/test-registry-post.yaml
# vars:
# container_command: podman
- job:
name: zuul-jobs-test-ensure-kubernetes-crio
description: |
Test the ensure-kubernetes role with crio-o
# - job:
# name: zuul-jobs-test-ensure-kubernetes-crio
# description: |
# Test the ensure-kubernetes role with crio-o
This job tests changes to the ensure-kubernetes roles. It
is not meant to be used directly but rather run on changes to
roles in the zuul-jobs repo.
# Does not work under ubuntu-bionic
abstract: true
files:
- roles/ensure-docker/.*
- roles/ensure-kubernetes/.*
- roles/ensure-package-repositories/.*
- test-playbooks/ensure-kubernetes/.*
run: test-playbooks/ensure-kubernetes/crio.yaml
post-run: test-playbooks/ensure-kubernetes/post.yaml
# This job tests changes to the ensure-kubernetes roles. It
# is not meant to be used directly but rather run on changes to
# roles in the zuul-jobs repo.
# # Does not work under ubuntu-bionic
# abstract: true
# files:
# - roles/ensure-docker/.*
# - roles/ensure-kubernetes/.*
# - roles/ensure-package-repositories/.*
# - test-playbooks/ensure-kubernetes/.*
# run: test-playbooks/ensure-kubernetes/crio.yaml
# post-run: test-playbooks/ensure-kubernetes/post.yaml
- job:
name: zuul-jobs-test-ensure-kubernetes-crio-ubuntu-focal
description: Test the ensure-kubernetes role with crio-o on ubuntu-focal
parent: zuul-jobs-test-ensure-kubernetes-crio
nodeset:
nodes:
- name: ubuntu-focal
label: ubuntu-focal
# - job:
# name: zuul-jobs-test-ensure-kubernetes-crio-ubuntu-focal
# description: Test the ensure-kubernetes role with crio-o on ubuntu-focal
# parent: zuul-jobs-test-ensure-kubernetes-crio
# nodeset:
# nodes:
# - name: ubuntu-focal
# label: ubuntu-focal
# - job:
# name: zuul-jobs-test-ensure-kubernetes-crio-ubuntu-jammy
# description: Test the ensure-kubernetes role with crio-o on ubuntu-jammy
# parent: zuul-jobs-test-ensure-kubernetes-crio
# nodeset:
# nodes:
# - name: ubuntu-jammy
# label: ubuntu-jammy
- job:
name: zuul-jobs-test-ensure-kubernetes-crio-ubuntu-jammy
description: Test the ensure-kubernetes role with crio-o on ubuntu-jammy
parent: zuul-jobs-test-ensure-kubernetes-crio
nodeset:
nodes:
- name: ubuntu-jammy
label: ubuntu-jammy
- job:
name: zuul-jobs-test-ensure-kubernetes-microk8s
@ -614,6 +620,9 @@
- zuul-jobs-test-registry-podman
- zuul-jobs-test-registry-buildset-registry
- zuul-jobs-test-registry-buildset-registry-k8s-microk8s
- zuul-jobs-test-registry-buildset-registry-k8s-crio
- 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-debian-bookworm