fix: environment configuration for mintmaker in preview mode #5342
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
qixiang
reviewed
Jan 22, 2025
hack/preview.sh
Outdated
Comment on lines
214
to
222
| if [[ -n "${MINTMAKER_PR_OWNER}" && "${MINTMAKER_PR_SHA}" ]] | ||
| then | ||
| yq -i e "(.resources[] | select(. ==\"*github.com/konflux-ci/mintmaker/config/default*\")) |= | ||
| \"https://github.com/${MINTMAKER_PR_OWNER}/mintmaker/config/default?ref=${MINTMAKER_PR_SHA}\" | ||
| " $ROOT/components/mintmaker/development/kustomization.yaml | ||
| yq -i e "(.resources[] | select(. ==\"*github.com/konflux-ci/mintmaker/config/renovate*\")) |= | ||
| \"https://github.com/${MINTMAKER_PR_OWNER}/mintmaker/config/renovate?ref=${MINTMAKER_PR_SHA}\" | ||
| " $ROOT/components/mintmaker/development/kustomization.yaml | ||
| fi |
There was a problem hiding this comment.
Or you can just modify it to:
[[ -n "${MINTMAKER_PR_OWNER}" && "${MINTMAKER_PR_SHA}" ]] && yq -i "(.resources[] | select(contains(\"konflux-ci/mintmaker\"))) |= (sub(\"konflux-ci/mintmaker\", \"${MINTMAKER_PR_OWNER}\") | sub(\"ref=.*\", \"ref=${MINTMAKER_PR_SHA}\"))" $ROOT/components/mintmaker/development/kustomization.yaml
then it will still work if we add new resources.
tkdchen
force-pushed
the
fix-env-config-for-mintmaker
branch
from
5f14cc8 to
1fe5d89
Compare
tkdchen
force-pushed
the
fix-env-config-for-mintmaker
branch
from
1fe5d89 to
856638f
Compare
|
/lgtm |
qixiang
approved these changes
Jan 24, 2025
mintmaker/development/kustomization.yaml accumulates both konflux-ci/mintmaker/config/default and konflux-ci/mintmaker/config/renovate. The original code results in the config/renovate is lost and config/default is accumulated twice.
tkdchen
force-pushed
the
fix-env-config-for-mintmaker
branch
from
856638f to
b368950
Compare
|
Rebased on main branch. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mmorhun, qixiang, tkdchen The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-merge-bot
bot
merged commit 6f1c664
into
redhat-appstudio:main
6 checks passed
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.
mintmaker/development/kustomization.yamlaccumulates bothkonflux-ci/mintmaker/config/defaultandkonflux-ci/mintmaker/config/renovate. The original code results in theconfig/renovateis lost andconfig/defaultis accumulated twice.