Skip to content

Commit

Permalink
consistency use qa_wait_patterns for different interactive installati…
Browse files Browse the repository at this point in the history
…on commands executed by ABAQUS easyblock
  • Loading branch information
boegel committed Aug 28, 2024
1 parent 6472d46 commit d0e941a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions easybuild/easyblocks/a/abaqus.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ def install_step(self):
(r"Choose the .*installation directory.*\n.*\n\n.*:", os.path.join(self.installdir, 'sim')),
(r"Enter selection \(default: Install\):", ''),
]
run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_timeout=100)
run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_wait_patterns=no_qa, qa_timeout=100)

# F_CAASIMULIAComputeServicesBuildTime part
change_dir(cwd)
Expand All @@ -254,7 +254,7 @@ def install_step(self):
raise EasyBuildError("Failed to find expected subdir for hotfix: %s", subdirs)

cwd = change_dir(os.path.join(cwd, subdir, '1'))
run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_timeout=100)
run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_wait_patterns=no_qa, qa_timeout=100)
change_dir(cwd)

# next install Part_SIMULIA_Abaqus_CAE hotfix (ABAQUS versions <= 2020)
Expand All @@ -277,7 +277,7 @@ def install_step(self):
(r"\[2\] Continue\n(?:.|\n)*Please choose an action:", '2'),
]
no_qa = [r"Please be patient; it will take a few minutes to complete\.\n(\.)*"]
run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_timeout=100)
run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_wait_patterns=no_qa, qa_timeout=100)
change_dir(cwd)

# install SIMULIA Established Products hotfix (ABAQUS versions > 2020)
Expand Down Expand Up @@ -306,7 +306,7 @@ def install_step(self):
(r"Enter selection \(default: Close\):", ''),
]

run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_timeout=100)
run_shell_cmd('./StartTUI.sh', qa_patterns=qa, qa_wait_patterns=no_qa, qa_timeout=100)
change_dir(cwd)

# create 'abaqus' symlink for main command, which is not there anymore starting with ABAQUS 2022
Expand Down

0 comments on commit d0e941a

Please sign in to comment.