From 61973b67be2a5bf91815aadf7bb99f50a100eed7 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Mon, 26 Sep 2022 11:36:10 +0530 Subject: [PATCH] [CS8][Wallaby] Exclude container-selinux-2:2.189.0 Latest version of udica[1] requires container-selinux. In ffu upgrade job, during container-selinux installation, It gives following error: ``` package container-selinux-2:2.189.0-1.module_el8.7.0+1217+ea57d1f1.noarch conflicts with udica < 0.2.6-1 provided by udica-0.2.4-1.module_el8.7.0+1217+ea57d1f1.noarch ``` Excluding latest container-selinux-2:2.189.0 fixes the issue as it works with existing udica-0.2.4-1.module_el8. [1]. https://koji.mbox.centos.org/koji/buildinfo?buildID=22871 Related-Bug: #1990810 Signed-off-by: Chandan Kumar (raukadah) Change-Id: Ied21dbba59dbfe174036d2301ab9543c924c1de5 --- .../tripleo-ci/CentOS-8/promotion-testing-hash-wallaby.yml | 7 +++++++ config/release/tripleo-ci/CentOS-8/wallaby.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-wallaby.yml b/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-wallaby.yml index 83e35073d..1cb73abbc 100644 --- a/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-wallaby.yml +++ b/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-wallaby.yml @@ -160,6 +160,10 @@ repos: reponame: quickstart-centos-appstreams filename: quickstart-centos-appstreams.repo baseurl: ${NODEPOOL_CENTOS_MIRROR}/8-stream/AppStream/x86_64/os/ + # Note(chandankumar): Exclude container-selinux-2:2.189.0-1.module_el8.7.0* + # due to https://bugs.launchpad.net/tripleo/+bug/1990810 + exclude: + - container-selinux-2:2.189.0-1.module_el8.7.0+1217+ea57d1f1 - type: generic reponame: quickstart-centos-powertools @@ -202,6 +206,9 @@ repo_cmd_after: | sudo dnf module list; sudo dnf module disable container-tools:rhel8 -y; sudo dnf module enable container-tools:3.0 -y; + # Downgrade container-selinux due to + # https://bugs.launchpad.net/tripleo/+bug/1990810 + if [ -n "$(rpm -qa container-selinux)" ];then sudo dnf -y downgrade container-selinux-2.167.0-1.module_el8.6.0+1107+d59a301b.noarch; fi sudo dnf clean metadata {% if repo_setup_run_update|default(true)|bool %} sudo dnf update -y diff --git a/config/release/tripleo-ci/CentOS-8/wallaby.yml b/config/release/tripleo-ci/CentOS-8/wallaby.yml index b0c72beab..d84b23604 100644 --- a/config/release/tripleo-ci/CentOS-8/wallaby.yml +++ b/config/release/tripleo-ci/CentOS-8/wallaby.yml @@ -191,6 +191,10 @@ repos: reponame: quickstart-centos-appstreams filename: quickstart-centos-appstreams.repo baseurl: ${NODEPOOL_CENTOS_MIRROR}/8-stream/AppStream/x86_64/os/ + # Note(chandankumar): Exclude container-selinux-2:2.189.0-1.module_el8.7.0* + # due to https://bugs.launchpad.net/tripleo/+bug/1990810 + exclude: + - container-selinux-2:2.189.0-1.module_el8.7.0+1217+ea57d1f1 - type: generic reponame: quickstart-centos-powertools @@ -241,6 +245,9 @@ repo_cmd_after: | sudo dnf module list; sudo dnf module disable container-tools:rhel8 -y; sudo dnf module enable container-tools:3.0 -y; + # Downgrade container-selinux due to + # https://bugs.launchpad.net/tripleo/+bug/1990810 + if [ -n "$(rpm -qa container-selinux)" ];then sudo dnf -y downgrade container-selinux-2.167.0-1.module_el8.6.0+1107+d59a301b.noarch; fi sudo dnf clean metadata {% if repo_setup_run_update|default(true)|bool %} sudo dnf update -y