Skip to content

Reference cleanup scripts in generateCleanupCommand.sh#307

Merged
dennis-behm merged 7 commits intoIBM:mainfrom
dennis-behm:feature/306-delete-script-reference-missing-in-cbs-genereatecleanupcommandssh
May 2, 2025
Merged

Reference cleanup scripts in generateCleanupCommand.sh#307
dennis-behm merged 7 commits intoIBM:mainfrom
dennis-behm:feature/306-delete-script-reference-missing-in-cbs-genereatecleanupcommandssh

Conversation

@dennis-behm
Copy link
Copy Markdown
Member

This addresses the defect reported in #306. It already aligns with the coming updates in #299 to reference the pipeline and utility tasks right from the same repo, keeping the pipelineBackend.config lightweight.

Signed-off-by: Dennis Behm <dennis.behm@de.ibm.com>
Comment thread Templates/Common-Backend-Scripts/pipelineBackend.config Outdated
Comment thread Templates/Common-Backend-Scripts/pipelineBackend.config Outdated
Comment thread Templates/Common-Backend-Scripts/generateCleanupCommands.sh Outdated
dennis-behm and others added 2 commits March 26, 2025 08:34
Co-authored-by: Lauren Li <45975633+lauren-li@users.noreply.github.com>
Signed-off-by: Dennis Behm <dennis.behm@de.ibm.com>
@dennis-behm dennis-behm requested a review from M-DLB March 26, 2025 13:38
Copy link
Copy Markdown
Contributor

@lauren-li lauren-li left a comment

Choose a reason for hiding this comment

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

This PR looks good to me now - thanks @dennis-behm for working on it!

# cleanupDbbMetadataStoreOptions="--type file --location /u/github/"
# for db2 metadatastore, reusing build settings
# cleanupDbbMetadataStoreOptions="--type db2 --user ${dbbMetadataStoreJdbcId} --password-file ${dbbMetadataStoreJdbcPwdFile} --db2-config ${dbbMetadataStoreJdbcConfigFile} --url ${dbbMetadataStoreJdbcUrl}"
cleanupDbbMetadataStoreOptions=""
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We should not introduce a new variable for this cleanup, and compute the string in the generateCleanupCommands.sh based on the information that already present in the pipelineBackend.config file (dbbMetadataStoreJdbcId, dbbMetadataStoreJdbcPwdFile, dbbMetadataStoreJdbcConfigFile and dbbMetadataStoreJdbcUrl).

By the way, there should be a dbbMetadataStoreType (file|db2) parm and a dbbMetadataStoreFileLocation parm as well in pipelineBackend.config, to help compute the right connection string.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Hi @M-DLB ,

By the way, there should be a dbbMetadataStoreType (file|db2) parm and a dbbMetadataStoreFileLocation parm as well in pipelineBackend.config, to help compute the right connection string.

I understand the point here - however, I don't want to maintain two variables with the same purpose - one in the build framework and another time in the pipelineBackend.config maintaining for maintaining the dbb metadatastore type.

Could we leave it as is now? Users need to customise the pipelineBackend.config anyway, and there are clear samples provided.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You already have variables for metadatstore duplicated in the build framework and in the pipelineBackend.config file. I think it would be cleaner to add the two that are missing (dbbMetadataStoreType (file|db2) parm and a dbbMetadataStoreFileLocation parm) to completeness, remove the cleanupDbbMetadataStoreOptions parm and compute it instead.
You should aim for consistency, instead of doing one way with DB2 and another way with file metadatastore.

dennis-behm and others added 3 commits April 8, 2025 12:02
…etch external dependencies (IBM#299)

* (CBS) packageBuildOutputs.sh to follow implemented naming conventions how archives are published to Artifact repository
* (CBS) dbbBuild.sh and zBuilder.sh to process build dependency configuration defined in the Application Descriptor
* (CBS) Download external dependencies based on naming conventions from the artifact repository (Nexus, Artifactory) using the ArtifactRepositoryHelpers
* (CBS) Expanding the external dependencies in the build workspace for consumption by the build framework
* (CBS) Central cache of external archives
* (CBS) Enable wazideploy-generate to automatically download the tar from the Artifact repository
* (CBS) Scripts no longer carry configuration parameters to point to existing scripts. It references the scripts directly within this repo.

---------

Signed-off-by: Dennis Behm <dennis.behm@de.ibm.com>
Co-authored-by: Mathieu Dalbin <mathieu.dalbin@fr.ibm.com>
Co-authored-by: Lauren Li <45975633+lauren-li@users.noreply.github.com>
…script-reference-missing-in-cbs-genereatecleanupcommandssh
Signed-off-by: Dennis Behm <dennis.behm@de.ibm.com>
Signed-off-by: Dennis Behm <dennis.behm@de.ibm.com>
@dennis-behm dennis-behm merged commit 8920064 into IBM:main May 2, 2025
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants