diff --git a/Dockerfile.fcos b/Dockerfile.fcos index 76a121bed..dd953a6e7 100644 --- a/Dockerfile.fcos +++ b/Dockerfile.fcos @@ -15,9 +15,9 @@ COPY ${PKGS_LIST} ${EXTRA_PKGS_LIST:-$PKGS_LIST} /tmp/ COPY prepare-image.sh prepare-ipxe.sh /bin/ # Configure OpenStack repos -RUN sed -E -i 's/( =.*| >=.*)//g' /tmp/main-packages-list.ocp && \ - dnf install --setopt=install_weak_deps=False --setopt=tsflags=nodocs -y python3 python3-requests && \ - curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo +RUN sed -E -i 's/( =.*| >=.*)//g' /tmp/${PKGS_LIST} && \ + curl -o /etc/yum.repos.d/delorean.repo https://trunk.rdoproject.org/centos9-master/puppet-passed-ci/delorean.repo && \ + curl -o /etc/yum.repos.d/delorean-deps.repo https://trunk.rdoproject.org/centos9-master/delorean-deps.repo RUN prepare-image.sh && \ rm -f /bin/prepare-image.sh && \ diff --git a/Dockerfile.scos b/Dockerfile.scos index bec8dda22..f81868a65 100644 --- a/Dockerfile.scos +++ b/Dockerfile.scos @@ -15,9 +15,9 @@ COPY ${PKGS_LIST} ${EXTRA_PKGS_LIST:-$PKGS_LIST} /tmp/ COPY prepare-image.sh prepare-ipxe.sh /bin/ # Configure OpenStack repos -RUN sed -E -i 's/( =.*| >=.*)//g' /tmp/main-packages-list.ocp && \ - dnf install --setopt=install_weak_deps=False --setopt=tsflags=nodocs -y python3 python3-requests && \ - curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo +RUN sed -E -i 's/( =.*| >=.*)//g' /tmp/${PKGS_LIST} && \ + curl -o /etc/yum.repos.d/delorean.repo https://trunk.rdoproject.org/centos9-master/puppet-passed-ci/delorean.repo && \ + curl -o /etc/yum.repos.d/delorean-deps.repo https://trunk.rdoproject.org/centos9-master/delorean-deps.repo RUN prepare-image.sh && \ rm -f /bin/prepare-image.sh && \ diff --git a/main-packages-list.ocp b/main-packages-list.ocp index 1ed589d39..3a2c500c9 100644 --- a/main-packages-list.ocp +++ b/main-packages-list.ocp @@ -21,9 +21,7 @@ python3-debtcollector >= 2.5.0-0.20221128140303.a6b46c5.el9 python3-dracclient >= 8.0.0-0.20221128135758.9c7499c.el python3-eventlet >= 0.33.1-5.el9 python3-flask >= 2:2.0.1-4.el9.2 -python3-gunicorn >= 20.0.4-2.el9 python3-ironic-lib >= 5.4.1-0.20230410165532.b393f4c.el9 -python3-ironic-prometheus-exporter >= 3.1.1-0.20221128155706.eb27243.el9 python3-ironicclient >= 4.9.0-0.20211209154934.6f1be06.el9 python3-jinja2 >= 2-3.0.1-2.el9.1 python3-keystoneauth1 >= 5.0.0-0.20221128144522.2445a5d.el9