From 61781e1dd142c431877839ea02be779a4cf4b313 Mon Sep 17 00:00:00 2001 From: Marios Andreou Date: Fri, 17 Mar 2023 10:16:25 +0200 Subject: [PATCH] Remove workaround explicit downgrade of containers common 1.44 This removes the workaround introduced for [1]. The bug is fixed and this pin is now causing problems as seen at [2]. [1] https://launchpad.net/bugs/1988500 [2] https://53a040c36594af0c8d61-65c8cd20428a10135cd2762abf51d9a7.ssl.cf1.rackcdn.com/877305/5/check/tripleo-ansible-centos-stream-molecule-tripleo_redhat_enforce/78b4abf/job-output.txt Change-Id: I527036d08876a0a963133d5e15d85af695a3251e --- zuul.d/playbooks/directories.yml | 8 -------- zuul.d/playbooks/pre.yml | 7 ------- 2 files changed, 15 deletions(-) diff --git a/zuul.d/playbooks/directories.yml b/zuul.d/playbooks/directories.yml index 94eaf5912..2873cae40 100644 --- a/zuul.d/playbooks/directories.yml +++ b/zuul.d/playbooks/directories.yml @@ -23,11 +23,3 @@ dest: /opt/ remote_src: true mode: "0777" - - # FIXME(chandankumar): Downgrade ontainers-common due to - # https://bugs.launchpad.net/tripleo/+bug/1988500 and - # https://bugzilla.redhat.com/show_bug.cgi?id=2123611 -- name: Downgrade containers-common - shell: | - if [ -n "$(rpm -qa containers-common)" ];then dnf -y downgrade containers-common-1-40.el9; fi - become: true diff --git a/zuul.d/playbooks/pre.yml b/zuul.d/playbooks/pre.yml index ffce840d5..0c562b96a 100644 --- a/zuul.d/playbooks/pre.yml +++ b/zuul.d/playbooks/pre.yml @@ -76,13 +76,6 @@ - name: Reset ssh connection meta: reset_connection tasks: - # FIXME(chandankumar): Downgrade ontainers-common due to - # https://bugs.launchpad.net/tripleo/+bug/1988500 and - # https://bugzilla.redhat.com/show_bug.cgi?id=2123611 - - name: Downgrade containers-common - shell: | - if [ -n "$(rpm -qa containers-common)" ];then dnf -y downgrade containers-common-1-40.el9; fi - become: true - name: Get Ansible Galaxy roles command: >- {{ ansible_user_dir }}/test-python/bin/ansible-galaxy install --timeout 300