Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

salt: Workaround salt minion not reachable directly after start (bsc#1069711) #4317

Merged
merged 2 commits into from Feb 1, 2018
Merged

salt: Workaround salt minion not reachable directly after start (bsc#1069711) #4317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f48284
Fix perl warnings about undefined variables
okurz Feb 1, 2018
73353df
salt: Workaround salt minion not reachable directly after start (bsc#…
okurz Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions products/sle/main.pm
View file
Open in desktop
Expand Up @@ -76,10 +76,10 @@ sub is_desktop_module_selected {
# productivity and ha require desktop applications, so it's preselected
# same is true for sles4sap
return
get_var('ADDONS') =~ /all-packages|desktop|we/
|| get_var('WORKAROUND_MODULES') =~ /desktop|we/
|| get_var('ADDONURL') =~ /desktop|we/
|| get_var('SCC_ADDONS') =~ /desktop|we|productivity|ha/
get_var('ADDONS', '') =~ /all-packages|desktop|we/
|| get_var('WORKAROUND_MODULES', '') =~ /desktop|we/
|| get_var('ADDONURL', '') =~ /desktop|we/
|| get_var('SCC_ADDONS', '') =~ /desktop|we|productivity|ha/
|| is_sles4sap;
}

Expand Down Expand Up @@ -377,7 +377,7 @@ if (get_var('ENABLE_ALL_SCC_MODULES') && !get_var('SCC_MODULES')) {
}

# define aytests repo for support server (do not override defined value)
if (get_var('SUPPORT_SERVER_ROLES') =~ /aytest/ && !get_var('AYTESTS_REPO')) {
if (get_var('SUPPORT_SERVER_ROLES', '') =~ /aytest/ && !get_var('AYTESTS_REPO')) {
if (sle_version_at_least('15')) {
set_var('AYTESTS_REPO', 'http://download.suse.de/ibs/Devel:/YaST:/Head/SUSE_SLE-15_GA/');
}
Expand Down
9 changes: 6 additions & 3 deletions tests/console/salt.pm
View file
Open in desktop
Expand Up @@ -32,9 +32,12 @@ EOF
# before accepting the key, wait until the minion is fully started (systemd might be not reliable)
assert_script_run('salt-run state.event tagmatch="salt/auth" quiet=True count=1', timeout => 300);
assert_script_run("salt-key --accept-all -y");
# before pinging the minions, check the start event as a signal that the minion is now ready
assert_script_run('salt-run state.event tagmatch="salt/minion/*/start" quiet=True count=1', timeout => 300);
assert_script_run "salt '*' test.ping | grep -woh True";
# try to ping the minion. If it does not respond on the first try the ping
# might have gone lost so try more often
unless (script_run 'salt \'*\' test.ping') {
record_soft_failure 'bsc#1069711';
assert_script_run 'for i in {1..7}; do echo "try $i" && salt \'*\' test.ping -t30 && break; done';
}
systemctl 'stop salt-master salt-minion';
}

Expand Down