Skip to content

USHIFT-1733: 1733 reenable after cleanup#2425

Merged
openshift-ci[bot] merged 2 commits intoopenshift:mainfrom
eggfoobar:1733-reenable-after-cleanup
Oct 3, 2023
Merged

USHIFT-1733: 1733 reenable after cleanup#2425
openshift-ci[bot] merged 2 commits intoopenshift:mainfrom
eggfoobar:1733-reenable-after-cleanup

Conversation

@eggfoobar
Copy link
Contributor

@eggfoobar eggfoobar commented Oct 3, 2023 •
edited
Loading

Continuation of #2417
/assign @pacevedom

@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 3, 2023 •
edited by openshift-ci bot
Loading

@eggfoobar: This pull request references USHIFT-1733 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

/assign @pacevedom

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-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 3, 2023
@openshift-ci openshift-ci bot requested review from ggiguash and jogeo October 3, 2023 04:41
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 3, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 3, 2023 •
edited by openshift-ci bot
Loading

@eggfoobar: This pull request references USHIFT-1733 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

/assign @pacevedom

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-ci-robot
Copy link

openshift-ci-robot commented Oct 3, 2023 •
edited by openshift-ci bot
Loading

@eggfoobar: This pull request references USHIFT-1733 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

Continuation of #2417
/assign @pacevedom

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-ci
Copy link
Contributor

openshift-ci bot commented Oct 3, 2023

@eggfoobar: all tests passed!

Full PR test history. Your PR dashboard.

Details

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

pacevedom
pacevedom reviewed Oct 3, 2023
View reviewed changes
@eggfoobar
altered to get kubeconfig after hostname change
14b6751 
added setup kubeconfig keyword to get new potential kubeconfig after
microshift start

Signed-off-by: ehila <ehila@redhat.com>
@eggfoobar eggfoobar force-pushed the 1733-reenable-after-cleanup branch from 4eb5ea3 to 14b6751 Compare October 3, 2023 12:14
pacevedom
pacevedom approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@pacevedom pacevedom 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
Copy link
Contributor

openshift-ci bot commented Oct 3, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eggfoobar, pacevedom

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:
  • OWNERS [eggfoobar,pacevedom]

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 lgtm Indicates that a PR is ready to be merged. label Oct 3, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 3, 2023 •
edited by openshift-ci bot
Loading

@eggfoobar: This pull request references USHIFT-1733 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

Continuation of #2417
/assign @pacevedom

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-merge-robot
Copy link
Contributor

openshift-merge-robot commented Oct 3, 2023

@eggfoobar: all tests passed!

Full PR test history. Your PR dashboard.

Details

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

@openshift-ci openshift-ci bot merged commit 983b137 into openshift:main Oct 3, 2023
@eggfoobar eggfoobar mentioned this pull request Oct 3, 2023
Closed
@eggfoobar
Copy link
Contributor Author

eggfoobar commented Oct 3, 2023

/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 3, 2023

@eggfoobar: #2425 failed to apply on top of branch "release-4.14":

Applying: re-enable microshift.service after cleanup
Using index info to reconstruct a base tree...
M	test/resources/microshift-process.resource
M	test/suites/standard/hostname.robot
Falling back to patching base and 3-way merge...
Auto-merging test/suites/standard/hostname.robot
CONFLICT (content): Merge conflict in test/suites/standard/hostname.robot
Auto-merging test/resources/microshift-process.resource
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 re-enable microshift.service after cleanup
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".
Details

In response to this:

/cherry-pick release-4.14

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.

@eggfoobar eggfoobar mentioned this pull request Oct 3, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ggiguash ggiguash Awaiting requested review from ggiguash

@jogeo jogeo Awaiting requested review from jogeo

1 more reviewer

@pacevedom pacevedom pacevedom approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@pacevedom pacevedom

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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.

6 participants

@eggfoobar @openshift-ci-robot @openshift-merge-robot @openshift-cherrypick-robot @pacevedom @pmtk