[bugfix] Do not copy or git clone sourcesdir if --dont-restage is passed#3393
Merged
vkarak merged 3 commits intoreframe-hpc:masterfrom Feb 19, 2025
Merged
Conversation
vkarak
force-pushed
the
bugfix/dont-restage-skip-clone
branch
from
5173cc7 to
92d1a39
Compare
teojgo
requested changes
Feb 19, 2025
Co-authored-by: Theofilos Manitaras <manitaras@cscs.ch>
teojgo
approved these changes
Feb 19, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a more general problem with
--dont-restageapart from trying to re-issue agit clonecommand ifsourcesdirwas a url. Even if it wasn't, it would still copy the contents of thesourcesdirto stagedir. Now we neither copy nor clone if--dont-restageis passed.However, since we now disallow a copy if
--dont-restageis passed, that would mean that--dont-restagewould cause a test to fail if it was run for the first time with--dont-restageas its resources wouldn't be copied. To overcome this, each test now write a mark in the stage directory. Before copying the resources to the stage directory, it checks if the mark exists. If it does, it means that there has been a previous run and that the stagedir contents haven't been wiped out, which means--dont-restagewas passed. If the mark does not exists, the it's a fresh run (either the first ever run of a test, even with--dont-restage, or just a regular rerun without--dont-restage).Fixes #3305.