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

Update test to run on OpenShift #350

Merged
merged 2 commits into from
Apr 4, 2019
Merged

Update test to run on OpenShift #350

merged 2 commits into from
Apr 4, 2019

Conversation

kevinearls
Copy link
Contributor

Signed-off-by: Kevin Earls kearls@redhat.com

This resolves #327 by taking actions that are needed to permit this test to run on OpenShift. Part of the solution is a bit hacky as it uses os.Exec to call the "oc adm" command, which means the oc client needs to be on the path wherever this test is being run.

It would be preferable to use either the OpenShift Go client of the Rest API to do this, but we don't use those anywhere else in the tests and adding them would be non-trivial. I will open an issue to do this in the future.

Signed-off-by: Kevin Earls <kearls@redhat.com>
@jpkrohling
Copy link
Contributor

This change is Reviewable

@codecov
Copy link

codecov bot commented Apr 2, 2019

Codecov Report

Merging #350 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #350   +/-   ##
=======================================
  Coverage   89.88%   89.88%           
=======================================
  Files          64       64           
  Lines        3035     3035           
=======================================
  Hits         2728     2728           
  Misses        207      207           
  Partials      100      100

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3b6e569...6117d64. Read the comment docs.

@kevinearls
Copy link
Contributor Author

@jpkrohling @objectiser Please review.

Copy link
Contributor

@objectiser objectiser left a comment

Choose a reason for hiding this comment

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

LGTM - but @jpkrohling should also check.

Copy link
Contributor

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

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

:lgtm: , just a couple of minor, non-blocking things.

Reviewed 2 of 2 files at r1.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @kevinearls)


test/e2e/daemonset.go, line 50 at r1 (raw file):

		}

		cmd := exec.Command("oc", "adm", "--namespace", namespace, "policy",  "add-scc-to-user", "daemonset-with-hostport", "-z", "default")

Could you add a code comment, explaining your choice? Like, "ideally, we would use the REST API, but for a single-usage within the project, this is the simplest solution that works".


test/e2e/daemonset.go, line 214 at r1 (raw file):

}

func hostportSccDaemonset() (*osv1sec.SecurityContextConstraints) {

s/hostport/hostPort/?

…et method

Signed-off-by: Kevin Earls <kearls@redhat.com>
Copy link
Contributor

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r2.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@kevinearls
Copy link
Contributor Author

@objectiser @jpkrohling Can one of you guys merge this? Juca I assume the code-review/reviewable failure is because you turned that off?

@jpkrohling
Copy link
Contributor

That's correct. Sorry I didn't merge it earlier, I was holding it off until I executed the tests locally and ran into #355, but I assume you tested it as well.

@jpkrohling jpkrohling merged commit aa7de57 into jaegertracing:master Apr 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update DaemonsetTest to work on OpenShift
3 participants