srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2025-02-12 18:44:31 +00:00
Code Issues Releases Activity

Rename support_server stub to nfs_server, add SUPPORT_SERVER var

Browse Source 
The stub of support_server is mostly just an NFS server, so
let's call it that now for more consistency. We also add a var
that all the mini-support-servers share, and use that for a few
things we intend to do differently on support server-y tests.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-11-18 16:03:28 -08:00
parent 79518c5d33
commit f65b81d796
5 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/utils.pm
View File

@ -433,11 +433,11 @@ sub setup_workaround_repo {
my $version = shift || get_var("VERSION");
cleanup_workaround_repo;
script_run "dnf -y install bodhi-client createrepo", 300;
# write a repo config file, unless this is the support_server test
# write a repo config file, unless this is a support server test
# and it is running on a different release than the update is for
# (in this case we need the repo to exist but do not want to use
# it on the actual support_server system)
unless (get_var("TEST") eq "support_server" && $version ne get_var("CURRREL")) {
# it on the actual support server system)
unless (get_var("SUPPORT_SERVER") && $version ne get_var("CURRREL")) {
assert_script_run 'printf "[workarounds]\nname=Workarounds repo\nbaseurl=file:///opt/workarounds_repo\nenabled=1\nmetadata_expire=1\ngpgcheck=0" > /etc/yum.repos.d/workarounds.repo';
}
assert_script_run "mkdir -p /opt/workarounds_repo";
@ -576,11 +576,11 @@ sub _repo_setup_updates {
# create the repo metadata
assert_script_run "createrepo .";
# write a repo config file, unless this is the support_server test
# write a repo config file, unless this is a support server test
# and it is running on a different release than the update is for
# (in this case we need the repo to exist but do not want to use
# it on the actual support_server system)
unless (get_var("TEST") eq "support_server" && $version ne get_var("CURRREL")) {
# it on the actual support server system)
unless (get_var("SUPPORT_SERVER") && $version ne get_var("CURRREL")) {
assert_script_run 'printf "[advisory]\nname=Advisory repo\nbaseurl=file:///opt/update_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0" > /etc/yum.repos.d/advisory.repo';
# run an update now (except for upgrade tests)
script_run "dnf -y update", 900 unless (get_var("UPGRADE"));

2
main.pm
View File

@ -337,7 +337,7 @@ sub load_postinstall_tests() {
# don't do this for support server unless the update is for the same
# release as the support server disk image, as we don't install the
# updates on support server when they differ
unless (get_var("TEST") eq "support_server" && get_var("VERSION") ne get_var("CURRREL")) {
unless (get_var("SUPPORT_SERVER") && get_var("VERSION") ne get_var("CURRREL")) {
autotest::loadtest "tests/_advisory_post.pm";
}
}

6
templates-updates.fif.json
View File

@ -256,11 +256,11 @@
"+START_AFTER_TEST": "installer_build@%ARCH_BASE_MACHINE%",
"ADD_REPOSITORY_VARIATION": "nfs://172.16.2.110:/opt/update_repo",
"INSTALL": "1",
"INSTALL_UNLOCK": "support_ready",
"INSTALL_UNLOCK": "nfs_server_ready",
"ISO": "%ADVISORY_OR_TASK%-netinst-%ARCH%.iso",
"NICTYPE": "tap",
"PACKAGE_SET": "default",
"PARALLEL_WITH": "support_server@%ARCH_BASE_MACHINE%",
"PARALLEL_WITH": "nfs_server@%ARCH_BASE_MACHINE%",
"WORKER_CLASS": "tap"
}
},
@ -386,7 +386,7 @@
"fedora-updates-server-x86_64-*-64bit": 40
}
},
"support_server": {
"nfs_server": {
"profiles": {
"fedora-updates-everything-boot-iso-x86_64-*-64bit": 40
}

27
templates.fif.json
View File

@ -1150,10 +1150,10 @@
},
"settings": {
"GRUB": "inst.ks=nfs:172.16.2.110:/export/root-user-crypted-net.ks",
"INSTALL_UNLOCK": "support_ready",
"INSTALL_UNLOCK": "nfs_server_ready",
"KICKSTART": "1",
"NICTYPE": "tap",
"PARALLEL_WITH": "support_server",
"PARALLEL_WITH": "nfs_server",
"ROOT_PASSWORD": "111111",
"USER_LOGIN": "false",
"WORKER_CLASS": "tap"
@ -1326,9 +1326,9 @@
"fedora-Server-dvd-iso-x86_64-*-64bit": 30
},
"settings": {
"INSTALL_UNLOCK": "support_ready",
"INSTALL_UNLOCK": "nfs_server_ready",
"NICTYPE": "tap",
"PARALLEL_WITH": "support_server",
"PARALLEL_WITH": "nfs_server",
"REPOSITORY_GRAPHICAL": "nfs:nfsvers=4:172.16.2.110:/repo",
"WORKER_CLASS": "tap"
}
@ -1340,9 +1340,9 @@
"fedora-Server-dvd-iso-x86_64-*-64bit": 30
},
"settings": {
"INSTALL_UNLOCK": "support_ready",
"INSTALL_UNLOCK": "nfs_server_ready",
"NICTYPE": "tap",
"PARALLEL_WITH": "support_server",
"PARALLEL_WITH": "nfs_server",
"REPOSITORY_VARIATION": "nfs:nfsvers=4:172.16.2.110:/repo",
"WORKER_CLASS": "tap"
}
@ -1354,9 +1354,9 @@
"fedora-Server-dvd-iso-x86_64-*-64bit": 30
},
"settings": {
"INSTALL_UNLOCK": "support_ready",
"INSTALL_UNLOCK": "nfs_server_ready",
"NICTYPE": "tap",
"PARALLEL_WITH": "support_server",
"PARALLEL_WITH": "nfs_server",
"REPOSITORY_VARIATION": "nfs:nfsvers=4:172.16.2.110:/iso/image.iso",
"WORKER_CLASS": "tap"
}
@ -1494,9 +1494,9 @@
},
"settings": {
"GRUB": "inst.stage2=nfs:nfsvers=4:172.16.2.110:/repo",
"INSTALL_UNLOCK": "support_ready",
"INSTALL_UNLOCK": "nfs_server_ready",
"NICTYPE": "tap",
"PARALLEL_WITH": "support_server",
"PARALLEL_WITH": "nfs_server",
"QEMURAM": "3072",
"TEST_UPDATES": "1",
"WORKER_CLASS": "tap"
@ -1683,6 +1683,7 @@
"POSTINSTALL": "_iscsi_server",
"POST_STATIC": "172.16.2.120 iscsi.domain.local",
"ROOT_PASSWORD": "weakpassword",
"SUPPORT_SERVER": "1",
"TEST_TARGET": "NONE",
"USER_LOGIN": "false",
"WORKER_CLASS": "tap"
@ -1796,6 +1797,7 @@
"POSTINSTALL": "_pxe_server",
"POST_STATIC": "172.16.2.121 pxe.domain.local",
"ROOT_PASSWORD": "weakpassword",
"SUPPORT_SERVER": "1",
"TEST_TARGET": "NONE",
"USER_LOGIN": "false",
"WORKER_CLASS": "tap"
@ -2114,7 +2116,7 @@
"WORKER_CLASS": "tap"
}
},
"support_server": {
"nfs_server": {
"profiles": {
"fedora-Server-dvd-iso-aarch64-*-aarch64": 10,
"fedora-Server-dvd-iso-ppc64le-*-ppc64le": 10,
@ -2126,9 +2128,10 @@
"NICTYPE": "tap",
"NUMDISKS": "2",
"PARALLEL_CANCEL_WHOLE_CLUSTER": "0",
"POSTINSTALL": "_support_server",
"POSTINSTALL": "_nfs_server",
"POST_STATIC": "172.16.2.110 support.domain.local",
"ROOT_PASSWORD": "weakpassword",
"SUPPORT_SERVER": "1",
"TEST_TARGET": "NONE",
"USER_LOGIN": "false",
"WORKER_CLASS": "tap"

2
tests/_support_server.pm → tests/_nfs_server.pm
View File

@ -64,7 +64,7 @@ sub run {
assert_script_run "systemctl is-active nfs-server.service";
# report ready, wait for children
mutex_create('support_ready');
mutex_create('nfs_server_ready');
wait_for_children;
# upload logs in case of child failures
$self->post_fail_hook();