fix test to use beakerlib role
1. standard-test-roles dropped support to rhts role, so we need to replace with beakerlib role that now support beakerlib-libraries 2. httpd requires services and this does not work on container, so it got removed from tests.yml
This commit is contained in:
parent
df56b6f20c
commit
0c0d4558f1
@ -29,7 +29,7 @@ export TESTVERSION=1.0
|
||||
|
||||
BUILT_FILES=
|
||||
|
||||
FILES=$(METADATA) runtest.sh Makefile PURPOSE mysql.php php_mysql_test.sql php_mysql_test.conf
|
||||
FILES=$(METADATA) runtest.sh Makefile PURPOSE new_mysql.php old_mysql.php php_mysql_test.sql php_mysql_test.conf
|
||||
|
||||
.PHONY: all install download clean
|
||||
|
||||
|
@ -57,7 +57,7 @@ rlJournalStart
|
||||
rlRun "rm -rvf $httpROOTDIR/php_mysql_test"
|
||||
rlRun "mkdir -v $httpROOTDIR/php_mysql_test"
|
||||
rlRun "cp -v php_mysql_test.conf $httpCONFDIR/conf.d/"
|
||||
rlRun "php_version=`rlCheckRpm php`"
|
||||
php_version=`rlCheckRpm php`
|
||||
if [[ $php_version =~ php-7* ]] || [[ $php_version =~ php-5.[5-6]* ]]; then
|
||||
rlRun "cp -v new_mysql.php $httpROOTDIR/php_mysql_test/mysql.php"
|
||||
else
|
||||
|
@ -1,13 +1,10 @@
|
||||
---
|
||||
# Tests that run in all contexts
|
||||
- hosts: localhost
|
||||
vars:
|
||||
use_beakerlib_libraries: true
|
||||
roles:
|
||||
- role: standard-test-rhts
|
||||
- role: standard-test-beakerlib
|
||||
tags:
|
||||
- classic
|
||||
- container
|
||||
tests:
|
||||
- httpd-php-mysql-sanity-test
|
||||
required_packages:
|
||||
|
Loading…
Reference in New Issue
Block a user