Skip to content

release-1.9: update orchestrator digests#1983

Merged
nickboldt merged 1 commit intoredhat-developer:release-1.9from
kim-tsao:update_orchestrator_metadata
Mar 2, 2026
Merged

release-1.9: update orchestrator digests#1983
nickboldt merged 1 commit intoredhat-developer:release-1.9from
kim-tsao:update_orchestrator_metadata

Conversation

@kim-tsao
Copy link
Member

@kim-tsao kim-tsao commented Mar 2, 2026

Bring it up to GA level

Fixes: https://issues.redhat.com/browse/RHIDP-12457

@sonarqubecloud
Copy link

sonarqubecloud bot commented Mar 2, 2026

@github-actions github-actions bot added release-branch-patch PR modifies workspace on a release branch workspace-update PR modifies files in an existing workspace labels Mar 2, 2026
Copy link
Member

@nickboldt nickboldt left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@nickboldt
Copy link
Member

/override publish

@openshift-ci
Copy link

openshift-ci bot commented Mar 2, 2026

@nickboldt: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • publish

Only the following failed contexts/checkruns were expected:

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

/override publish

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@nickboldt nickboldt merged commit d69868a into redhat-developer:release-1.9 Mar 2, 2026
2 checks passed
@kim-tsao
Copy link
Member Author

kim-tsao commented Mar 4, 2026

/cherrypick main

@openshift-cherrypick-robot

@kim-tsao: #1983 failed to apply on top of branch "main":

Applying: release-1.9: update orchestrator digests
Using index info to reconstruct a base tree...
M	workspaces/orchestrator/metadata/redhat-backstage-plugin-orchestrator-backend-module-loki.yaml
M	workspaces/orchestrator/metadata/redhat-backstage-plugin-orchestrator-backend.yaml
M	workspaces/orchestrator/metadata/redhat-backstage-plugin-orchestrator-form-widgets.yaml
M	workspaces/orchestrator/metadata/redhat-backstage-plugin-orchestrator.yaml
M	workspaces/orchestrator/metadata/redhat-backstage-plugin-scaffolder-backend-module-orchestrator.yaml
Falling back to patching base and 3-way merge...
Auto-merging workspaces/orchestrator/metadata/redhat-backstage-plugin-scaffolder-backend-module-orchestrator.yaml
CONFLICT (content): Merge conflict in workspaces/orchestrator/metadata/redhat-backstage-plugin-scaffolder-backend-module-orchestrator.yaml
Auto-merging workspaces/orchestrator/metadata/redhat-backstage-plugin-orchestrator.yaml
CONFLICT (content): Merge conflict in workspaces/orchestrator/metadata/redhat-backstage-plugin-orchestrator.yaml
Auto-merging workspaces/orchestrator/metadata/redhat-backstage-plugin-orchestrator-form-widgets.yaml
CONFLICT (content): Merge conflict in workspaces/orchestrator/metadata/redhat-backstage-plugin-orchestrator-form-widgets.yaml
Auto-merging workspaces/orchestrator/metadata/redhat-backstage-plugin-orchestrator-backend.yaml
CONFLICT (content): Merge conflict in workspaces/orchestrator/metadata/redhat-backstage-plugin-orchestrator-backend.yaml
Auto-merging workspaces/orchestrator/metadata/redhat-backstage-plugin-orchestrator-backend-module-loki.yaml
CONFLICT (content): Merge conflict in workspaces/orchestrator/metadata/redhat-backstage-plugin-orchestrator-backend-module-loki.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 release-1.9: update orchestrator digests

Details

In response to this:

/cherrypick main

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm release-branch-patch PR modifies workspace on a release branch workspace-update PR modifies files in an existing workspace

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants