Merge "Revert "Install tomcat-9.0.62-16.el9 norach rpms""

This commit is contained in:
Zuul 2023-09-05 17:37:36 +00:00 committed by Gerrit Code Review
commit ea45bd20d8
2 changed files with 0 additions and 4 deletions

View File

@ -182,8 +182,6 @@ repo_cmd_after: |
{% if repo_setup_run_update|default(true)|bool %}
sudo dnf update -y
{% endif %}
# TODO(bshewale): Remove the below line once we have build updated. Bug: #2033357
sudo dnf -y install https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-admin-webapps-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-docs-webapp-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-el-3.0-api-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-java-jdk11-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-java-jdk17-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-java-jdk8-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-lib-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-servlet-4.0-api-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-webapps-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-jsp-2.3-api-9.0.62-16.el9.noarch.rpm
undercloud_rpm_dependencies: >-
python3-tripleoclient
tripleo-operator-ansible

View File

@ -258,8 +258,6 @@ repo_cmd_after: |
# https://bugs.launchpad.net/tripleo/+bug/1987632
sudo dnf update --exclude=kernel* -y
{% endif %}
# TODO(bshewale): Remove the below line once we have build updated. Bug: #2033357
sudo dnf -y install https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-admin-webapps-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-docs-webapp-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-el-3.0-api-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-java-jdk11-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-java-jdk17-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-java-jdk8-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-lib-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-servlet-4.0-api-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-webapps-9.0.62-16.el9.noarch.rpm https://kojihub.stream.centos.org/kojifiles/packages/tomcat/9.0.62/16.el9/noarch/tomcat-jsp-2.3-api-9.0.62-16.el9.noarch.rpm
undercloud_rpm_dependencies: >-
python3-tripleoclient
tripleo-operator-ansible