Move the test into a role

So that it can be called from the container-tools module without
duplication. For technical reasons this requires calling the test entry
script from a different directory, so parameterize it.

Rename the test from "browser" to "cockpit-podman" so that it is
more descriptive within a module test.

Drop the TEST_OS hack, tests of current version recognizes RHEL 8.3 just
fine (and in fact depends on it).

Related: rhbz#1821193
This commit is contained in:
Martin Pitt 2020-05-19 08:57:54 +02:00
parent 0d5eac1292
commit 2f8be1898a
3 changed files with 23 additions and 25 deletions

View File

@ -0,0 +1,20 @@
---
- include_role:
name: standard-test-source
- include_role:
name: standard-test-basic
vars:
required_packages:
- cockpit-podman
- cockpit-ws
- git
- libvirt-python3
- make
- npm
- python3
tests:
- cockpit-podman:
dir: .
run: "{{ test_script_dir | default('.') }}/browser.sh"
save-files: ["logs/*"]

View File

@ -11,11 +11,6 @@ npm install chrome-remote-interface sizzle
. /etc/os-release
export TEST_OS="${ID}-${VERSION_ID/./-}"
# HACK: upstream tests don't recognize rhel-8-3 yet
if [ "$TEST_OS" = "rhel-8-3" ]; then
export TEST_OS=rhel-8-2
fi
export TEST_AUDIT_NO_SELINUX=1
RC=0

View File

@ -1,23 +1,6 @@
---
- hosts: localhost
roles:
- role: standard-test-source
tags:
tags:
- always
- role: standard-test-basic
tags:
- classic
required_packages:
- cockpit-podman
- cockpit-ws
- git
- libvirt-python3
- make
- npm
- python3
tests:
- browser:
dir: .
run: ./browser.sh
save-files: ["logs/*"]
roles:
- test