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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move debug.sh & timeout.sh to a proper e2e #25638

Merged
merged 4 commits into from Oct 28, 2020

Conversation

soltysh
Copy link
Member

@soltysh soltysh commented Oct 27, 2020

In comparison with the original I:

  • fixed the messages checked in debug.sh which somehow were completely wrong 馃檧
  • fixed the messages which were responsible for many timeout.sh failures
  • removed some duplicate tests for --keep-readiness and --keep-liveness b/c they were checking empty string

/assign @sallyom

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 27, 2020
@soltysh
Copy link
Member Author

soltysh commented Oct 28, 2020

/retest

@sallyom
Copy link
Contributor

sallyom commented Oct 28, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 28, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sallyom, soltysh

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 139860a into openshift:master Oct 28, 2020
@soltysh soltysh deleted the test_cmd2 branch October 29, 2020 10:44
@hardys
Copy link

hardys commented Jan 11, 2022

/cherry-pick release-4.9

@hardys
Copy link

hardys commented Jan 11, 2022

Looks like backporting this will solve https://bugzilla.redhat.com/show_bug.cgi?id=1998963

@openshift-cherrypick-robot

@hardys: #25638 failed to apply on top of branch "release-4.9":

Applying: Squash methods into a single used one
Using index info to reconstruct a base tree...
M	test/extended/util/framework.go
Falling back to patching base and 3-way merge...
Auto-merging test/extended/util/framework.go
No changes -- Patch already applied.
Applying: Move timeout.sh to a proper e2e
Using index info to reconstruct a base tree...
A	test/extended/testdata/cmd/test/cmd/timeout.sh
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in test/extended/cli/timeout.go
Auto-merging test/extended/cli/timeout.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Move timeout.sh to a proper e2e
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.9

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.

@soltysh
Copy link
Member Author

soltysh commented Jan 11, 2022

@hardys you'll likely need to pick manually what you care about since that's one of many PRs rewriting the tests, so it might not be that simple to backport 馃槥

@hardys
Copy link

hardys commented Jan 11, 2022

Thanks @soltysh - I was mistaken anyway - the change I need was in #26415 where the hard-coded busybox image was removed on master, but we're now seeing failures in 4.9 jobs due to the check for only known images

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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants