From 152b347f755148f4aa0004dd45c7131a8e4f329f Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Fri, 17 Mar 2023 10:04:54 -0700 Subject: [PATCH] replace fedoraproject.org with rockylinux.org - refs in templates.fif.json and code changed (typically hostnames in multi-worker tests) - refs in documentation left for historical / context purposes --- lib/freeipa.pm | 2 +- templates.fif.json | 24 ++++++++++++------------ tests/_iot_zezere_server.pm | 2 +- tests/_vnc_client_connect_pre.pm | 2 +- tests/_vncconnect_client_setup_pre.pm | 2 +- tests/desktop_browser.pm | 4 ++-- tests/freeipa_client.pm | 12 ++++++------ tests/freeipa_password_change.pm | 2 +- tests/freeipa_webui.pm | 8 ++++---- tests/realmd_join_cockpit.pm | 4 ++-- tests/realmd_join_sssd.pm | 6 +++--- tests/role_deploy_domain_controller.pm | 10 +++++----- 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lib/freeipa.pm b/lib/freeipa.pm index ed64b032..4a3f6d39 100644 --- a/lib/freeipa.pm +++ b/lib/freeipa.pm @@ -42,7 +42,7 @@ sub start_webui { # https://bugzilla.redhat.com/show_bug.cgi?id=1439429 assert_script_run "sed -i -e 's,enable_xauth=1,enable_xauth=0,g' /usr/bin/startx"; disable_firefox_studies; - type_string "startx /usr/bin/firefox -width 1024 -height 768 https://ipa001.test.openqa.fedoraproject.org\n"; + type_string "startx /usr/bin/firefox -width 1024 -height 768 https://ipa001.test.openqa.rockylinux.org\n"; assert_screen ["freeipa_webui_login", $user_screen], 60; wait_still_screen(stilltime => 5, similarity_level => 45); # softfail on kerberos ticket bugs meaning we get auto-logged in diff --git a/templates.fif.json b/templates.fif.json index 0b0e6726..eb916ba9 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -1057,7 +1057,7 @@ "rocky-dvd-iso-x86_64-*-64bit": 40 }, "settings": { - "GRUB": "inst.vnc net.ifnames=0 biosdevname=0 ip=172.16.2.114::172.16.2.2:255.255.255.0:vnc001.test.openqa.fedoraproject.org:eth0:off", + "GRUB": "inst.vnc net.ifnames=0 biosdevname=0 ip=172.16.2.114::172.16.2.2:255.255.255.0:vnc001.test.openqa.rockylinux.org:eth0:off", "NICTYPE": "tap", "VNC_SERVER": "1", "WORKER_CLASS": "tap" @@ -1085,7 +1085,7 @@ "rocky-dvd-iso-x86_64-*-64bit": 40 }, "settings": { - "GRUB": "inst.vnc inst.vncconnect=172.16.2.117:5500 net.ifnames=0 biosdevname=0 ip=172.16.2.116::172.16.2.2:255.255.255.0:vnc003.test.openqa.fedoraproject.org:eth0:off", + "GRUB": "inst.vnc inst.vncconnect=172.16.2.117:5500 net.ifnames=0 biosdevname=0 ip=172.16.2.116::172.16.2.2:255.255.255.0:vnc003.test.openqa.rockylinux.org:eth0:off", "INSTALL_UNLOCK": "vncconnect_client_ready", "NICTYPE": "tap", "PARALLEL_WITH": "install_vncconnect_client", @@ -1142,7 +1142,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "server_role_deploy_domain_controller", "POSTINSTALL": "realmd_join_cockpit freeipa_webui freeipa_password_change freeipa_client", - "POST_STATIC": "172.16.2.102 client002.test.openqa.fedoraproject.org", + "POST_STATIC": "172.16.2.102 client002.test.openqa.rockylinux.org", "ROOT_PASSWORD": "weakpassword", "USER_LOGIN": "false", "WORKER_CLASS": "tap" @@ -1159,7 +1159,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "server_role_deploy_domain_controller", "POSTINSTALL": "realmd_join_sssd freeipa_client", - "POST_STATIC": "172.16.2.103 client003.test.openqa.fedoraproject.org", + "POST_STATIC": "172.16.2.103 client003.test.openqa.rockylinux.org", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "USER_LOGIN": "false", @@ -1234,7 +1234,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "server_role_deploy_database_server", "POSTINSTALL": "database_client", - "POST_STATIC": "172.16.2.105 dbclient.test.openqa.fedoraproject.org", + "POST_STATIC": "172.16.2.105 dbclient.test.openqa.rockylinux.org", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "USER_LOGIN": "false", @@ -1281,7 +1281,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "server_freeipa_replication_replica", "POSTINSTALL": "realmd_join_sssd freeipa_client", - "POST_STATIC": "172.16.2.108 client005.test.openqa.fedoraproject.org", + "POST_STATIC": "172.16.2.108 client005.test.openqa.rockylinux.org", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "USER_LOGIN": "false", @@ -1300,7 +1300,7 @@ "NICTYPE": "tap", "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "POSTINSTALL": "role_deploy_domain_controller role_deploy_domain_controller_check", - "POST_STATIC": "172.16.2.106 ipa002.test.openqa.fedoraproject.org", + "POST_STATIC": "172.16.2.106 ipa002.test.openqa.rockylinux.org", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "USER_LOGIN": "false", @@ -1320,7 +1320,7 @@ "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "PARALLEL_WITH": "server_freeipa_replication_master", "POSTINSTALL": "realmd_join_sssd", - "POST_STATIC": "172.16.2.107 ipa003.test.openqa.fedoraproject.org", + "POST_STATIC": "172.16.2.107 ipa003.test.openqa.rockylinux.org", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "USER_LOGIN": "false", @@ -1357,7 +1357,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "server_remote_logging_server", "POSTINSTALL": "server_remote_logging_client", - "POST_STATIC": "172.16.2.113 rsyslogclient.test.openqa.fedoraproject.org", + "POST_STATIC": "172.16.2.113 rsyslogclient.test.openqa.rockylinux.org", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "USER_LOGIN": "false", @@ -1375,7 +1375,7 @@ "NICTYPE": "tap", "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "POSTINSTALL": "server_remote_logging_server", - "POST_STATIC": "172.16.2.112 rsyslogserver.test.openqa.fedoraproject.org", + "POST_STATIC": "172.16.2.112 rsyslogserver.test.openqa.rockylinux.org", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "USER_LOGIN": "false", @@ -1393,7 +1393,7 @@ "NICTYPE": "tap", "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "POSTINSTALL": "role_deploy_database_server", - "POST_STATIC": "172.16.2.104 db.test.openqa.fedoraproject.org", + "POST_STATIC": "172.16.2.104 db.test.openqa.rockylinux.org", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "USER_LOGIN": "false", @@ -1411,7 +1411,7 @@ "NICTYPE": "tap", "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "POSTINSTALL": "role_deploy_domain_controller role_deploy_domain_controller_check", - "POST_STATIC": "172.16.2.100 ipa001.test.openqa.fedoraproject.org", + "POST_STATIC": "172.16.2.100 ipa001.test.openqa.rockylinux.org", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "USER_LOGIN": "false", diff --git a/tests/_iot_zezere_server.pm b/tests/_iot_zezere_server.pm index 76df9f45..0138f4f6 100644 --- a/tests/_iot_zezere_server.pm +++ b/tests/_iot_zezere_server.pm @@ -21,7 +21,7 @@ sub run { assert_script_run "zezere-manage loaddata fedora_iot_runreqs"; assert_script_run "zezere-manage loaddata fedora_installed"; # create admin user - assert_script_run 'zezere-manage createsuperuser --username admin --email zezere@test.openqa.fedoraproject.org --no-input'; + assert_script_run 'zezere-manage createsuperuser --username admin --email zezere@test.openqa.rockylinux.org --no-input'; # set admin password (can't find a non-interactive way sadly) type_string "zezere-manage changepassword admin\n"; sleep 2; diff --git a/tests/_vnc_client_connect_pre.pm b/tests/_vnc_client_connect_pre.pm index 9dd7a1c0..2ee10c7d 100644 --- a/tests/_vnc_client_connect_pre.pm +++ b/tests/_vnc_client_connect_pre.pm @@ -8,7 +8,7 @@ sub run { my $self = shift; boot_to_login_screen(timeout => 300); $self->root_console(tty => 3); - setup_tap_static('172.16.2.115', 'vnc002.test.openqa.fedoraproject.org'); + setup_tap_static('172.16.2.115', 'vnc002.test.openqa.rockylinux.org'); # test test: check if we can see the server assert_script_run "ping -c 2 172.16.2.114"; # FIXME https://pagure.io/fedora-workstation/issue/231 - Boxes diff --git a/tests/_vncconnect_client_setup_pre.pm b/tests/_vncconnect_client_setup_pre.pm index cc64a4e6..213ae902 100644 --- a/tests/_vncconnect_client_setup_pre.pm +++ b/tests/_vncconnect_client_setup_pre.pm @@ -8,7 +8,7 @@ sub run { my $self = shift; boot_to_login_screen(timeout => 300); $self->root_console(tty => 3); - setup_tap_static('172.16.2.117', 'vnc004.test.openqa.fedoraproject.org'); + setup_tap_static('172.16.2.117', 'vnc004.test.openqa.rockylinux.org'); # install tigervnc (Boxes doesn't do reverse VNC) assert_script_run "dnf -y install tigervnc", 180; # take down the firewall diff --git a/tests/desktop_browser.pm b/tests/desktop_browser.pm index fb6c2fcc..4462eacc 100644 --- a/tests/desktop_browser.pm +++ b/tests/desktop_browser.pm @@ -40,8 +40,8 @@ sub run { _open_new_tab; wait_still_screen(stilltime => 5, similarity_level => 45); sleep 3; - # check FAS, typing slowly to avoid errors - type_very_safely "https://admin.fedoraproject.org/accounts/\n"; + # check Rocky Linux Account Service, typing slowly to avoid errors + type_very_safely "https://accounts.rockylinux.org/\n"; assert_screen "browser_fas_home"; _open_new_tab; wait_still_screen(stilltime => 2, similarity_level => 45); diff --git a/tests/freeipa_client.pm b/tests/freeipa_client.pm index 3273b529..b0a92b30 100644 --- a/tests/freeipa_client.pm +++ b/tests/freeipa_client.pm @@ -11,28 +11,28 @@ sub run { send_key "ctrl-alt-f1"; wait_still_screen 1; # check domain is listed in 'realm list' - validate_script_output 'realm list', sub { $_ =~ m/domain-name: test\.openqa\.fedoraproject\.org.*configured: kerberos-member/s }; + validate_script_output 'realm list', sub { $_ =~ m/domain-name: test\.openqa\.rockylinux\.org.*configured: kerberos-member/s }; # check we can see the admin user in getent - assert_script_run 'getent passwd admin@TEST.OPENQA.FEDORAPROJECT.ORG'; + assert_script_run 'getent passwd admin@TEST.OPENQA.ROCKYLINUX.ORG'; # check keytab entries my $hostname = script_output 'hostname'; my $qhost = quotemeta($hostname); - validate_script_output 'klist -k', sub { $_ =~ m/$qhost\@TEST\.OPENQA\.FEDORAPROJECT\.ORG/ }; + validate_script_output 'klist -k', sub { $_ =~ m/$qhost\@TEST\.OPENQA\.ROCKYLINUX\.ORG/ }; # check we can kinit with the host principal - assert_script_run "kinit -k host/$hostname\@TEST.OPENQA.FEDORAPROJECT.ORG"; + assert_script_run "kinit -k host/$hostname\@TEST.OPENQA.ROCKYLINUX.ORG"; # Set a longer timeout for login(1) to workaround RHBZ #1661273 assert_script_run 'echo "LOGIN_TIMEOUT 180" >> /etc/login.defs'; # switch to tty2 for login tests send_key "ctrl-alt-f2"; # try and login as test1, should work - console_login(user => 'test1@TEST.OPENQA.FEDORAPROJECT.ORG', password => 'batterystaple'); + console_login(user => 'test1@TEST.OPENQA.ROCKYLINUX.ORG', password => 'batterystaple'); type_string "exit\n"; # try and login as test2, should fail. we cannot use console_login # as it takes 10 seconds to complete when login fails, and # "permission denied" message doesn't last that long sleep 2; assert_screen "text_console_login"; - type_string "test2\@TEST.OPENQA.FEDORAPROJECT.ORG\n"; + type_string "test2\@TEST.OPENQA.ROCKYLINUX.ORG\n"; assert_screen "console_password_required"; type_string "batterystaple\n"; assert_screen "login_permission_denied"; diff --git a/tests/freeipa_password_change.pm b/tests/freeipa_password_change.pm index b99de837..77ee6840 100644 --- a/tests/freeipa_password_change.pm +++ b/tests/freeipa_password_change.pm @@ -10,7 +10,7 @@ sub run { # check whether test3 exists, i.e. whether freeipa_webui at # least managed to create it. if not, we may as well just # die now, this test cannot work. - assert_script_run 'getent passwd test3@TEST.OPENQA.FEDORAPROJECT.ORG'; + assert_script_run 'getent passwd test3@TEST.OPENQA.ROCKYLINUX.ORG'; # clear browser data so we don't go back to the 'admin' login assert_script_run 'rm -rf /root/.mozilla'; # clear kerberos ticket so we don't auto-auth as 'test4' diff --git a/tests/freeipa_webui.pm b/tests/freeipa_webui.pm index e97fdb56..71318d95 100644 --- a/tests/freeipa_webui.pm +++ b/tests/freeipa_webui.pm @@ -48,19 +48,19 @@ sub run { assert_screen "root_console"; wait_still_screen 5; # set permanent passwords for both accounts - assert_script_run 'printf "correcthorse\nbatterystaple\nbatterystaple" | kinit test3@TEST.OPENQA.FEDORAPROJECT.ORG'; - assert_script_run 'printf "correcthorse\nbatterystaple\nbatterystaple" | kinit test4@TEST.OPENQA.FEDORAPROJECT.ORG'; + assert_script_run 'printf "correcthorse\nbatterystaple\nbatterystaple" | kinit test3@TEST.OPENQA.ROCKYLINUX.ORG'; + assert_script_run 'printf "correcthorse\nbatterystaple\nbatterystaple" | kinit test4@TEST.OPENQA.ROCKYLINUX.ORG'; # switch to tty4 (boy, the tty jugglin') send_key "ctrl-alt-f4"; # try and login as test3, should work - console_login(user => 'test3@TEST.OPENQA.FEDORAPROJECT.ORG', password => 'batterystaple'); + console_login(user => 'test3@TEST.OPENQA.ROCKYLINUX.ORG', password => 'batterystaple'); type_string "exit\n"; # try and login as test4, should fail. we cannot use console_login # as it takes 10 seconds to complete when login fails, and # "permission denied" message doesn't last that long sleep 2; assert_screen "text_console_login"; - type_string "test4\@TEST.OPENQA.FEDORAPROJECT.ORG\n"; + type_string "test4\@TEST.OPENQA.ROCKYLINUX.ORG\n"; assert_screen "console_password_required"; type_string "batterystaple\n"; assert_screen "login_permission_denied"; diff --git a/tests/realmd_join_cockpit.pm b/tests/realmd_join_cockpit.pm index 87357eb2..9d174a44 100644 --- a/tests/realmd_join_cockpit.pm +++ b/tests/realmd_join_cockpit.pm @@ -9,7 +9,7 @@ use cockpit; sub run { my $self = shift; # use FreeIPA server as DNS server - assert_script_run "printf 'search test.openqa.fedoraproject.org\nnameserver 172.16.2.100' > /etc/resolv.conf"; + assert_script_run "printf 'search test.openqa.rockylinux.org\nnameserver 172.16.2.100' > /etc/resolv.conf"; # this gets us the name of the first connection in the list, # which should be what we want my $connection = script_output "nmcli --fields NAME con show | head -2 | tail -1"; @@ -52,7 +52,7 @@ sub run { # ...in 245+ it's down to two times, for some reason $tabs = "\t\t" if ($cockpitver >= 245); type_string($tabs, 4); - type_string("ipa001.test.openqa.fedoraproject.org", 4); + type_string("ipa001.test.openqa.rockylinux.org", 4); type_string("\t\t", 4); type_string("admin", 4); send_key "tab"; diff --git a/tests/realmd_join_sssd.pm b/tests/realmd_join_sssd.pm index 911a03f9..0bde0978 100644 --- a/tests/realmd_join_sssd.pm +++ b/tests/realmd_join_sssd.pm @@ -9,15 +9,15 @@ use utils; sub run { my $self = shift; # use FreeIPA server or replica as DNS server - my $server = 'ipa001.test.openqa.fedoraproject.org'; + my $server = 'ipa001.test.openqa.rockylinux.org'; my $server_ip = '172.16.2.100'; my $server_mutex = 'freeipa_ready'; if (get_var("FREEIPA_REPLICA")) { - $server = 'ipa002.test.openqa.fedoraproject.org'; + $server = 'ipa002.test.openqa.rockylinux.org'; $server_ip = '172.16.2.106'; } if (get_var("FREEIPA_REPLICA_CLIENT")) { - $server = 'ipa003.test.openqa.fedoraproject.org'; + $server = 'ipa003.test.openqa.rockylinux.org'; $server_ip = '172.16.2.107'; $server_mutex = 'replica_ready'; } diff --git a/tests/role_deploy_domain_controller.pm b/tests/role_deploy_domain_controller.pm index 44d9b36b..2a43747f 100644 --- a/tests/role_deploy_domain_controller.pm +++ b/tests/role_deploy_domain_controller.pm @@ -38,7 +38,7 @@ sub run { } assert_script_run "systemctl restart firewalld.service"; # deploy the server - my $args = "-U --auto-forwarders --realm=TEST.OPENQA.FEDORAPROJECT.ORG --domain=test.openqa.fedoraproject.org --ds-password=monkeys123 --admin-password=monkeys123 --setup-dns --reverse-zone=2.16.172.in-addr.arpa --allow-zone-overlap"; + my $args = "-U --auto-forwarders --realm=TEST.OPENQA.ROCKYLINUX.ORG --domain=test.openqa.rockylinux.org --ds-password=monkeys123 --admin-password=monkeys123 --setup-dns --reverse-zone=2.16.172.in-addr.arpa --allow-zone-overlap"; assert_script_run "ipa-server-install $args", 1200; # enable and start the systemd service assert_script_run "systemctl enable ipa.service"; @@ -47,7 +47,7 @@ sub run { # kinit as admin assert_script_run 'echo "monkeys123" | kinit admin'; # set up an OTP for client001 enrolment (it will enrol with a kickstart) - assert_script_run 'ipa host-add client001.test.openqa.fedoraproject.org --password=monkeys --force'; + assert_script_run 'ipa host-add client001.test.openqa.rockylinux.org --password=monkeys --force'; # create two user accounts, test1 and test2 assert_script_run 'echo "correcthorse" | ipa user-add test1 --first test --last one --password'; assert_script_run 'echo "correcthorse" | ipa user-add test2 --first test --last two --password'; @@ -61,10 +61,10 @@ sub run { assert_script_run 'ipa pwpolicy-mod --minlife=0'; # magic voodoo crap to allow reverse DNS client sync to work # https://docs.pagure.org/bind-dyndb-ldap/BIND9/SyncPTR.html - assert_script_run 'ipa dnszone-mod test.openqa.fedoraproject.org. --allow-sync-ptr=TRUE'; + assert_script_run 'ipa dnszone-mod test.openqa.rockylinux.org. --allow-sync-ptr=TRUE'; # kinit as each user and set a new password - assert_script_run 'printf "correcthorse\nbatterystaple\nbatterystaple" | kinit test1@TEST.OPENQA.FEDORAPROJECT.ORG'; - assert_script_run 'printf "correcthorse\nbatterystaple\nbatterystaple" | kinit test2@TEST.OPENQA.FEDORAPROJECT.ORG'; + assert_script_run 'printf "correcthorse\nbatterystaple\nbatterystaple" | kinit test1@TEST.OPENQA.ROCKYLINUX.ORG'; + assert_script_run 'printf "correcthorse\nbatterystaple\nbatterystaple" | kinit test2@TEST.OPENQA.ROCKYLINUX.ORG'; # we're ready for children to enrol, now mutex_create("freeipa_ready"); # if upgrade test, wait for children to enrol before upgrade