From c200c11f982cb1cbc20dae542e148e2bbf830004 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Apr 14 2024 14:11:50 +0000 Subject: Merge branch 'crameleon/ca-cert' into 'production' Update CA certificates package name See merge request infra/salt!1700 --- diff --git a/pillar/common/init.sls b/pillar/common/init.sls index 068cede..16e5d40 100644 --- a/pillar/common/init.sls +++ b/pillar/common/init.sls @@ -206,7 +206,7 @@ zypper: download.use_deltarpm: 'false' solver.onlyRequires: 'true' packages: - ca-certificates-freeipa-opensuse: {} + ca-certificates-opensuse: {} kanidm: {} {%- if osfullname == 'openSUSE Leap Micro' %} toolmux: {} diff --git a/t/lib/Dockerfile.systemd b/t/lib/Dockerfile.systemd index 0559669..37bbf5d 100644 --- a/t/lib/Dockerfile.systemd +++ b/t/lib/Dockerfile.systemd @@ -10,7 +10,7 @@ RUN test ! -f /var/log/zypper.log || mv /var/log/zypper.log /var/log/zypper.log. # these are needed to run test RUN zypper ar https://download.opensuse.org/repositories/openSUSE:/infrastructure/\$releasever/ infra && \ zypper --gpg-auto-import-keys ref -RUN ( zypper -vvvn ref || zypper -vvvn ref || zypper -vvvn ref ) && zypper -vvvn install systemd salt-minion curl sudo iputils ca-certificates-suse ca-certificates-freeipa-opensuse zypper-formula +RUN ( zypper -vvvn ref || zypper -vvvn ref || zypper -vvvn ref ) && zypper -vvvn install systemd salt-minion curl sudo iputils ca-certificates-suse ca-certificates-opensuse zypper-formula ##DUMMY