Skip to content

Synchronise 2025.1 with upstream #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2025
Merged

Synchronise 2025.1 with upstream #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions docker/base/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
{% set base_centos_yum_repo_packages = [
'centos-release-ceph-reef',
'centos-release-nfv-openvswitch',
'centos-release-openstack-epoxy',
'centos-release-opstools',
'epel-release',
] %}
Expand All @@ -149,24 +150,12 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
'centos-ceph-reef',
'centos-nfv-openvswitch',
'centos-opstools',
'centos9-nfv-ovs',
'centos9-opstools',
'centos9-rabbitmq',
'centos9-storage',
'epel',
'influxdb',
'opensearch-2.x',
'opensearch-dashboards-2.x',
] %}

{% if base_arch == 'aarch64' %}

{# NOTE(hrw): delorean-deps.repo may force x86-64 repos #}

RUN sed -i -e "s/x86_64/aarch64/g" /etc/yum.repos.d/delorean-deps.repo

{% endif %}

RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}

{%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %} && dnf config-manager --enable {{ repo }} {% endfor -%}
Expand Down
8 changes: 8 additions & 0 deletions docker/base/ci-centos.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV
module_hotfixes=1

[centos-openstack-epoxy]
name=(OpenDev mirror) CentOS-$releasever - OpenStack Epoxy
baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-epoxy/
gpgcheck=1
enabled=1
gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Cloud
module_hotfixes=1

[centos-opstools]
name=(OpenDev mirror) CentOS Stream $releasever - OpsTools - collectd
baseurl=http://MIRROR/centos-stream/SIGs/$stream/opstools/$basearch/collectd-5/
Expand Down
8 changes: 8 additions & 0 deletions docker/base/ci-rocky.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV
module_hotfixes=1

[centos-openstack-epoxy]
name=(OpenDev mirror) CentOS-$releasever - OpenStack Epoxy
baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-epoxy/
gpgcheck=1
enabled=1
gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Cloud
module_hotfixes=1

[centos-opstools]
name=(OpenDev mirror) CentOS Stream $releasever - OpsTools - collectd
baseurl=http://MIRROR/centos-stream/SIGs/$stream/opstools/$basearch/collectd-5/
Expand Down
6 changes: 1 addition & 5 deletions kolla/common/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@
}
OPENSTACK_RELEASE = '2025.1'

# This is noarch repository so we will use it on all architectures
DELOREAN_DEPS = "https://trunk.rdoproject.org/centos9-epoxy/" \
"delorean-deps.repo"

# TODO(mandre) check for file integrity instead of downloading from an HTTPS
# source
TARBALLS_BASE = "https://tarballs.opendev.org"
Expand Down Expand Up @@ -283,7 +279,7 @@
help=('Set the package type of the distro. If not set then '
'the packaging type is set to "rpm" if a RHEL based '
'distro and "deb" if a Debian based distro.')),
cfg.ListOpt('rpm_setup_config', default=[DELOREAN_DEPS],
cfg.ListOpt('rpm_setup_config', default=[],
help=('Comma separated list of .rpm or .repo file(s) '
'or URL(s) to install before building containers')),
cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')),
Expand Down
9 changes: 1 addition & 8 deletions tests/templates/template_overrides.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ RUN cd /etc/yum.repos.d/ && mkdir not-for-ci/ \
{% block base_centos_repo_overrides_post_rpm %}
{% endraw %}

RUN sed -i \
-e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \
/etc/yum.repos.d/delorean*.repo

{% raw %}
{% endblock %}

Expand Down Expand Up @@ -113,10 +109,7 @@ RUN if [ -d /etc/yum.repos.d/not-for-ci/ ]; then \
rm ci-{{ base_distro }}.repo && \
mv not-for-ci/*.repo . && \
rm -rf not-for-ci; \
fi; \
sed -i \
-e "s|{{ nodepool_rdo_proxy }}|https://trunk.rdoproject.org|g" \
/etc/yum.repos.d/delorean*.repo
fi;
{% elif base_distro == "debian" %}
RUN sed -i -e "s|\[trusted=yes\] http://{{ nodepool_mirror_host }}|http://deb.debian.org|" \
-e "s|\[trusted=yes\] http://{{ nodepool_mirror_host }}|http://security.debian.org|" \
Expand Down