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

Docker: Pass environment variable to aiida-prepare script #6169

Merged
merged 4 commits into from
Nov 4, 2023
Merged

Docker: Pass environment variable to aiida-prepare script #6169

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6024f7c
Docker: Pass environment variable to aiida-prepare script
unkcpz Nov 4, 2023
55fe675
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 4, 2023
8c70220
f-s: computer test localhost
unkcpz Nov 4, 2023
877f4c7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .docker/aiida-core-base/s6-assets/s6-rc.d/aiida-prepare/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/command/execlineb -S0

with-contenv

foreground { s6-echo "Calling /etc/init/aiida-prepare" }
/etc/init/aiida-prepare.sh
6 changes: 6 additions & 0 deletions .docker/tests/test_aiida.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,9 @@ def test_verdi_status(aiida_exec, container_user, timeout):

# check that we have suppressed the warnings
assert 'Warning' not in output


def test_computer_setup_success(aiida_exec, container_user, timeout):
time.sleep(timeout)
output = aiida_exec('verdi computer show localhost', user=container_user).decode().strip()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we maybe also test verdi computer test localhost? This checks even more

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, should be better. Let's see if the test passed.

assert f'/home/{container_user}/aiida_run' in output
Loading