From dc26b849018e3d5f2ecfe625fca7264877fe75ae Mon Sep 17 00:00:00 2001 From: PranaliD Date: Wed, 28 Sep 2022 11:20:43 +0530 Subject: [PATCH] [CS8][Train] Exclude container-selinux-2:2.189.0 Similar to wallaby[1], latest container-selinux-2:2.189.0 needs to be excluded for train as well. Related-Bug: #1990810 [1]: https://review.opendev.org/c/openstack/tripleo-quickstart/+/859213 Change-Id: I56d3c199b89997238c50638c9813900a26a3dadb --- .../tripleo-ci/CentOS-8/promotion-testing-hash-train.yml | 7 +++++++ config/release/tripleo-ci/CentOS-8/train.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-train.yml b/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-train.yml index ea55187aa..0c1eba914 100644 --- a/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-train.yml +++ b/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-train.yml @@ -135,6 +135,10 @@ repos: reponame: quickstart-centos-appstreams filename: quickstart-centos-appstreams.repo baseurl: ${NODEPOOL_CENTOS_MIRROR}/8-stream/AppStream/x86_64/os/ + # Note(pdeore): 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 @@ -184,6 +188,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/train.yml b/config/release/tripleo-ci/CentOS-8/train.yml index 44d0d14f0..d3d36bc1f 100644 --- a/config/release/tripleo-ci/CentOS-8/train.yml +++ b/config/release/tripleo-ci/CentOS-8/train.yml @@ -144,6 +144,10 @@ repos: reponame: quickstart-centos-appstreams filename: quickstart-centos-appstreams.repo baseurl: ${NODEPOOL_CENTOS_MIRROR}/8-stream/AppStream/x86_64/os/ + # Note(pdeore): 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 @@ -200,6 +204,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