Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove distributed builds and manifest generation... #445

Merged

Conversation

matzew
Copy link
Member

@matzew matzew commented Nov 17, 2021

Signed-off-by: Matthias Wessendorf mwessend@redhat.com

Do not yet merge (CI nightly should be back before we should merge this)

/assign @lberk

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
@matzew
Copy link
Member Author

matzew commented Nov 17, 2021

And... this needs to also be aligned w/ updates on the "build image" cfg in openshift/release

@matzew
Copy link
Member Author

matzew commented Nov 17, 2021

see also openshift/release#23730

@matzew matzew changed the title WIP: Remove distributed builds and manifest generation... Remove distributed builds and manifest generation... Nov 17, 2021
@lberk
Copy link
Member

lberk commented Nov 17, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Nov 17, 2021
@openshift-ci
Copy link

openshift-ci bot commented Nov 17, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lberk, matzew

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit be81627 into openshift-knative:main Nov 17, 2021
@devguyio
Copy link

/cherry-pick release-v1.0

@openshift-cherrypick-robot

@devguyio: new pull request created: #449

In response to this:

/cherry-pick release-v1.0

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/test-infra repository.

@devguyio
Copy link

/cherry-pick release-v0.26

@devguyio
Copy link

/cherry-pick release-v0.25

@openshift-cherrypick-robot

@devguyio: #445 failed to apply on top of branch "release-v0.26":

Applying: dizzy: Remove distributed builds and manifest generation...
Using index info to reconstruct a base tree...
M	Makefile
M	openshift/release/generate-release.sh
Falling back to patching base and 3-way merge...
Auto-merging openshift/release/generate-release.sh
CONFLICT (content): Merge conflict in openshift/release/generate-release.sh
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 dizzy: Remove distributed builds and manifest generation...
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v0.26

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/test-infra repository.

@openshift-cherrypick-robot

@devguyio: #445 failed to apply on top of branch "release-v0.25":

Applying: dizzy: Remove distributed builds and manifest generation...
Using index info to reconstruct a base tree...
M	Makefile
M	openshift/release/generate-release.sh
Falling back to patching base and 3-way merge...
Auto-merging openshift/release/generate-release.sh
CONFLICT (content): Merge conflict in openshift/release/generate-release.sh
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 dizzy: Remove distributed builds and manifest generation...
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v0.25

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/test-infra repository.

@devguyio
Copy link

/cherry-pick release-v0.26

@openshift-cherrypick-robot

@devguyio: #445 failed to apply on top of branch "release-v0.26":

Applying: dizzy: Remove distributed builds and manifest generation...
Using index info to reconstruct a base tree...
M	Makefile
M	openshift/release/generate-release.sh
Falling back to patching base and 3-way merge...
Auto-merging openshift/release/generate-release.sh
CONFLICT (content): Merge conflict in openshift/release/generate-release.sh
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 dizzy: Remove distributed builds and manifest generation...
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v0.26

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/test-infra repository.

ReToCode pushed a commit to ReToCode/eventing-kafka that referenced this pull request Jan 3, 2023
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.

5 participants