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.

Sign up for GitHub

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

Jump to bottom

infra: sriov git submodule should point to main #2152

Merged
merged 1 commit into from
Jan 10, 2025
Merged

infra: sriov git submodule should point to main #2152

merged 1 commit into from
Jan 10, 2025

Conversation

zeeke
Copy link
Member

@zeeke zeeke commented Jan 10, 2025

Main sriov-network-operator branch has moved from master to main.

Update the SRIOV_NETWORK_OPERATOR_TARGET_COMMIT variable accordingly to fix errors like [1]:

+ cd ../sriov-network-operator/
+ git fetch --all
+ git checkout origin/master
error: pathspec 'origin/master' did not match any file(s) known to git
make: *** [Makefile:140: init-git-submodules] Error 1

[1] https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift-kni_cnf-features-deploy/2148/pull-ci-openshift-kni-cnf-features-deploy-master-e2e-aws-ci-tests/1877360047533592576

cc @SchSeba @sshnaidm

@zeeke
infra: sriov git submodule should point to main
96b4efa 
Main sriov-network-operator branch has moved from `master` to `main`.

Update the `SRIOV_NETWORK_OPERATOR_TARGET_COMMIT` variable accordingly to
fix errors like [1]:

```
+ cd ../sriov-network-operator/
+ git fetch --all
+ git checkout origin/master
error: pathspec 'origin/master' did not match any file(s) known to git
make: *** [Makefile:140: init-git-submodules] Error 1
```

[1] https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift-kni_cnf-features-deploy/2148/pull-ci-openshift-kni-cnf-features-deploy-master-e2e-aws-ci-tests/1877360047533592576

Signed-off-by: Andrea Panattoni <[email protected]>
@openshift-ci openshift-ci bot requested review from kenyis and SchSeba January 10, 2025 09:55
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zeeke

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 Jan 10, 2025
@sshnaidm
Copy link
Contributor

/test e2e-telco5g-cnftests

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 10, 2025

@zeeke: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-telco5g-cnftests 96b4efa link false /test e2e-telco5g-cnftests

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@sshnaidm
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2025
@sshnaidm
Copy link
Contributor

/pj-rehearse ack

@openshift-merge-bot openshift-merge-bot bot merged commit 413a53d into openshift-kni:master Jan 10, 2025
6 of 7 checks passed
@zeeke
Copy link
Member Author

zeeke commented Jan 14, 2025

/cherrypick release-4.18,release-4.17,release-4.16

@openshift-cherrypick-robot
Copy link

@zeeke: cannot checkout release-4.18,release-4.17,release-4.16: error checking out "release-4.18,release-4.17,release-4.16": exit status 1 error: pathspec 'release-4.18,release-4.17,release-4.16' did not match any file(s) known to git

In response to this:

/cherrypick release-4.18,release-4.17,release-4.16

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.

@zeeke
Copy link
Member Author

zeeke commented Jan 14, 2025

/cherrypick release-4.18
/cherrypick release-4.17
/cherrypick release-4.16

@openshift-cherrypick-robot
Copy link

@zeeke: #2152 failed to apply on top of branch "release-4.16":

Applying: infra: sriov git submodule should point to `main`
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
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
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 infra: sriov git submodule should point to `main`

In response to this:

/cherrypick release-4.18
/cherrypick release-4.17
/cherrypick release-4.16

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.

@zeeke
Copy link
Member Author

zeeke commented Jan 14, 2025

/cherrypick release-4.18

@openshift-cherrypick-robot
Copy link

@zeeke: new pull request created: #2160

In response to this:

/cherrypick release-4.18

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 openshift-cherrypick-robot mentioned this pull request Jan 14, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kenyis kenyis Awaiting requested review from kenyis

@SchSeba SchSeba Awaiting requested review from SchSeba

Assignees

@sshnaidm sshnaidm

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zeeke @sshnaidm @openshift-cherrypick-robot