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

Make admission extended tests dockerless #21416

Merged
merged 1 commit into from
Nov 14, 2018
Merged

Make admission extended tests dockerless #21416

merged 1 commit into from
Nov 14, 2018

Conversation

dmage
Copy link
Contributor

@dmage dmage commented Nov 2, 2018 •
edited
Loading

Fixes 2 of 4 tests described at #20079.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 2, 2018
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 2, 2018
@dmage dmage requested review from bparees and legionus and removed request for danwinship and squeed November 2, 2018 15:52
@dmage
Copy link
Contributor Author

dmage commented Nov 2, 2018

/test extended_image_registry

bparees
bparees reviewed Nov 2, 2018
View reviewed changes
test/extended/images/helper.go Outdated
return "", err
}

registryHost, err := GetDockerRegistryURL(oc)
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think this is going to work. The extended tests don't run within the cluster network anymore, so when you want to interact with a cluster service you need to run your logic within a pod on the cluster.

So either you need to create a route for the registry and then talk to it over that, or (harder) find a way to move this logic into a pod context.

@bparees
Copy link
Contributor

bparees commented Nov 2, 2018

other than the cluster-network access problem, the general concept looks good...

@bparees
Copy link
Contributor

bparees commented Nov 2, 2018

@dmage you want /test e2e-gcp-image-registry now.

@dmage
Copy link
Contributor Author

dmage commented Nov 5, 2018

other than the cluster-network access problem

Well, in fact, it makes the main idea of this PR (replace Docker push with the Go client) not viable. Apparently we'll need to rewrite each test from scratch, considering new restrictions.

@dmage
Copy link
Contributor Author

dmage commented Nov 5, 2018

/test all

@dmage
Copy link
Contributor Author

dmage commented Nov 5, 2018

/retest

@bparees
Copy link
Contributor

bparees commented Nov 5, 2018

Well, in fact, it makes the main idea of this PR (replace Docker push with the Go client) not viable. Apparently we'll need to rewrite each test from scratch, considering new restrictions.

can you make use of oc image mirror instead?

@bparees
Copy link
Contributor

bparees commented Nov 5, 2018

nm, that would have the same issue of not being able to reach the registry service.

@dmage dmage force-pushed the dockerless branch 3 times, most recently from b10baa6 to c3f3f14 Compare November 13, 2018 10:45
@dmage dmage changed the title [WIP] Make registry extended tests dockerless Make admission extended tests dockerless Nov 13, 2018
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 13, 2018
@dmage
Copy link
Contributor Author

dmage commented Nov 13, 2018

@bparees I've updated only tests for quota admission and limit range admission. The tests are green.

I'm not sure what to do with pruning tests, oc adm prune images wants to access the registry. And oc.Run("adm").Args("prune", "images") can't be used anymore because our registry isn't exposed. Should I create a pod and copy the oc tool inside? Or should it be a follow up pull request?

bparees
bparees reviewed Nov 13, 2018
View reviewed changes
test/extended/imageapis/quota_admission.go Outdated
waitTimeout = time.Second * 600
)

var _ = g.Describe("[Feature:ImageQuota][registry][Serial][Suite:openshift/registry/serial][local] Image resource quota", func() {
var _ = g.Describe("[Feature:ImageQuota] Image resource quota", func() {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this means the test will get run in conformance, but did you confirm you saw it run in one of the job outputs?

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not seeing it listed in either e2e-gcp or e2e-gcp-image-registry.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Feature:ImageQuota is disabled in

origin/test/extended/util/test.go

Line 285 in 027d88e

`\[Feature:ImageQuota\]`, // Quota isn't turned on by default, we should do that and then reenable these tests

And this test no longer depends on the registry, so I removed the [registry] tag.

Copy link
Contributor

Choose a reason for hiding this comment

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

I see... well assuming this test works (because image quota is on by default now?) let's re-enable it. If it still can't be run, i guess this is fine.

I see we have another test in the same boat (limitrange_admission).

@bparees
Copy link
Contributor

bparees commented Nov 13, 2018

Should I create a pod and copy the oc tool inside?

yes (you can pick an image that already has the oc tool in it, but yes). The typical pattern there is to launch a pod w/ an cmd of "sleep 60000" and then exec into it.

Or should it be a follow up pull request?

yes, do it as a follow up, let's merge what you've got already.

@bparees
Copy link
Contributor

bparees commented Nov 13, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 13, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, dmage

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 13, 2018
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

6 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 14, 2018 •
edited
Loading

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

Test name Commit Details Rerun command
ci/prow/e2e-conformance-k8s abc5c15 link /test e2e-conformance-k8s
ci/prow/e2e-gcp-crio abc5c15 link /test e2e-gcp-crio
ci/prow/e2e-gcp-launch abc5c15 link /test e2e-gcp-launch
ci/prow/e2e-gcp-builds abc5c15 link /test e2e-gcp-builds
ci/prow/e2e-gcp-image-ecosystem abc5c15 link /test e2e-gcp-image-ecosystem

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 7fd08af into openshift:master Nov 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bparees bparees bparees left review comments

@legionus legionus Awaiting requested review from legionus

Assignees

@bparees bparees

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dmage @bparees @openshift-ci-robot @openshift-bot @openshift-merge-robot