zuul/zuul-jobs
Code Issues Proposed changes

Revert "Override DOCKER_MIN_API_VERSION for skopeo when installing docker"

Browse Source 
This reverts *parts* of commit 9519fafd10.

Specifically, this reverts the main fix regarding DOCKER_MIN_API_VERSION.

Reason for revert: Docker 26.0.0 is out, which drops the old API

This patch additionally modifies the Zuul config in two ways:

* disables buildset-registry jobs because they are children of
  opendev-buildset-registry (a base-job in opendev) and thus
  do not pick up new changes - they are reenabled in a followup
* disables crio jobs because they have their repo seemingly broken

Change-Id: I4d05f9b187f9e40c3dcb2597e08c5bb50c261b17
Co-Authored-By: Radosław Piliszek <radek@piliszek.it>
This commit is contained in:
Dr. Jens Harbott 2024-03-21 11:41:25 +00:00 committed by Radosław Piliszek
parent 8374db870b
commit 90332e6439
3 changed files with 33 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
roles/ensure-docker/handlers/main.yaml
View File

@ -1,11 +1,4 @@
---
- name: Reload systemd
become: true
# Ansible 6 requires "systemd" and not "systemd_service"
# TODO: change this to systemd_service >= 2 weeks after Zuul 10 is released
systemd:
daemon_reload: true
- name: Stop docker.socket to avoid any conflict
become: true
service:

26
roles/ensure-docker/tasks/docker-setup.yaml
View File

@ -48,32 +48,6 @@
become: true
register: _docker_status
- name: Dir for docker systemd overrides
file:
path: /etc/systemd/system/docker.service.d/
state: directory
owner: root
group: root
mode: '0755'
become: true
# Skopeo hardcoded protocol version 1.22 until ~February 2024.
# Docker supports the MIN version override until Docker 26 releases.
# https://github.com/docker/cli/blob/master/docs/deprecated.md#deprecate-legacy-api-versions
- name: Override the docker daemon image protocol min version
copy:
dest: /etc/systemd/system/docker.service.d/image_protocol_env.conf
owner: root
group: root
mode: '0644'
content: |
[Service]
Environment="DOCKER_MIN_API_VERSION=1.22"
become: true
notify:
- Reload systemd
- Restart docker
- name: Restart docker
when: >-
(docker_userland_proxy is defined) or

147
zuul-tests.d/container-roles-jobs.yaml
View File

@ -307,119 +307,43 @@
- name: builder
label: ubuntu-jammy
- job:
name: zuul-jobs-test-registry-buildset-registry
parent: opendev-buildset-registry
description: |
Run a buildset registry for the test-registry jobs
# FIXME(yoctozepto): crio jobs are disabled because their repository seems to be broken
This runs two registries: a real buildset registry so that we
can receive speculative zuul-registry images, and a fake
buildset registry (running the speculative or latest
zuul-registry) that is used to test using the buildset registry
role.
# - job:
# name: zuul-jobs-test-ensure-kubernetes-crio
# description: |
# Test the ensure-kubernetes role with crio-o
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-openshift/.*
- roles/ensure-package-repositories/.*
- roles/build-docker-image/.*
- roles/run-buildset-registry/.*
- roles/use-buildset-registry/.*
- test-playbooks/registry/.*
- zuul-tests.d/container-roles-jobs.yaml
pre-run: test-playbooks/registry/buildset-registry-pre.yaml
run: test-playbooks/registry/buildset-registry.yaml
post-run: test-playbooks/registry/test-registry-post.yaml
vars:
container_command: docker
# 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-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-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
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-registry-buildset-registry-k8s-microk8s
dependencies: zuul-jobs-test-registry-buildset-registry
description: |
Test a buildset registry with microk8s
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-package-repositories/.*
- roles/build-docker-image/.*
- roles/run-buildset-registry/.*
- roles/use-buildset-registry/.*
- test-playbooks/registry/.*
run: test-playbooks/registry/buildset-registry-k8s-microk8s.yaml
post-run:
- test-playbooks/registry/test-registry-post.yaml
- 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
- 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
@ -575,11 +499,6 @@
- zuul-jobs-test-registry-docker
- zuul-jobs-test-registry-docker-multiarch
- zuul-jobs-test-registry-podman
- zuul-jobs-test-registry-buildset-registry
- zuul-jobs-test-registry-buildset-registry-k8s-crio
- zuul-jobs-test-registry-buildset-registry-k8s-microk8s
- 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