From 94a74f58c7891e41ca637c4e2a6450ca88cbfb56 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 15 Feb 2023 10:50:49 +0100 Subject: [PATCH] Pin zun jobs to Docker 20 Related-Bug: #2007142 Change-Id: I9ce2a9ce5413e77625201f3986967e31a679ad9c --- doc/source/reference/compute/zun-guide.rst | 10 ++++++++++ tests/templates/globals-default.j2 | 3 +++ zuul.d/base.yaml | 1 + 3 files changed, 14 insertions(+) diff --git a/doc/source/reference/compute/zun-guide.rst b/doc/source/reference/compute/zun-guide.rst index 9959dede1a..a2dee978d6 100644 --- a/doc/source/reference/compute/zun-guide.rst +++ b/doc/source/reference/compute/zun-guide.rst @@ -23,6 +23,16 @@ following variables: docker_configure_for_zun: "yes" containerd_configure_for_zun: "yes" +Currently Kuryr does not support Docker 23 and later due to +dropped --cluster-store option (bug +`bug `__).You need +to cap docker by setting the following variables in globals.yml. + +.. code-block:: yaml + + docker_apt_package_pin: "5:20.*" + docker_yum_package_pin: "20.*" + Docker reconfiguration requires rebootstrapping before deploy. Make sure you understand the consequences of restarting Docker. Please see :ref:`rebootstrapping` for details. diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index a8851647b0..ca0e3a406d 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -78,6 +78,9 @@ enable_cinder: "yes" # lvm backup driver for cinder-backup does not exist enable_cinder_backup: "no" enable_cinder_backend_lvm: "yes" +# pin Docker to 20 - https://bugs.launchpad.net/zun/+bug/2007142 +docker_apt_package_pin: "5:20.*" +docker_yum_package_pin: "20.*" {% endif %} {% if scenario == "swift" %} diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 9434ed694a..906d52e541 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -103,6 +103,7 @@ - ^tests/test-core-openstack.sh - ^tests/test-zun.sh - ^tests/test-dashboard.sh + - ^tests/templates/globals-default\.j2$ vars: scenario: zun