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

[release-4.14] create a mechanism to deploy odf using operator-sdk #447

Conversation

openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Jul 18, 2024

This is an automated cherry-pick of #394 #412 #440

/assign iamniting

@iamniting
Copy link
Member

/test odf-operator-e2e-aws
/test ci-bundle-odf-operator-bundle
/test images

@iamniting iamniting force-pushed the cherry-pick-440-to-release-4.14 branch from 60924c3 to 310b31e Compare July 18, 2024 08:46
A separate catalog image will be used in the openshift CI

Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
@iamniting iamniting force-pushed the cherry-pick-440-to-release-4.14 branch from 310b31e to b02a507 Compare July 18, 2024 08:51
Copy link
Contributor

@malayparida2000 malayparida2000 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 18, 2024
Copy link
Contributor

openshift-ci bot commented Jul 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamniting, malayparida2000, openshift-cherrypick-robot

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 18, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit bbfdf24 into red-hat-storage:release-4.14 Jul 18, 2024
14 checks passed
@iamniting
Copy link
Member

/cherry-pick release-4.13

@openshift-cherrypick-robot
Copy link
Author

@iamniting: #447 failed to apply on top of branch "release-4.13":

Applying: makefile: create a separate catalog image for deps
Using index info to reconstruct a base tree...
M	Makefile
M	hack/make-bundle-vars.mk
Falling back to patching base and 3-way merge...
Auto-merging hack/make-bundle-vars.mk
Auto-merging Makefile
Applying: action: update action to verify catalog changes
Using index info to reconstruct a base tree...
M	.github/workflows/docker-build.yaml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/docker-build.yaml
CONFLICT (content): Merge conflict in .github/workflows/docker-build.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 action: update action to verify catalog changes
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-4.13

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
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants