From a7513bc0b970d8317f8b598a967c7c61c4ed1b6e Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Thu, 12 Aug 2021 13:53:28 +0300 Subject: [PATCH] Remove redhat-release package from UBI8 image Also install centos*release package when tcib_distro is centos. *release packages are protected by dnf, so used rpm commands to remove. Disable upgrades pipeline to get this fix in. (cherry picked from commit 963c55bd4423e47eb243fdd746ff484dc3a4d6f2) (cherry picked from commit 906265c433003886d87ac29d9daf68eccb69a40c) Closes-Bug: #1939674 Change-Id: I5467a5faa36aa1359ff9b8135a512566dff12a79 --- container-images/tcib/base/base.yaml | 5 +++++ zuul.d/layout.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/container-images/tcib/base/base.yaml b/container-images/tcib/base/base.yaml index 84278a1e5..55b55c5b9 100644 --- a/container-images/tcib/base/base.yaml +++ b/container-images/tcib/base/base.yaml @@ -31,6 +31,11 @@ tcib_actions: - run: sed -ri '/^(passwd:|group:)/ s/systemd//g' /etc/nsswitch.conf - run: dnf install -y {{ tcib_packages['common'] | join(' ') }} - run: mkdir -p /openstack +- run: >- + if [ '{{ tcib_distro }}' == 'centos' ];then dnf download centos*release && + rpm -ivh --nodeps --replacefiles *.rpm && + rm -rf *.rpm && + rpm -e --nodeps redhat-release; fi - run: dnf update --excludepkgs redhat-release -y && dnf clean all && rm -rf /var/cache/dnf tcib_cmd: kolla_start tcib_entrypoint: dumb-init --single-child -- diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 37fe440d9..8519b7275 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -10,7 +10,7 @@ - tripleo-build-containers-jobs - tripleo-buildimage-jobs - tripleo-standalone-scenarios-pipeline - - tripleo-upgrades-victoria-pipeline + #- tripleo-upgrades-victoria-pipeline vars: ensure_global_symlinks: true check: