Skip to content

Refactor CI setup#603

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift-knative:release-v1.16from
dsimansk:pr/refactor-ci-setup
Mar 4, 2025
Merged

Refactor CI setup#603
openshift-merge-bot[bot] merged 1 commit intoopenshift-knative:release-v1.16from
dsimansk:pr/refactor-ci-setup

Conversation

@dsimansk
Copy link

No description provided.

@openshift-ci
Copy link

openshift-ci bot commented Feb 18, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dsimansk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@dsimansk dsimansk force-pushed the pr/refactor-ci-setup branch 3 times, most recently from ed5848a to f6cd5b2 Compare February 24, 2025 16:31
@dsimansk
Copy link
Author

/retest

@dsimansk dsimansk force-pushed the pr/refactor-ci-setup branch from b8a85ba to 1cfcc45 Compare February 26, 2025 14:54
@dsimansk dsimansk force-pushed the pr/refactor-ci-setup branch from 7813e3a to 6776342 Compare March 4, 2025 14:21
@dsimansk dsimansk changed the title WIP: refactor CI setup Refactor CI setup Mar 4, 2025
@dsimansk
Copy link
Author

dsimansk commented Mar 4, 2025

/cherry-pick release-v1.15

@openshift-cherrypick-robot

@dsimansk: once the present PR merges, I will cherry-pick it on top of release-v1.15 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-v1.15

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.

@dsimansk dsimansk added the lgtm label Mar 4, 2025
@dsimansk
Copy link
Author

dsimansk commented Mar 4, 2025

/cherry-pick main

@openshift-cherrypick-robot

@dsimansk: once the present PR merges, I will cherry-pick it on top of main in a new PR and assign it to you.

Details

In response to this:

/cherry-pick 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.

@openshift-merge-bot openshift-merge-bot bot merged commit 380c8f1 into openshift-knative:release-v1.16 Mar 4, 2025
9 checks passed
@openshift-cherrypick-robot

@dsimansk: #603 failed to apply on top of branch "release-v1.15":

Applying: Refactor CI setup to use sobranch resolution
Using index info to reconstruct a base tree...
M	openshift/e2e-common.sh
Falling back to patching base and 3-way merge...
Auto-merging openshift/e2e-common.sh
CONFLICT (content): Merge conflict in openshift/e2e-common.sh
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 advice.mergeConflict false"
Patch failed at 0001 Refactor CI setup to use sobranch resolution

Details

In response to this:

/cherry-pick release-v1.15

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.

@openshift-cherrypick-robot

@dsimansk: #603 failed to apply on top of branch "main":

Applying: Refactor CI setup to use sobranch resolution
Using index info to reconstruct a base tree...
M	openshift/e2e-common.sh
M	openshift/e2e-tests-openshift.sh
Falling back to patching base and 3-way merge...
Auto-merging openshift/e2e-tests-openshift.sh
CONFLICT (content): Merge conflict in openshift/e2e-tests-openshift.sh
Auto-merging openshift/e2e-common.sh
CONFLICT (content): Merge conflict in openshift/e2e-common.sh
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 advice.mergeConflict false"
Patch failed at 0001 Refactor CI setup to use sobranch resolution

Details

In response to this:

/cherry-pick 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.

@dsimansk
Copy link
Author

dsimansk commented Mar 4, 2025

/cherry-pick release-v1.17

@openshift-cherrypick-robot

@dsimansk: new pull request created: #613

Details

In response to this:

/cherry-pick release-v1.17

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants