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
2023-03-14 16:30:42 +01:00 · 2023-03-14 16:30:42 +01:00 · 745df87ac5
parent 3ea6e712d2
commit 745df87ac5
7 changed files with 0 additions and 34 deletions
--- 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
--- 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;
--- 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;
--- 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;
--- 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
--- 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
--- 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