From 1e02dd4cb440fe58fd40b6f4aceef6f394b7bca2 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Fri, 3 Sep 2021 10:13:54 +0200 Subject: [PATCH] qa/distros: Remove stale kubic distros Cause they're broken Signed-off-by: Sebastian Wagner (cherry picked from commit 65e2cc084073ea7e05ecbc06f5773617676708ff) Conflicts: qa/distros/podman/rhel_8.3_kubic_stable.yaml qa/distros/podman/ubuntu_18.04_kubic_stable.yaml qa/distros/podman/ubuntu_20.04_kubic_stable.yaml qa/distros/podman/ubuntu_20.04_kubic_testing.yaml qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_stable.yaml qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_testing.yaml Fixes: https://tracker.ceph.com/issues/53106 --- qa/distros/podman/rhel_8.3_kubic_stable.yaml | 19 ------------------- .../podman/ubuntu_18.04_kubic_stable.yaml | 14 -------------- .../podman/ubuntu_20.04_kubic_stable.yaml | 14 -------------- .../podman/ubuntu_20.04_kubic_testing.yaml | 14 -------------- .../centos_8.2_container_tools_3.0.yaml | 1 + .../0-distro/ubuntu_20.04_kubic_stable.yaml | 1 - .../0-distro/ubuntu_20.04_kubic_testing.yaml | 1 - 7 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 qa/distros/podman/rhel_8.3_kubic_stable.yaml delete mode 100644 qa/distros/podman/ubuntu_18.04_kubic_stable.yaml delete mode 100644 qa/distros/podman/ubuntu_20.04_kubic_stable.yaml delete mode 100644 qa/distros/podman/ubuntu_20.04_kubic_testing.yaml create mode 120000 qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml delete mode 120000 qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_stable.yaml delete mode 120000 qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_testing.yaml diff --git a/qa/distros/podman/rhel_8.3_kubic_stable.yaml b/qa/distros/podman/rhel_8.3_kubic_stable.yaml deleted file mode 100644 index 541cf5180e357..0000000000000 --- a/qa/distros/podman/rhel_8.3_kubic_stable.yaml +++ /dev/null @@ -1,19 +0,0 @@ -os_type: rhel -os_version: "8.3" -overrides: - selinux: - whitelist: - - scontext=system_u:system_r:logrotate_t:s0 - -tasks: -- exec: - all: - - 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 /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 deleted file mode 100644 index 136d5c4f86513..0000000000000 --- a/qa/distros/podman/ubuntu_18.04_kubic_stable.yaml +++ /dev/null @@ -1,14 +0,0 @@ -os_type: ubuntu -os_version: "18.04" - -# feel free to remove this test, if Kubic project is no longer maintained. -tasks: -- exec: - all: - - 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 /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 - - 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 deleted file mode 100644 index 9c42eb2ffb8a5..0000000000000 --- a/qa/distros/podman/ubuntu_20.04_kubic_stable.yaml +++ /dev/null @@ -1,14 +0,0 @@ -os_type: ubuntu -os_version: "20.04" - -# feel free to remove this test, if Kubic project is no longer maintained. -tasks: -- exec: - all: - - 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 /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 - - 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 deleted file mode 100644 index 75e72d7397b6a..0000000000000 --- a/qa/distros/podman/ubuntu_20.04_kubic_testing.yaml +++ /dev/null @@ -1,14 +0,0 @@ -os_type: ubuntu -os_version: "20.04" - -# feel free to remove this test, if Kubic project is no longer maintained. -tasks: -- exec: - all: - - 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 /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 - - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml b/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml new file mode 120000 index 0000000000000..d1965f3d65957 --- /dev/null +++ b/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_8.2_container_tools_3.0.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_stable.yaml b/qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_stable.yaml deleted file mode 120000 index 065bb1ab20d83..0000000000000 --- a/qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/ubuntu_20.04_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_testing.yaml b/qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_testing.yaml deleted file mode 120000 index 36a5ad131fac3..0000000000000 --- a/qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_testing.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/ubuntu_20.04_kubic_testing.yaml \ No newline at end of file -- 2.39.5