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

tighten scc test to start failing on more than six pods failing #25608

Merged
merged 2 commits into from Oct 21, 2020

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Oct 13, 2020

This will help prevent regressions.

@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 13, 2020
@openshift-ci-robot
Copy link

@deads2k: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-csi 82023c3 link /test e2e-aws-csi
ci/prow/e2e-cmd 82023c3 link /test e2e-cmd
ci/prow/e2e-aws-fips 82023c3 link /test e2e-aws-fips

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

@deads2k
Copy link
Contributor Author

deads2k commented Oct 15, 2020

/cherrypick release-4.6

@openshift-cherrypick-robot

@deads2k: once the present PR merges, I will cherry-pick it on top of release-4.6 in a new PR and assign it to you.

In response to this:

/cherrypick release-4.6

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.

// this currently uses an install config because it has a lower dependency threshold than going directly to the node.
installConfig, err := installConfigFromCluster(client)
if err != nil {
return false, nil
Copy link
Contributor

Choose a reason for hiding this comment

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

not err?

}
data, ok := cm.Data["install-config"]
if !ok {
return nil, fmt.Errorf("No install-config found in kube-system/%s", installConfigName)
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: lowercase errors

@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Oct 21, 2020
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 21, 2020
@deads2k deads2k added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Oct 21, 2020
@deads2k
Copy link
Contributor Author

deads2k commented Oct 21, 2020

nits fixed.

@deads2k
Copy link
Contributor Author

deads2k commented Oct 21, 2020

/retest

@sttts
Copy link
Contributor

sttts commented Oct 21, 2020

/retest
/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, sttts

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 8deac14 into openshift:master Oct 21, 2020
@openshift-cherrypick-robot

@deads2k: #25608 failed to apply on top of branch "release-4.6":

Applying: tighten scc test to start failing on more than six pods failing
Applying: allow SCC to fail more often on fips
Using index info to reconstruct a base tree...
A	test/extended/security/fips.go
M	test/extended/util/client.go
Falling back to patching base and 3-way merge...
Auto-merging test/extended/util/client.go
CONFLICT (modify/delete): test/extended/security/fips.go deleted in HEAD and modified in allow SCC to fail more often on fips. Version allow SCC to fail more often on fips of test/extended/security/fips.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 allow SCC to fail more often on fips
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:

/cherrypick release-4.6

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.

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

5 participants