From 0096ff368952cfea6ef0f0cf098fba98fcffeac2 Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Wed, 1 Mar 2023 15:32:00 +0100 Subject: [PATCH] Revert "Packer: workaround missing authselect-compat-1.2.5-2.el9_1 in RHUI repos" This reverts commit 0a4a75e19e93666c817d88371b5e5ef4ec690074. --- .../packer/ansible/roles/common/tasks/packages.yml | 12 ------------ tools/appsre-build-worker-packer.sh | 3 --- 2 files changed, 15 deletions(-) diff --git a/templates/packer/ansible/roles/common/tasks/packages.yml b/templates/packer/ansible/roles/common/tasks/packages.yml index 5a8f58f45..1be704d1c 100644 --- a/templates/packer/ansible/roles/common/tasks/packages.yml +++ b/templates/packer/ansible/roles/common/tasks/packages.yml @@ -24,18 +24,6 @@ # if osbuild_commit is not defined, osbuild from distribution repositories is installed when: osbuild_commit is defined -# Upgrading authselect without --allowerasing currently fails on RHEL 9.1 with RHUI repos -# https://issues.redhat.com/browse/RHUIOPS-84 -# TODO: remove this once the issue is fixed -- name: Upgrade authselect package - dnf: - name: authselect - state: latest - allowerasing: yes - register: result - retries: 5 - until: result is success - - name: Upgrade all packages package: name: "*" diff --git a/tools/appsre-build-worker-packer.sh b/tools/appsre-build-worker-packer.sh index e6946b48c..ec4367bfb 100755 --- a/tools/appsre-build-worker-packer.sh +++ b/tools/appsre-build-worker-packer.sh @@ -26,9 +26,6 @@ if [ "$ON_JENKINS" = false ]; then # see https://bugzilla.redhat.com/show_bug.cgi?id=2143282 # TODO: Remove me when the bug is fixed or we switch to 9.1 sudo dnf remove -y python-unversioned-command - # TODO: Remove once authselect-compat-1.2.5-2.el9_1.x86_64 is in el9 RHUI repos - # https://issues.redhat.com/browse/RHUIOPS-84 - sudo dnf upgrade -y --allowerasing authselect sudo dnf upgrade -y sudo dnf install -y podman jq