Adding OpenShift tests #465

ashetty1 · 2017-11-20T09:55:01Z

For OpenShift, we reuse the functions which we use for k8s tests. So for this purpose, this commit puts those functions into a separate file: tests/e2e/e2e.go

The k8s tests are put under: tests/e2e/e2e_k8s_test.go

The OpenShift tests are in tests/e2e/e2e_os_test.go

The e2e script has been modified to run only k8s tests by default (by using the go test -run k8s)

To run OpenShift tests: go test -run os

surajssd

Why copy code when we can reuse it?

ashetty1 · 2017-11-21T07:46:52Z

@surajssd OpenShift functions are a bit different with arguments passed, and of course, oc commands. We either modify the k8s helper functions to accommodate oc or maintain two different files. I went with the latter because the former option might constrain us in the future.

concaf · 2017-11-21T09:38:43Z

@ashetty1 could you link to the code where we copied this from?

cdrage · 2017-11-21T16:12:25Z

IMO I agree with @surajssd let's modify the current code we have to use both Kubernetes / OpenShift, or even a combination of both (have a flag to say if it's an OpenShift test?) having to separate code-bases will be a hassle.

ashetty1 · 2017-11-22T08:11:46Z

@cdrage sure. Sounds good.

ashetty1 · 2017-11-22T11:10:20Z

@surajssd @cdrage what we could do is use template queries for both kubectl and oc; then it would just be a matter of using one of the binaries while running the cli. This would mean we would move away from k8s go api. Are you okay with that?

surajssd · 2017-11-22T12:19:09Z

@cdrage @ashetty1

so what I think is first let's run our entire test suite that runs on semaphore on openshift(can be started using oc cluster up), that way we ensure that we have moved from k8s to openshift without problems.

@cdrage I had a chat with @ashetty1 where we sorted out how we can reuse the functions. So all the operations which are generic like checking if pod is up or endpoint is responding can use the client-go based already defined functions but things that are openshift specific like checking out if buildconfig is created or imagestream is created can have separate functions.

So

step one, make sure test suite runs on openshift and there is already an issue for that Move from the kubernetes cluster to oc cluster up cluster #376
step two, add openshift specific things reusing as much as possible

cdrage · 2017-11-22T16:20:20Z

@surajssd I agree.

I do suggest that we try and modular it as much as possible (no hardcoded variables specific to OpenShift...) so we can possible push this into a separate repo / to other projects (such as Kompose and other Kubernetes projects).

cdrage · 2017-11-29T16:35:48Z

Saw your changes, they LGTM to me so far. Are you ready for us to do another review @ashetty1 ?

ashetty1 · 2017-12-05T08:26:46Z

@cdrage yes, please. I am working on adding more tests but that won't be affected.

cdrage

Other than 2 small comments, the code LGTM. Does this pass all-green for you dev side? (to be honest, SemaphoreCI is a bit broken right now...)

cdrage · 2017-12-12T19:20:40Z

tests/e2e/e2e_os_test.go

+	// Interval of 5
+	return wait.Poll(5, jobTimeout, func() (bool, error) {
+		var buildOut bool
+		buildStatus, err := runCmd("oc get build --namespace=" + namespace + " --template='{{ range .items }}{{ if (eq .metadata.name \"" +


Maybe add a TODO to this function indicating that this will be eventually replaced by an API? Not too sure.. Maybe we could keep it as using runCmd.

cdrage · 2017-12-12T19:20:51Z

tests/e2e/e2e_os_test.go

+
+func waitForBuildComplete(namespace string, buildName string) error {
+	// Interval of 5
+	return wait.Poll(5, jobTimeout, func() (bool, error) {


make this a global variable so we can change it in the future?

ashetty1 · 2017-12-13T12:14:55Z

@cdrage tests passed locally. Have made the changes you requested for. PTAL.

cdrage · 2017-12-13T14:54:00Z

This LGTM. @surajssd can you do a quick-review and we can merge?

ashetty1 · 2017-12-13T16:41:12Z

@surajssd hold on. Just need to change one line before you review.

ashetty1 · 2017-12-14T07:22:19Z

@surajssd have pushed all the changes.

ashetty1 · 2018-01-02T09:44:36Z

ping @kadel @surajssd, could any of you quickly review this and give this a go.

cdrage · 2018-01-02T21:06:07Z

This may be a lot more work than intended, but I'm converting all the e2e test examples to redis / guestbook-go instead, see here: #554

This code LGTM, but of course, the tests are not. Perhaps wait until I'm done with #554 and you can copy and paste the changes to the OpenShift tests? Does that sound good? @ashetty1

ashetty1 · 2018-01-09T13:46:49Z

Rebased and added s2i tests too.

ashetty1 · 2018-01-10T12:56:37Z

Cc: @cdrage @surajssd

cdrage · 2018-01-10T16:58:07Z

@ashetty1 Thank you! I've tested this locally and it works against minishift.

Are you able to add the VERBOSE and PARALLEL commands similar to: https://github.com/ashetty1/kedge/blob/133f0ed195312caf6092c5719ad28573bf334425/Makefile#L75 so we can run this on Semaphore / CI with verbosity?

For OpenShift, we reuse the functions which we use for \ k8s tests. So for this purpose, this commit puts those \ functions into a separate file: tests/e2e/e2e.go The k8s tests are put under: tests/e2e/e2e_k8s_test.go The OpenShift tests are in tests/e2e/e2e_os_test.go The e2e script has been modified to run only k8s tests \ by default (by using the `go test -run k8s`) To run OpenShift tests: `make test-e2e-os` which runs \ `go test -run os`

ashetty1 · 2018-01-11T11:57:13Z

@cdrage fixed that: make test-e2e-os gets redirected to make test-e2e.

cdrage · 2018-01-11T16:02:06Z

Tested this locally. This LGTM. Let's get this merged in so we can test it on SemaphoreCI.

cdrage · 2018-01-11T16:02:22Z

Thanks so much!

kadel · 2018-01-11T16:24:33Z

it looks like it doesn't work on SemaphoreCI

   Image pull complete
-- Checking Docker daemon configuration ... FAIL
   Error: did not detect an --insecure-registry argument on the Docker daemon
   Solution:

     Ensure that the Docker daemon is running with the following argument:
     	--insecure-registry 172.30.0.0/16

https://semaphoreci.com/cdrage/kedge/branches/master/builds/222

ashetty1 · 2018-01-11T16:45:37Z

@kadel @cdrage To run oc cluster up, we need to add that to the docker config: https://github.com/openshift/origin/blob/master/docs/cluster_up_down.md#getting-started

cdrage · 2018-01-11T17:41:50Z

@kadel I'm on it, haha. Been troubleshooting. I'm using minishift now on SemaphoreCI.

kadel · 2018-01-15T10:49:05Z

Still failing :-( It is false PASS :-(

For OpenShift, we reuse the functions which we use for \ k8s tests. So for this purpose, this commit puts those \ functions into a separate file: tests/e2e/e2e.go The k8s tests are put under: tests/e2e/e2e_k8s_test.go The OpenShift tests are in tests/e2e/e2e_os_test.go The e2e script has been modified to run only k8s tests \ by default (by using the `go test -run k8s`) To run OpenShift tests: `make test-e2e-os` which runs \ `go test -run os`

cdrage · 2018-01-15T14:17:51Z

@kadel Issue has been opened here: #568 (comment) to troubleshoot this week what's happening.

For OpenShift, we reuse the functions which we use for \ k8s tests. So for this purpose, this commit puts those \ functions into a separate file: tests/e2e/e2e.go The k8s tests are put under: tests/e2e/e2e_k8s_test.go The OpenShift tests are in tests/e2e/e2e_os_test.go The e2e script has been modified to run only k8s tests \ by default (by using the `go test -run k8s`) To run OpenShift tests: `make test-e2e-os` which runs \ `go test -run os`

surajssd suggested changes Nov 21, 2017

View reviewed changes

ashetty1 force-pushed the openshift_test branch from a059d16 to c77a092 Compare November 28, 2017 10:41

ashetty1 changed the title ~~[WIP] Adding OpenShift tests~~ Adding OpenShift tests Nov 28, 2017

ashetty1 force-pushed the openshift_test branch 2 times, most recently from 9237042 to ca862b7 Compare December 7, 2017 10:29

cdrage approved these changes Dec 12, 2017

View reviewed changes

ashetty1 force-pushed the openshift_test branch 2 times, most recently from 4fcccef to 18f2430 Compare December 13, 2017 10:19

ashetty1 force-pushed the openshift_test branch from 18f2430 to a2b2577 Compare December 14, 2017 07:20

kadel added the status/needs-rebase label Jan 4, 2018

ashetty1 force-pushed the openshift_test branch from a2b2577 to 133f0ed Compare January 9, 2018 13:44

ashetty1 mentioned this pull request Jan 9, 2018

Adding tests for s2i #534

Open

ashetty1 force-pushed the openshift_test branch from 133f0ed to 95137ef Compare January 11, 2018 11:55

ashetty1 mentioned this pull request Jan 11, 2018

add support for openshift in e2e tests #375

Closed

cdrage merged commit caf3053 into kedgeproject:master Jan 11, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding OpenShift tests #465

Adding OpenShift tests #465

ashetty1 commented Nov 20, 2017 •

edited

Loading

surajssd left a comment

ashetty1 commented Nov 21, 2017

concaf commented Nov 21, 2017

cdrage commented Nov 21, 2017

ashetty1 commented Nov 22, 2017

ashetty1 commented Nov 22, 2017

surajssd commented Nov 22, 2017 •

edited

Loading

cdrage commented Nov 22, 2017

cdrage commented Nov 29, 2017 •

edited

Loading

ashetty1 commented Dec 5, 2017

cdrage left a comment

cdrage Dec 12, 2017

cdrage Dec 12, 2017

ashetty1 commented Dec 13, 2017

cdrage commented Dec 13, 2017

ashetty1 commented Dec 13, 2017

ashetty1 commented Dec 14, 2017

ashetty1 commented Jan 2, 2018

cdrage commented Jan 2, 2018

ashetty1 commented Jan 9, 2018

ashetty1 commented Jan 10, 2018

cdrage commented Jan 10, 2018

ashetty1 commented Jan 11, 2018

cdrage commented Jan 11, 2018

cdrage commented Jan 11, 2018

kadel commented Jan 11, 2018

ashetty1 commented Jan 11, 2018

cdrage commented Jan 11, 2018

kadel commented Jan 15, 2018

cdrage commented Jan 15, 2018 •

edited

Loading

Adding OpenShift tests #465

Adding OpenShift tests #465

Conversation

ashetty1 commented Nov 20, 2017 • edited Loading

surajssd left a comment

Choose a reason for hiding this comment

ashetty1 commented Nov 21, 2017

concaf commented Nov 21, 2017

cdrage commented Nov 21, 2017

ashetty1 commented Nov 22, 2017

ashetty1 commented Nov 22, 2017

surajssd commented Nov 22, 2017 • edited Loading

cdrage commented Nov 22, 2017

cdrage commented Nov 29, 2017 • edited Loading

ashetty1 commented Dec 5, 2017

cdrage left a comment

Choose a reason for hiding this comment

cdrage Dec 12, 2017

Choose a reason for hiding this comment

cdrage Dec 12, 2017

Choose a reason for hiding this comment

ashetty1 commented Dec 13, 2017

cdrage commented Dec 13, 2017

ashetty1 commented Dec 13, 2017

ashetty1 commented Dec 14, 2017

ashetty1 commented Jan 2, 2018

cdrage commented Jan 2, 2018

ashetty1 commented Jan 9, 2018

ashetty1 commented Jan 10, 2018

cdrage commented Jan 10, 2018

ashetty1 commented Jan 11, 2018

cdrage commented Jan 11, 2018

cdrage commented Jan 11, 2018

kadel commented Jan 11, 2018

ashetty1 commented Jan 11, 2018

cdrage commented Jan 11, 2018

kadel commented Jan 15, 2018

cdrage commented Jan 15, 2018 • edited Loading

ashetty1 commented Nov 20, 2017 •

edited

Loading

surajssd commented Nov 22, 2017 •

edited

Loading

cdrage commented Nov 29, 2017 •

edited

Loading

cdrage commented Jan 15, 2018 •

edited

Loading