srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-12-03 18:43:08 +00:00
Code Issues Releases Activity

Split iscsi server out from support_server

Browse Source 
Combining the old universal tests into server-dvd-iso gives us
a big cluster (9 jobs), which isn't ideal for smaller pet
deployments. Let's split it up. This splits out the iSCSI server
job into a separate test, to start with.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-11-09 16:10:17 -08:00
parent 0039535a77
commit 950bbfbd95
4 changed files with 51 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
templates.fif.json
View File

@ -1090,9 +1090,9 @@
}, },
"settings": { "settings": {
"ANACONDA_STATIC": "172.16.2.111", "ANACONDA_STATIC": "172.16.2.111",
"INSTALL_UNLOCK": "support_ready", "INSTALL_UNLOCK": "iscsi_server_ready",
"NICTYPE": "tap", "NICTYPE": "tap",
"PARALLEL_WITH": "support_server", "PARALLEL_WITH": "iscsi_server",
"PARTITIONING": "custom_iscsi", "PARTITIONING": "custom_iscsi",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"WORKER_CLASS": "tap" "WORKER_CLASS": "tap"
@ -1668,7 +1668,26 @@
"WORKER_CLASS": "tap" "WORKER_CLASS": "tap"
} }
}, },
"iscsi_server": {
"profiles": {
"fedora-Server-dvd-iso-aarch64-*-aarch64": 10,
"fedora-Server-dvd-iso-ppc64le-*-ppc64le": 10,
"fedora-Server-dvd-iso-x86_64-*-64bit": 10
},
"settings": {
"BOOTFROM": "c",
"HDD_1": "disk_f%CURRREL%_support_5_%ARCH%.img",
"NICTYPE": "tap",
"NUMDISKS": "2",
"PARALLEL_CANCEL_WHOLE_CLUSTER": "0",
"POSTINSTALL": "_iscsi_server",
"POST_STATIC": "172.16.2.120 iscsi.domain.local",
"ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "NONE",
"USER_LOGIN": "false",
"WORKER_CLASS": "tap"
}
},
"mediakit_fileconflicts": { "mediakit_fileconflicts": {
"profiles": { "profiles": {
"fedora-Server-dvd-iso-aarch64-*-aarch64": 10, "fedora-Server-dvd-iso-aarch64-*-aarch64": 10,

28
tests/_iscsi_server.pm Normal file
View File

@ -0,0 +1,28 @@
use base "installedtest";
use strict;
use testapi;
use lockapi;
use mmapi;
sub run {
my $self = shift;
# start up iscsi target
assert_script_run "printf '<target iqn.2016-06.local.domain:support.target1>\n backing-store /dev/vdb\n incominguser test weakpassword\n</target>' > /etc/tgt/conf.d/openqa.conf";
# open firewall port
assert_script_run "firewall-cmd --add-service=iscsi-target";
assert_script_run "systemctl restart tgtd.service";
assert_script_run "systemctl is-active tgtd.service";
# report ready, wait for children
mutex_create('iscsi_server_ready');
wait_for_children;
# upload logs in case of child failures
$self->post_fail_hook();
}
sub test_flags {
return { fatal => 1 };
}
1;
# vim: set sw=4 et:

8
tests/_support_server.pm
View File

@ -113,14 +113,6 @@ sub run {
assert_script_run "systemctl restart dnsmasq.service"; assert_script_run "systemctl restart dnsmasq.service";
assert_script_run "systemctl is-active dnsmasq.service"; assert_script_run "systemctl is-active dnsmasq.service";
## ISCSI
# start up iscsi target
assert_script_run "printf '<target iqn.2016-06.local.domain:support.target1>\n backing-store /dev/vdb\n incominguser test weakpassword\n</target>' > /etc/tgt/conf.d/openqa.conf";
# open firewall port
assert_script_run "firewall-cmd --add-service=iscsi-target";
assert_script_run "systemctl restart tgtd.service";
assert_script_run "systemctl is-active tgtd.service";
## NFS ## NFS

2
tests/disk_custom_iscsi.pm
View File

@ -7,7 +7,7 @@ sub run {
my $self = shift; my $self = shift;
# iscsi config hash # iscsi config hash
my %iscsi; my %iscsi;
$iscsi{'iqn.2016-06.local.domain:support.target1'} = ['172.16.2.110', 'test', 'weakpassword']; $iscsi{'iqn.2016-06.local.domain:support.target1'} = ['172.16.2.120', 'test', 'weakpassword'];
# Anaconda hub # Anaconda hub
# Go to INSTALLATION DESTINATION and ensure one regular disk # Go to INSTALLATION DESTINATION and ensure one regular disk
# and the iscsi target are selected. # and the iscsi target are selected.