Merge "Revert "Exclude latest gnupg2 & Pin to last good version""

This commit is contained in:
Zuul 2023-04-17 18:59:55 +00:00 committed by Gerrit Code Review
commit c852726ae8
6 changed files with 0 additions and 30 deletions

View File

@ -166,8 +166,6 @@ repos:
reponame: quickstart-centos-base
filename: quickstart-centos-base.repo
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/BaseOS/x86_64/os
exclude:
- gnupg2-2.3.3-3.el9.x86_64 # TODO(marios) https://bugs.launchpad.net/tripleo/+bug/2015309
- type: generic
reponame: quickstart-centos-appstreams
@ -224,9 +222,6 @@ repo_cmd_after: |
sudo curl -s -o /etc/yum.repos.d/COMPOSE_ID ${NODEPOOL_CENTOS_MIRROR}/9-stream/COMPOSE_ID
sudo dnf repolist;
sudo dnf module list;
# Note(Marios): Downgrade gnupg2 version
# due to https://bugs.launchpad.net/tripleo/+bug/2015309
if [ -n "$(rpm -qa gnupg2)" ];then sudo dnf -y downgrade gnupg2.x86_64 2.3.3-2.el9; fi
sudo dnf clean metadata
{% if repo_setup_run_update|default(true)|bool %}
# FIXME(chandan): Exclude kernel updates due to

View File

@ -136,8 +136,6 @@ repos:
reponame: quickstart-centos-base
filename: quickstart-centos-base.repo
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/BaseOS/x86_64/os/
exclude:
- gnupg2-2.3.3-3.el9.x86_64 # TODO(marios) https://bugs.launchpad.net/tripleo/+bug/2015309
- type: generic
reponame: quickstart-centos-appstreams
@ -185,9 +183,6 @@ repo_cmd_after: |
sudo curl -s -o /etc/yum.repos.d/COMPOSE_ID ${NODEPOOL_CENTOS_MIRROR}/9-stream/COMPOSE_ID
sudo dnf repolist;
sudo dnf module list;
# Note(Marios): Downgrade gnupg2 version
# due to https://bugs.launchpad.net/tripleo/+bug/2015309
if [ -n "$(rpm -qa gnupg2)" ];then sudo dnf -y downgrade gnupg2.x86_64 2.3.3-2.el9; fi
sudo dnf clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo dnf update -y

View File

@ -136,8 +136,6 @@ repos:
reponame: quickstart-centos-base
filename: quickstart-centos-base.repo
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/BaseOS/x86_64/os/
exclude:
- gnupg2-2.3.3-3.el9.x86_64 # TODO(marios) https://bugs.launchpad.net/tripleo/+bug/2015309
- type: generic
reponame: quickstart-centos-appstreams
@ -178,9 +176,6 @@ repo_cmd_after: |
sudo curl -s -o /etc/yum.repos.d/COMPOSE_ID ${NODEPOOL_CENTOS_MIRROR}/9-stream/COMPOSE_ID
sudo dnf repolist;
sudo dnf module list;
# Note(Marios): Downgrade gnupg2 version
# due to https://bugs.launchpad.net/tripleo/+bug/2015309
if [ -n "$(rpm -qa gnupg2)" ];then sudo dnf -y downgrade gnupg2.x86_64 2.3.3-2.el9; fi
sudo dnf clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo dnf update -y

View File

@ -135,8 +135,6 @@ repos:
reponame: quickstart-centos-base
filename: quickstart-centos-base.repo
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/BaseOS/x86_64/os/
exclude:
- gnupg2-2.3.3-3.el9.x86_64 # TODO(marios) https://bugs.launchpad.net/tripleo/+bug/2015309
- type: generic
reponame: quickstart-centos-appstreams
@ -184,9 +182,6 @@ repo_cmd_after: |
sudo curl -s -o /etc/yum.repos.d/COMPOSE_ID ${NODEPOOL_CENTOS_MIRROR}/9-stream/COMPOSE_ID
sudo dnf repolist;
sudo dnf module list;
# Note(Marios): Downgrade gnupg2 version
# due to https://bugs.launchpad.net/tripleo/+bug/2015309
if [ -n "$(rpm -qa gnupg2)" ];then sudo dnf -y downgrade gnupg2.x86_64 2.3.3-2.el9; fi
sudo dnf clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo dnf update -y

View File

@ -199,8 +199,6 @@ repos:
reponame: quickstart-centos-base
filename: quickstart-centos-base.repo
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/BaseOS/x86_64/os
exclude:
- gnupg2-2.3.3-3.el9.x86_64 # TODO(marios) https://bugs.launchpad.net/tripleo/+bug/2015309
- type: generic
reponame: quickstart-centos-appstreams
@ -250,9 +248,6 @@ repo_cmd_after: |
sudo curl -s -o /etc/yum.repos.d/COMPOSE_ID ${NODEPOOL_CENTOS_MIRROR}/9-stream/COMPOSE_ID
sudo dnf repolist;
sudo dnf module list;
# Note(Marios): Downgrade gnupg2 version
# due to https://bugs.launchpad.net/tripleo/+bug/2015309
if [ -n "$(rpm -qa gnupg2)" ];then sudo dnf -y downgrade gnupg2.x86_64 2.3.3-2.el9; fi
sudo dnf clean metadata
{% if repo_setup_run_update|default(true)|bool %}
# FIXME(chandan): Exclude kernel updates due to

View File

@ -165,8 +165,6 @@ repos:
reponame: quickstart-centos-base
filename: quickstart-centos-base.repo
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/BaseOS/x86_64/os
exclude:
- gnupg2-2.3.3-3.el9.x86_64 # TODO(marios) https://bugs.launchpad.net/tripleo/+bug/2015309
- type: generic
reponame: quickstart-centos-appstreams
@ -217,9 +215,6 @@ repo_cmd_after: |
sudo curl -s -o /etc/yum.repos.d/COMPOSE_ID ${NODEPOOL_CENTOS_MIRROR}/9-stream/COMPOSE_ID
sudo dnf repolist;
sudo dnf module list;
# Note(Marios): Downgrade gnupg2 version
# due to https://bugs.launchpad.net/tripleo/+bug/2015309
if [ -n "$(rpm -qa gnupg2)" ];then sudo dnf -y downgrade gnupg2.x86_64 2.3.3-2.el9; fi
sudo dnf clean metadata
{% if repo_setup_run_update|default(true)|bool %}
# FIXME(chandan): Exclude kernel updates due to