From 917a9c49e55ab107c1e5b1d035398344bcd33858 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 5 Apr 2021 13:49:18 -0500 Subject: [PATCH] qa/distros/podman: preserve registries.conf Otherwise we'll lose the mirror configuration. Signed-off-by: Sage Weil --- qa/distros/podman/centos_8.2_kubic_stable.yaml | 2 ++ qa/distros/podman/rhel_8.3_kubic_stable.yaml | 2 ++ qa/distros/podman/ubuntu_18.04_kubic_stable.yaml | 3 ++- qa/distros/podman/ubuntu_20.04_kubic_stable.yaml | 3 ++- qa/distros/podman/ubuntu_20.04_kubic_testing.yaml | 3 ++- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/qa/distros/podman/centos_8.2_kubic_stable.yaml b/qa/distros/podman/centos_8.2_kubic_stable.yaml index f3da1c7542d4e..22fbc1997a74b 100644 --- a/qa/distros/podman/centos_8.2_kubic_stable.yaml +++ b/qa/distros/podman/centos_8.2_kubic_stable.yaml @@ -8,9 +8,11 @@ overrides: tasks: - pexec: all: + - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - sudo dnf -y module disable container-tools - sudo dnf -y install 'dnf-command(copr)' - sudo dnf -y copr enable rhcontainerbot/container-selinux - sudo curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_8/devel:kubic:libcontainers:stable.repo - sudo dnf remove -y podman - sudo dnf -y install podman + - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/distros/podman/rhel_8.3_kubic_stable.yaml b/qa/distros/podman/rhel_8.3_kubic_stable.yaml index bf921d2b455da..4e50abc45c94f 100644 --- a/qa/distros/podman/rhel_8.3_kubic_stable.yaml +++ b/qa/distros/podman/rhel_8.3_kubic_stable.yaml @@ -8,9 +8,11 @@ overrides: tasks: - pexec: all: + - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - sudo dnf -y module disable container-tools - sudo dnf -y install 'dnf-command(copr)' - sudo dnf -y copr enable rhcontainerbot/container-selinux - sudo curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_8/devel:kubic:libcontainers:stable.repo - sudo dnf remove -y podman - sudo dnf -y install podman + - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/distros/podman/ubuntu_18.04_kubic_stable.yaml b/qa/distros/podman/ubuntu_18.04_kubic_stable.yaml index f7ee5e6fd7e92..1055bcc9e32fe 100644 --- a/qa/distros/podman/ubuntu_18.04_kubic_stable.yaml +++ b/qa/distros/podman/ubuntu_18.04_kubic_stable.yaml @@ -5,8 +5,9 @@ os_version: "18.04" tasks: - pexec: all: + - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/Release.key | sudo apt-key add - - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list - sudo apt update - sudo apt -y install podman - - echo -e "[[registry]]\nlocation = 'docker.io'\n\n[[registry.mirror]]\nlocation='docker-mirror.front.sepia.ceph.com:5000'\n" | sudo tee /etc/containers/registries.conf + - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/distros/podman/ubuntu_20.04_kubic_stable.yaml b/qa/distros/podman/ubuntu_20.04_kubic_stable.yaml index 2eae5e2a347d4..3a04f50a848e4 100644 --- a/qa/distros/podman/ubuntu_20.04_kubic_stable.yaml +++ b/qa/distros/podman/ubuntu_20.04_kubic_stable.yaml @@ -5,8 +5,9 @@ os_version: "20.04" tasks: - pexec: all: + - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/Release.key | sudo apt-key add - - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list - sudo apt update - sudo apt -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install podman containernetworking-plugins - - echo -e "[[registry]]\nlocation = 'docker.io'\n\n[[registry.mirror]]\nlocation='docker-mirror.front.sepia.ceph.com:5000'\n" | sudo tee /etc/containers/registries.conf + - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/distros/podman/ubuntu_20.04_kubic_testing.yaml b/qa/distros/podman/ubuntu_20.04_kubic_testing.yaml index 1844f4ebf814d..56b4d1e0f75d7 100644 --- a/qa/distros/podman/ubuntu_20.04_kubic_testing.yaml +++ b/qa/distros/podman/ubuntu_20.04_kubic_testing.yaml @@ -5,8 +5,9 @@ os_version: "20.04" tasks: - pexec: all: + - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/xUbuntu_20.04/Release.key | sudo apt-key add - - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/xUbuntu_20.04/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:testing.list - sudo apt update - sudo apt -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install podman containernetworking-plugins - - echo -e "[[registry]]\nlocation = 'docker.io'\n\n[[registry.mirror]]\nlocation='docker-mirror.front.sepia.ceph.com:5000'\n" | sudo tee /etc/containers/registries.conf + - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf -- 2.39.5