Skip to content

Commit

Permalink
hpc: Improve spack master setup
Browse files Browse the repository at this point in the history
Fix poo#159831: We should use mpich libraries provided by SLE and not
ones provided by spack repositories. sshd restart, which is not needed
at all, was removed.
  • Loading branch information
czerw committed May 2, 2024
1 parent 3c41d62 commit 0b1f3fd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion lib/hpcbase.pm
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ however the newest spack updates contain C<spack_get_libs.sh>.
sub prepare_spack_env {
my ($self, $mpi) = @_;
$mpi //= 'mpich';
zypper_call "in spack", timeout => 1200;
zypper_call "in spack mpich mpich-devel", timeout => 1200;
assert_script_run "echo source /usr/share/spack/setup-env.sh >> /home/$testapi::username/.bashrc";
type_string('pkill -u root'); # this kills sshd
select_serial_terminal(0);
Expand Down
5 changes: 0 additions & 5 deletions tests/hpc/spack_master.pm
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ sub run ($self) {
test_case('Compilation', 'Program compiled successfully', $compile_rt);
barrier_wait('MPI_BINARIES_READY');

type_string "sudo systemctl restart sshd\n";
sleep 3;
type_string("$testapi::password\n");
record_info('ssh', 'check sshd service before continue');
systemctl 'status sshd';
# Testing compiled code
record_info('INFO', 'Run MPI over single machine');
$rt = assert_script_run("mpirun $exports_path{'bin'}/$mpi_bin");
Expand Down

0 comments on commit 0b1f3fd

Please sign in to comment.