From eb43f2be9c326a522946bb9ebafc9a016828a41b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 8 Nov 2021 11:01:45 -0600 Subject: [PATCH] qa/suites/orch/cephadm: add 8.stream + container_tools Signed-off-by: Sage Weil --- .../centos_8.stream_container_tools.yaml | 14 +++++++++++++ .../centos_8.3_container_tools_3.0.yaml | 1 - .../centos_8.stream_container_tools.yaml | 1 + .../0-centos_8.2_container_tools_3.0.yaml | 1 - .../0-centos_8.stream_container_tools.yaml | 1 + .../centos_8.stream_container_tools.yaml | 1 + ...tart-centos_8.stream_container-tools.yaml} | 21 ++++++++++--------- .../centos_8.stream_container_tools.yaml | 1 + 8 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 qa/distros/podman/centos_8.stream_container_tools.yaml delete mode 120000 qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.3_container_tools_3.0.yaml create mode 120000 qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml delete mode 120000 qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.2_container_tools_3.0.yaml create mode 120000 qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml create mode 120000 qa/suites/orch/cephadm/smoke/distro/centos_8.stream_container_tools.yaml rename qa/suites/orch/cephadm/upgrade/1-start-distro/{1-start-centos_8.3-octopus.yaml => 1-start-centos_8.stream_container-tools.yaml} (52%) create mode 120000 qa/suites/orch/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml diff --git a/qa/distros/podman/centos_8.stream_container_tools.yaml b/qa/distros/podman/centos_8.stream_container_tools.yaml new file mode 100644 index 00000000000..4a9578e60d4 --- /dev/null +++ b/qa/distros/podman/centos_8.stream_container_tools.yaml @@ -0,0 +1,14 @@ +os_type: centos +os_version: "8.stream" +overrides: + selinux: + whitelist: + - scontext=system_u:system_r:logrotate_t:s0 + +tasks: +- pexec: + all: + - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup + - sudo dnf -y module reset container-tools + - sudo dnf -y module install container-tools + - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.3_container_tools_3.0.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.3_container_tools_3.0.yaml deleted file mode 120000 index 479a5c26e45..00000000000 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.3_container_tools_3.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.3_container_tools_3.0.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml new file mode 120000 index 00000000000..7a86f967f02 --- /dev/null +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_8.stream_container_tools.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.2_container_tools_3.0.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.2_container_tools_3.0.yaml deleted file mode 120000 index d1965f3d659..00000000000 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.2_container_tools_3.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_container_tools_3.0.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml new file mode 120000 index 00000000000..7a86f967f02 --- /dev/null +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_8.stream_container_tools.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/smoke/distro/centos_8.stream_container_tools.yaml new file mode 120000 index 00000000000..7a86f967f02 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke/distro/centos_8.stream_container_tools.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_8.stream_container_tools.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.3-octopus.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml similarity index 52% rename from qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.3-octopus.yaml rename to qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml index 2e551dd4391..a1a9cb5effc 100644 --- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.3-octopus.yaml +++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml @@ -1,14 +1,16 @@ os_type: centos -os_version: "8.3" -overrides: - selinux: - whitelist: - - scontext=system_u:system_r:logrotate_t:s0 +os_version: "8.stream" tasks: +- pexec: + all: + - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup + - sudo dnf -y module reset container-tools + - sudo dnf -y module install container-tools + - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf - cephadm: - image: quay.ceph.io/ceph-ci/ceph:octopus - cephadm_branch: octopus + image: docker.io/ceph/ceph:v15.2.0 + cephadm_branch: v15.2.0 cephadm_git_url: https://github.com/ceph/ceph # avoid --cap-add=PTRACE + --privileged for older cephadm versions allow_ptrace: false @@ -16,7 +18,6 @@ tasks: add_mons_via_daemon_add: true avoid_pacific_features: true - roles: - - mon.a - mon.c @@ -26,7 +27,7 @@ roles: - osd.2 - osd.3 - client.0 -# - ceph.rgw.realm.zone.a # CLI change in v16 pacific +# - ceph.rgw.realm.zone.a # Disabled, needs 15.2.4 as an upgrade start - node-exporter.a - alertmanager.a - - mon.b @@ -39,4 +40,4 @@ roles: - prometheus.a - grafana.a - node-exporter.b - - ceph.iscsi.iscsi.a +# - ceph.iscsi.iscsi.a # needs later start point diff --git a/qa/suites/orch/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml new file mode 120000 index 00000000000..7a86f967f02 --- /dev/null +++ b/qa/suites/orch/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_8.stream_container_tools.yaml \ No newline at end of file -- 2.39.5