Enhanced Packaging process #262
Merged
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: Mathieu Dalbin <mathieu.dalbin@fr.ibm.com>
Signed-off-by: Mathieu Dalbin <mathieu.dalbin@fr.ibm.com>
Signed-off-by: Mathieu Dalbin <mathieu.dalbin@fr.ibm.com>
Signed-off-by: Mathieu Dalbin <mathieu.dalbin@fr.ibm.com>
Signed-off-by: Mathieu Dalbin <mathieu.dalbin@fr.ibm.com>
dennis-behm
reviewed
Jul 12, 2024
There was a problem hiding this comment.
@M-DLB can you please have a look to the additional comments, please?
| } | ||
| } else { | ||
| println "*! Copying $container(${deployableArtifact.file}) could not be copied due to missing mapping. Packaging failed." | ||
| props.error = "true" | ||
| println "*! [ERROR] Copy failed: The file '$container(${deployableArtifact.file})' could not be copied due to missing mapping." |
There was a problem hiding this comment.
What about?
Suggested change
| println "*! [ERROR] Copy failed: The file '$container(${deployableArtifact.file})' could not be copied due to missing mapping." | |
| println "*! [ERROR] Copy failed: The file '$container(${deployableArtifact.file})' could not be copied. No mapping found for last level qualifier in script configuration 'copyModeMap'. Please verify." |
| } | ||
| } | ||
| if (props.generateSBOM && props.generateSBOM.toBoolean() && !props.error) { | ||
| if (props.generateSBOM && props.generateSBOM.toBoolean() && rc < 1) { |
There was a problem hiding this comment.
What about
Suggested change
| if (props.generateSBOM && props.generateSBOM.toBoolean() && rc < 1) { | |
| if (props.generateSBOM && props.generateSBOM.toBoolean() && rc == 0) { |
| rc = runProcess(processCmd, new File(props.workDir)) | ||
| assert rc == 0 : "Failed to append $logPattern." | ||
| processRC = runProcess(processCmd, new File(props.workDir)) | ||
| assert processRC == 0 : "Failed to append '$logPattern'." |
There was a problem hiding this comment.
Isn't the idea of rc to now properly run through the script and avoid Assert Exceptions?
| @@ -742,10 +751,12 @@ def relativizePath(String path) { | |||
| class DeployableArtifact { | |||
| private final String file; | |||
| private final String deployType; | |||
| private final Boolean zFSArtifact; | |||
There was a problem hiding this comment.
It's odd to see zFSArtifact, I assume if this is false, it assumes to be a PDS member?
What if you introduce a String objectType that can be zFSArtifact, PDS-MEMBER, SEQ-Dataset ... So, it allows a bit more flexibility for additional objects, that we want to package in the future.
| @@ -755,7 +766,7 @@ class DeployableArtifact { | |||
| } | |||
|
|
|||
| public boolean equals(DeployableArtifact other) { | |||
There was a problem hiding this comment.
This misses a method description.
dennis-behm
reviewed
Jul 12, 2024
| @@ -665,7 +660,7 @@ def parseInput(String[] cliArgs){ | |||
| } | |||
|
|
|||
| if(opts.t == false) { | |||
| println("*! Error: tarFilename is only optional when no build report order is specified") | |||
| println("*! [ERROR] tarFilename is only optional when no build report order is specified") | |||
There was a problem hiding this comment.
Suggested change
| println("*! [ERROR] tarFilename is only optional when no build report order is specified") | |
| println("*! [VALIDATION-ERROR] tarFilename is only optional when no build report order is specified") |
| @@ -665,7 +660,7 @@ def parseInput(String[] cliArgs){ | |||
| } | |||
|
|
|||
| if(opts.t == false) { | |||
| println("*! Error: tarFilename is only optional when no build report order is specified") | |||
| println("*! [ERROR] tarFilename is only optional when no build report order is specified") | |||
| System.exit(3) | |||
There was a problem hiding this comment.
I think, this should used rc, right? And there are a couple of more exits in the validation .
Signed-off-by: Mathieu Dalbin <mathieu.dalbin@fr.ibm.com>
Signed-off-by: Mathieu Dalbin <mathieu.dalbin@fr.ibm.com>
dennis-behm
reviewed
Jul 12, 2024
There was a problem hiding this comment.
Hi @M-DLB, thanks for the fixes. Some additional comment and suggestions.
|
|
||
| props = parseInput(args) | ||
|
|
||
| def startTime = new Date() | ||
| // Just printing the Usage and exiting |
There was a problem hiding this comment.
Let's add that into the parseInput method
Co-authored-by: Dennis Behm <dennis.behm@de.ibm.com>
Co-authored-by: Dennis Behm <dennis.behm@de.ibm.com>
Co-authored-by: Dennis Behm <dennis.behm@de.ibm.com>
Co-authored-by: Dennis Behm <dennis.behm@de.ibm.com>
Co-authored-by: Dennis Behm <dennis.behm@de.ibm.com>
Co-authored-by: Dennis Behm <dennis.behm@de.ibm.com>
Co-authored-by: Dennis Behm <dennis.behm@de.ibm.com>
Co-authored-by: Dennis Behm <dennis.behm@de.ibm.com>
Co-authored-by: Dennis Behm <dennis.behm@de.ibm.com>
Co-authored-by: Dennis Behm <dennis.behm@de.ibm.com>
Signed-off-by: Mathieu Dalbin <mathieu.dalbin@fr.ibm.com>
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 contains various fixes and an enhancement to the error management in the script.