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.

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

Always set $STORAGE and $JOB_STORAGE in bot/test.sh #837

Merged

Conversation

bedroge
Copy link
Collaborator

@bedroge bedroge commented Dec 6, 2024

Even when resuming from a previous directory/tarball, $STORAGE and $JOB_STORAGE are not set, so I think we should always do this. For that reason, I moved them out of the if statement.

Also, this sets $SINGULARITY_TMPDIR to a subdir of $JOB_STORAGE, similar to the change made in #836.

@bedroge bedroge added the enhancement New feature or request label Dec 6, 2024
@riscv-eessi-io-bot
Copy link

Instance eessi-bot-riscv is configured to build for:

  • architectures: riscv64/generic
  • repositories: riscv.eessi.io-20240402

Copy link

eessi-bot bot commented Dec 6, 2024

Instance eessi-bot-mc-aws is configured to build for:

  • architectures: x86_64/generic, x86_64/intel/haswell, x86_64/intel/skylake_avx512, x86_64/amd/zen2, x86_64/amd/zen3, aarch64/generic, aarch64/neoverse_n1, aarch64/neoverse_v1
  • repositories: eessi.io-2023.06-compat, eessi-hpc.org-2023.06-software, eessi-hpc.org-2023.06-compat, eessi.io-2023.06-software

Copy link

eessi-bot bot commented Dec 6, 2024

Instance eessi-bot-mc-azure is configured to build for:

  • architectures: x86_64/amd/zen4
  • repositories: eessi.io-2023.06-compat, eessi.io-2023.06-software

@@ -103,34 +103,34 @@ fi
RESUME_DIR=$(grep 'Using .* as tmp directory' slurm-${SLURM_JOBID}.out | head -1 | awk '{print $2}')

if [[ -z ${RESUME_DIR} ]]; then
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'm now doing this in either case, so both when $RESUME_DIR is set and when it's not set. Or can we point $JOB_STORAGE to $RESUME_DIR or something in case $RESUME_DIR is set?

Copy link
Collaborator

@trz42 trz42 left a comment

Choose a reason for hiding this comment

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

OK, this should work. If we cannot find the temp storage directory from a previous run ($RESUME_DIR being empty), then we check if we can find a tarball of that run. If not, we exit with an error. If we find it we create the temporary storage.

This is now always available to set $SINGULARITY_TMPDIR.

@trz42 trz42 merged commit 57a98fd into EESSI:2023.06-software.eessi.io Dec 7, 2024
50 checks passed
Copy link

eessi-bot bot commented Dec 7, 2024

PR merged! Moved [] to /project/def-users/SHARED/trash_bin/EESSI/software-layer/2024.12.07

@riscv-eessi-io-bot
Copy link

PR merged! Moved [] to /home/eessibot/shared/trash_bin/EESSI/software-layer/2024.12.07

Copy link

eessi-bot bot commented Dec 7, 2024

PR merged! Moved [] to /project/def-users/SHARED/trash_bin/EESSI/software-layer/2024.12.07

@bedroge bedroge deleted the bot_test_enhancements_tmpdir branch December 9, 2024 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants