From 745df87ac51562ef65c7022c121ed1363b6535a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= <cjeanner@redhat.com>
Date: Tue, 14 Mar 2023 16:30:42 +0100
Subject: [PATCH] Remove downgrade/exclude of containers-common-1.44.*

This was due to a delay in repo sync, according to the associated LP

Change-Id: Iaeaf29e73c1ec0648423350edd1ee3a3a538b408
Closes-Bug: #2011598
Related-Bug: #1988500
---
 config/release/tripleo-ci/CentOS-9/master.yml                | 5 -----
 .../tripleo-ci/CentOS-9/promotion-testing-hash-master.yml    | 5 -----
 .../tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml   | 5 -----
 .../tripleo-ci/CentOS-9/promotion-testing-hash-zed.yml       | 5 -----
 config/release/tripleo-ci/CentOS-9/wallaby.yml               | 5 -----
 config/release/tripleo-ci/CentOS-9/zed.yml                   | 5 -----
 config/release/trunk/master.yml                              | 4 ----
 7 files changed, 34 deletions(-)

diff --git a/config/release/tripleo-ci/CentOS-9/master.yml b/config/release/tripleo-ci/CentOS-9/master.yml
index d09718a9f..79bec33ab 100644
--- a/config/release/tripleo-ci/CentOS-9/master.yml
+++ b/config/release/tripleo-ci/CentOS-9/master.yml
@@ -171,10 +171,7 @@ repos:
     reponame: quickstart-centos-appstreams
     filename: quickstart-centos-appstreams.repo
     baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/AppStream/x86_64/os/
-    # Note(chandankumar): Exclude containers-common-1-44.* due to
-    # https://bugs.launchpad.net/tripleo/+bug/1988500
     exclude:
-      - containers-common-1-44.*
       - ansible-core-2.14.2-4* # TODO(marios) https://bugs.launchpad.net/tripleo/+bug/2007659
 
   # centos9 the equivalent to powertools is CRB
@@ -222,8 +219,6 @@ repo_cmd_after: |
       dnf config-manager --disable delorean-component-{{ job.component }};
   fi
   {% endif %}
-  # Downgrade containers-common due to https://bugs.launchpad.net/tripleo/+bug/1988500
-  if [ -n "$(rpm -qa containers-common)" ];then sudo dnf -y downgrade containers-common-1-40.el9; fi
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   # Save Compose-ID info
   sudo curl -s -o /etc/yum.repos.d/COMPOSE_ID ${NODEPOOL_CENTOS_MIRROR}/9-stream/COMPOSE_ID
diff --git a/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-master.yml b/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-master.yml
index a4661780a..ec402e137 100644
--- a/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-master.yml
+++ b/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-master.yml
@@ -141,10 +141,7 @@ repos:
     reponame: quickstart-centos-appstreams
     filename: quickstart-centos-appstreams.repo
     baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/AppStream/x86_64/os/
-    # Note(chandankumar): Exclude containers-common-1-44.* due to
-    # https://bugs.launchpad.net/tripleo/+bug/1988500
     exclude:
-      - containers-common-1-44.*
       - ansible-core-2.14.2-4* # TODO(marios) https://bugs.launchpad.net/tripleo/+bug/2007659
 
   # centos9 the equivalent to powertools is CRB
@@ -184,8 +181,6 @@ repo_cmd_after: |
   sudo dnf remove -y rdo-release centos-release-ceph-* centos-release-openstack-* || true;
   sudo rm -rf /etc/yum.repos.d/CentOS-OpenStack-*.repo /etc/yum.repos.d/CentOS-Ceph-*.repo;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
-  # Downgrade containers-common due to https://bugs.launchpad.net/tripleo/+bug/1988500
-  if [ -n "$(rpm -qa containers-common)" ];then sudo dnf -y downgrade containers-common-1-40.el9; fi
   # Save Compose-ID info
   sudo curl -s -o /etc/yum.repos.d/COMPOSE_ID ${NODEPOOL_CENTOS_MIRROR}/9-stream/COMPOSE_ID
   sudo dnf repolist;
diff --git a/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml b/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml
index bdd944b4a..32114b7bd 100644
--- a/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml
+++ b/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml
@@ -141,11 +141,8 @@ repos:
     reponame: quickstart-centos-appstreams
     filename: quickstart-centos-appstreams.repo
     baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/AppStream/x86_64/os/
-    # Note(chandankumar): Exclude containers-common-1-44.* due to
-    # https://bugs.launchpad.net/tripleo/+bug/1988500
     exclude:
       - python3-sqlalchemy-1.4.37-3.el9.x86_64
-      - containers-common-1-44.*
       - ansible-core-2.14.*  # TODO(marios) unpin https://bugs.launchpad.net/tripleo    /+bug/1996482
 
   # centos9 the equivalent to powertools is CRB
@@ -178,8 +175,6 @@ repo_cmd_after: |
   sudo dnf remove -y rdo-release centos-release-ceph-* centos-release-openstack-* || true;
   sudo rm -rf /etc/yum.repos.d/CentOS-OpenStack-*.repo /etc/yum.repos.d/CentOS-Ceph-*.repo;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
-  # Downgrade containers-common due to https://bugs.launchpad.net/tripleo/+bug/1988500
-  if [ -n "$(rpm -qa containers-common)" ];then sudo dnf -y downgrade containers-common-1-40.el9; fi
   # Save Compose-ID info
   sudo curl -s -o /etc/yum.repos.d/COMPOSE_ID ${NODEPOOL_CENTOS_MIRROR}/9-stream/COMPOSE_ID
   sudo dnf repolist;
diff --git a/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-zed.yml b/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-zed.yml
index c0b2c60ef..e7150e64f 100644
--- a/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-zed.yml
+++ b/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-zed.yml
@@ -140,10 +140,7 @@ repos:
     reponame: quickstart-centos-appstreams
     filename: quickstart-centos-appstreams.repo
     baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/AppStream/x86_64/os/
-    # Note(chandankumar): Exclude containers-common-1-44.* due to
-    # https://bugs.launchpad.net/tripleo/+bug/1988500
     exclude:
-      - containers-common-1-44.*
       - ansible-core-2.14.2-4* # TODO(marios) https://bugs.launchpad.net/tripleo/+bug/2007659
 
   # centos9 the equivalent to powertools is CRB
@@ -183,8 +180,6 @@ repo_cmd_after: |
   sudo dnf remove -y rdo-release centos-release-ceph-* centos-release-openstack-* || true;
   sudo rm -rf /etc/yum.repos.d/CentOS-OpenStack-*.repo /etc/yum.repos.d/CentOS-Ceph-*.repo;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
-  # Downgrade containers-common due to https://bugs.launchpad.net/tripleo/+bug/1988500
-  if [ -n "$(rpm -qa containers-common)" ];then sudo dnf -y downgrade containers-common-1-40.el9; fi
   # Save Compose-ID info
   sudo curl -s -o /etc/yum.repos.d/COMPOSE_ID ${NODEPOOL_CENTOS_MIRROR}/9-stream/COMPOSE_ID
   sudo dnf repolist;
diff --git a/config/release/tripleo-ci/CentOS-9/wallaby.yml b/config/release/tripleo-ci/CentOS-9/wallaby.yml
index 9166c16a9..d12c49029 100644
--- a/config/release/tripleo-ci/CentOS-9/wallaby.yml
+++ b/config/release/tripleo-ci/CentOS-9/wallaby.yml
@@ -204,11 +204,8 @@ repos:
     reponame: quickstart-centos-appstreams
     filename: quickstart-centos-appstreams.repo
     baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/AppStream/x86_64/os/
-    # Note(chandankumar): Exclude containers-common-1-44.* due to
-    # https://bugs.launchpad.net/tripleo/+bug/1988500
     exclude:
       - python3-sqlalchemy-1.4.37-3.el9.x86_64
-      - containers-common-1-44.*
       - ansible-core-2.14.*  # TODO(marios) unpin https://bugs.launchpad.net/tripleo    /+bug/1996482
 
   # centos9 the equivalent to powertools is CRB
@@ -249,8 +246,6 @@ repo_cmd_after: |
       dnf config-manager --disable delorean-component-{{ job.component }};
   fi
   {% endif %}
-  # Downgrade containers-common due to https://bugs.launchpad.net/tripleo/+bug/1988500
-  if [ -n "$(rpm -qa containers-common)" ];then sudo dnf -y downgrade containers-common-1-40.el9; fi
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   # Save Compose-ID info
   sudo curl -s -o /etc/yum.repos.d/COMPOSE_ID ${NODEPOOL_CENTOS_MIRROR}/9-stream/COMPOSE_ID
diff --git a/config/release/tripleo-ci/CentOS-9/zed.yml b/config/release/tripleo-ci/CentOS-9/zed.yml
index 5554d0c09..c9e1e7b3c 100644
--- a/config/release/tripleo-ci/CentOS-9/zed.yml
+++ b/config/release/tripleo-ci/CentOS-9/zed.yml
@@ -170,10 +170,7 @@ repos:
     reponame: quickstart-centos-appstreams
     filename: quickstart-centos-appstreams.repo
     baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/AppStream/x86_64/os/
-    # Note(chandankumar): Exclude containers-common-1-44.* due to
-    # https://bugs.launchpad.net/tripleo/+bug/1988500
     exclude:
-      - containers-common-1-44.*
       - ansible-core-2.14.2-4* # TODO(marios) https://bugs.launchpad.net/tripleo/+bug/2007659
 
   # centos9 the equivalent to powertools is CRB
@@ -215,8 +212,6 @@ repo_cmd_after: |
       dnf config-manager --disable delorean-component-{{ job.component }};
   fi
   {% endif %}
-  # Downgrade containers-common due to https://bugs.launchpad.net/tripleo/+bug/1988500
-  if [ -n "$(rpm -qa containers-common)" ];then sudo dnf -y downgrade containers-common-1-40.el9; fi
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   # Save Compose-ID info
   sudo curl -s -o /etc/yum.repos.d/COMPOSE_ID ${NODEPOOL_CENTOS_MIRROR}/9-stream/COMPOSE_ID
diff --git a/config/release/trunk/master.yml b/config/release/trunk/master.yml
index a3cb17ab6..15a619e67 100644
--- a/config/release/trunk/master.yml
+++ b/config/release/trunk/master.yml
@@ -56,10 +56,6 @@ repos:
     reponame: quickstart-centos-appstreams
     filename: quickstart-centos-appstreams.repo
     baseurl: http://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/
-    # Note(chandankumar): Exclude containers-common-1-44.* due to
-    # https://bugs.launchpad.net/tripleo/+bug/1988500
-    exclude:
-      - containers-common-1-44.*
 
   # centos9 the equivalent to powertools is CRB
   - type: generic