fixed conda lockfile rendering in build view #727
Conversation
This file contains 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
Signed-off-by: munishchouhan <[email protected]>
|
tested: |
Signed-off-by: munishchouhan <[email protected]>
|
download tested |
Signed-off-by: munishchouhan <[email protected]>
munishchouhan
changed the title
pditommaso
reviewed
Nov 19, 2024
src/main/groovy/io/seqera/wave/controller/ViewController.groovy
Outdated
Show resolved
Hide resolved
Signed-off-by: munishchouhan <[email protected]>
Signed-off-by: munishchouhan <[email protected]>
Signed-off-by: munishchouhan <[email protected]>
pditommaso
requested changes
Dec 9, 2024
There was a problem hiding this comment.
I'm not convinced but this solution because still keep the problem unsolved for the stream API.
Also, this not prevent the upload of lock files that just contains the invalid content.
Instead of patching the view of the broken conda file containing cat environmeny.lock string, it would have more sense to move this logic when *uploading* the conda lock content.
Sure, I will move the logic in uploading section |
Signed-off-by: munishchouhan <[email protected]>
|
Tested again after changes: |
Signed-off-by: munishchouhan <[email protected]>
pditommaso
reviewed
Dec 10, 2024
Comment on lines
157
to
175
|
|
||
| /* When a container image is cached, dockerfile does not get executed. | ||
| In that case condalock file will contain "cat environment.lock" because its not been executed. | ||
| So wave will check the previous builds of that container image | ||
| and render the condalock file from latest successful build | ||
| and replace with the current build's condalock file. | ||
| */ | ||
| if( condaLock.contains('cat environment.lock') ){ | ||
| log.info "Container Image is already cached, uploading previously successful build's condalock file for buildId: $buildId" | ||
| def builds = persistenceService.allBuilds(buildId.split('-')[1].split('_')[0]) | ||
| for (def build : builds) { | ||
| if ( build.succeeded() ){ | ||
| def curCondaLock = fetchCondaLockString(build.buildId) | ||
| if( curCondaLock && !curCondaLock.contains('cat environment.lock') ){ | ||
| condaLock = curCondaLock | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
let's isolate this logic into a separate method, so it can be tested independently
Signed-off-by: munishchouhan <[email protected]>
|
Tests again locally: First build: Second Build: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR will add a check on conda lockfile and if its not correct, wave will fetch it from previous succcessful build