diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2025-10-01 02:25:23 -0400 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2025-10-02 14:24:31 +0200 |
| commit | 806602e488240deb87bdf1c8ce00973ca8ec914d (patch) | |
| tree | 6b3c54c39d2689d194cf5cca38e39c6b9fdfbcc4 /tests | |
| parent | 17727e148120c43a5c7056b33e4277592376ccca (diff) | |
| download | kolla-806602e488240deb87bdf1c8ce00973ca8ec914d.tar.gz kolla-806602e488240deb87bdf1c8ce00973ca8ec914d.zip | |
Add support for rpm to repos.yaml
Add the ability to configure repositories in the same
way as we do Debuntu ones - via repos.yaml.
Removes .repo files from base - since these are not
needed there anymore.
gpgcheck = 1 is default in docker/base/dnf.conf
Change-Id: I7df7d452c45c57c434d5b4ad15a87963e4d6d0d4
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/templates/template_overrides.j2 | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 003e8005b..d9d89b3e0 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -65,18 +65,7 @@ RUN if [ -f /usr/etc/npmrc ]; then \ fi \ && rm -f /etc/npmrc -{% if base_distro in ['centos', 'rocky'] %} -{# NOTE(hrw): Some images have two footer blocks. - For example neutron-infobox-ipam-agent being - child of neutron-server. -#} -RUN if [ -d /etc/yum.repos.d/not-for-ci/ ]; then \ - cd /etc/yum.repos.d/ && \ - rm ci-{{ base_distro }}.repo && \ - mv not-for-ci/*.repo . && \ - rm -rf not-for-ci; \ - fi; -{% elif base_distro == "debian" %} +{% if 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|" \ /etc/apt/sources.list |