Skip to content

Commit

Permalink
Merge PR ceph#43934 into master
Browse files Browse the repository at this point in the history
* refs/pull/43934/head:
	qa/suites/rados/dashboard: use single-container-host.yaml
	qa/distros: add single-container-host.yaml
	qa/suites: use distros/container-hosts/
	qa/distros/container-hosts: add 8.stream + crun
	qa/distros/container-hosts: add collection of container targets

Reviewed-by: Sebastian Wagner <[email protected]>
  • Loading branch information
liewegas committed Nov 17, 2021
2 parents 8cc3f60 + 411b2d3 commit 9115724
Show file tree
Hide file tree
Showing 34 changed files with 100 additions and 19 deletions.
1 change: 1 addition & 0 deletions qa/distros/.qa
File renamed without changes.
14 changes: 14 additions & 0 deletions qa/distros/container-hosts/centos_8.2_container_tools_3.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
os_type: centos
os_version: "8.2"
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:3.0
- sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf
14 changes: 14 additions & 0 deletions qa/distros/container-hosts/centos_8.3_container_tools_3.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
os_type: centos
os_version: "8.3"
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:3.0
- sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf
14 changes: 14 additions & 0 deletions qa/distros/container-hosts/centos_8.stream_container_tools.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
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
- sudo sed -i 's/runtime = "runc"/#runtime = "runc"/g' /usr/share/containers/containers.conf
- sudo sed -i 's/#runtime = "crun"/runtime = "crun"/g' /usr/share/containers/containers.conf
13 changes: 13 additions & 0 deletions qa/distros/container-hosts/rhel_8.4_container_tools_3.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
os_type: rhel
os_version: "8.4"
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:3.0
- sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf
13 changes: 13 additions & 0 deletions qa/distros/container-hosts/rhel_8.4_container_tools_rhel8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
os_type: rhel
os_version: "8.4"
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:rhel8
- sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf
2 changes: 2 additions & 0 deletions qa/distros/container-hosts/ubuntu_20.04.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
os_type: ubuntu
os_version: "20.04"
1 change: 1 addition & 0 deletions qa/distros/single-container-host.yaml
2 changes: 1 addition & 1 deletion qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$
2 changes: 1 addition & 1 deletion qa/suites/orch/cephadm/osds/0-distro
2 changes: 1 addition & 1 deletion qa/suites/orch/cephadm/smoke-roleless/0-distro
File renamed without changes.
1 change: 0 additions & 1 deletion qa/suites/orch/cephadm/smoke-singlehost/0-distro$

This file was deleted.

1 change: 1 addition & 0 deletions qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$
1 change: 1 addition & 0 deletions qa/suites/orch/cephadm/smoke/0-distro

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion qa/suites/orch/cephadm/smoke/distro/ubuntu_20.04.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion qa/suites/orch/cephadm/thrash/0-distro
2 changes: 1 addition & 1 deletion qa/suites/orch/cephadm/with-work/0-distro

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions qa/suites/rados/dashboard/0-single-container-host.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion qa/suites/upgrade/octopus-x/parallel/0-distro
2 changes: 1 addition & 1 deletion qa/suites/upgrade/octopus-x/stress-split/0-distro
1 change: 0 additions & 1 deletion qa/suites/upgrade/pacific-x/parallel/0-distro$

This file was deleted.

1 change: 1 addition & 0 deletions qa/suites/upgrade/pacific-x/parallel/0-random-distro$
2 changes: 1 addition & 1 deletion qa/suites/upgrade/pacific-x/stress-split/0-distro

0 comments on commit 9115724

Please sign in to comment.