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

Run java test specs in parallel #1844

Merged
merged 7 commits into from
Jul 9, 2019
Merged

Run java test specs in parallel #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39628e5
Run java test specs in parallel
amitkrout Jun 20, 2019
05eefd3
Updated binary path
amitkrout Jun 20, 2019
3d3e362
Updated doc
amitkrout Jun 26, 2019
a7d0ae9
Commented one spec
amitkrout Jun 26, 2019
d03d443
Commented one more spec
amitkrout Jun 26, 2019
ef07e77
Updated test file
amitkrout Jun 28, 2019
eaf98ac
Updated doc
amitkrout Jul 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ test-cmp-sub-e2e:
# Run java e2e tests
.PHONY: test-java-e2e
test-java-e2e:
go test -v github.com/openshift/odo/tests/integration --ginkgo.focus="odoJavaE2e" -ginkgo.slowSpecThreshold=$(SLOW_SPEC_THRESHOLD) -ginkgo.v -timeout $(TIMEOUT)
ginkgo -v -nodes=$(TEST_EXEC_NODES) -focus="odoJavaE2e" slowSpecThreshold=$(SLOW_SPEC_THRESHOLD) -randomizeAllSpecs tests/integration/ -timeout $(TIMEOUT)

# Run source e2e tests
.PHONY: test-source-e2e
Expand Down
32 changes: 23 additions & 9 deletions docs/development.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,68 +231,82 @@ $ make test-link-e2e
----
+

Run java source integration test
+
----
$ make test-java-e2e
----
+

* To run the test sequentially or on single ginkgo test node use enviornment variable `TEST_EXEC_NODES`:
+
Run component command integration test
+
----
$ make test-cmp-e2e TEST_EXEC_NODES=1
$ TEST_EXEC_NODES=1 make test-cmp-e2e
----
+

Run application command integration test
+
----
$ make test-cmd-app TEST_EXEC_NODES=1
$ TEST_EXEC_NODES=1 make test-cmd-app
----
+

Run storage command integration test
+
----
$ make test-cmd-storage TEST_EXEC_NODES=1
$ TEST_EXEC_NODES=1 make test-cmd-storage
----
+

Run watch command integration test
+
----
$ make test-watch-e2e TEST_EXEC_NODES=1
$ TEST_EXEC_NODES=1 make test-watch-e2e
----
+

Run config/preference command integration test
+
----
$ make test-odo-config TEST_EXEC_NODES=1
$ TEST_EXEC_NODES=1 make test-odo-config
----
+

Run generic integration test
+
----
$ make test-generic TEST_EXEC_NODES=1
$ TEST_EXEC_NODES=1 make test-generic
----
+

Run json output integration test
+
----
$ make test-json-format-output TEST_EXEC_NODES=1
$ TEST_EXEC_NODES=1 make test-json-format-output
----
+

Run service command integration test
+
----
$ make test-service-e2e TEST_EXEC_NODES=1
$ TEST_EXEC_NODES=1 make test-service-e2e
----
+

Run link/unlink command integration test
+
----
$ make test-link-e2e TEST_EXEC_NODES=1
$ TEST_EXEC_NODES=1 make test-link-e2e
----
+

Run java source integration test
+
----
$ TEST_EXEC_NODES=1 make test-java-e2e
----
+

Expand Down
60 changes: 33 additions & 27 deletions tests/integration/java_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,33 @@ package integration

import (
"os"
"path/filepath"
"time"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/openshift/odo/tests/helper"
)

const javaFiles = "examples/binary/java/"

var _ = Describe("odoJavaE2e", func() {
var project string
var context string
var oc helper.OcRunner
// This is run after every Spec (It)
var _ = BeforeEach(func() {
SetDefaultEventuallyTimeout(10 * time.Minute)
oc = helper.NewOcRunner("oc")
project = helper.CreateRandProject()
context = helper.CreateNewContext()
os.Setenv("GLOBALODOCONFIG", filepath.Join(context, "config.yaml"))
})

// Clean up after the test
// This is run after every Spec (It)
var _ = AfterEach(func() {
helper.DeleteProject(project)
os.RemoveAll(".odo")
helper.DeleteDir(context)
os.Unsetenv("GLOBALODOCONFIG")
})

// contains a minimal javaee app
Expand All @@ -38,72 +41,75 @@ var _ = Describe("odoJavaE2e", func() {
Context("odo component creation", func() {
It("Should be able to deploy a git repo that contains a wildfly application without wait flag", func() {
helper.CmdShouldPass("odo", "create", "wildfly", "wo-wait-javaee-git-test", "--project",
project, "--ref", "master", "--git", warGitRepo)
project, "--ref", "master", "--git", warGitRepo, "--context", context)

// Create a URL
helper.CmdShouldPass("odo", "url", "create", "gitrepo", "--port", "8080")
helper.CmdShouldPass("odo", "push", "-v", "4")
routeURL := helper.DetermineRouteURL("")
helper.CmdShouldPass("odo", "url", "create", "gitrepo", "--port", "8080", "--context", context)
helper.CmdShouldPass("odo", "push", "-v", "4", "--context", context)
routeURL := helper.DetermineRouteURL(context)

// Ping said URL
helper.HttpWaitFor(routeURL, "Insult", 90, 1)

// Delete the component
helper.CmdShouldPass("odo", "delete", "wo-wait-javaee-git-test", "-f")
helper.CmdShouldPass("odo", "delete", "wo-wait-javaee-git-test", "-f", "--context", context)
})

It("Should be able to deploy a .war file using wildfly", func() {
// https://github.com/openshift/odo/issues/1846
/*It("Should be able to deploy a .war file using wildfly", func() {
helper.CopyExample(filepath.Join("binary", "java", "wildfly"), context)
helper.CmdShouldPass("odo", "create", "wildfly", "javaee-war-test", "--project",
project, "--binary", "../examples/binary/java/wildfly/ROOT.war")
project, "--binary", filepath.Join(context, "ROOT.war"), "--context", context)

// Create a URL
helper.CmdShouldPass("odo", "url", "create", "warfile", "--port", "8080")
helper.CmdShouldPass("odo", "push")
routeURL := helper.DetermineRouteURL("")
helper.CmdShouldPass("odo", "url", "create", "warfile", "--port", "8080", "--context", context)
helper.CmdShouldPass("odo", "push", "--context", context)
routeURL := helper.DetermineRouteURL(context)

// Ping said URL
helper.HttpWaitFor(routeURL, "Sample", 90, 1)

// Delete the component
helper.CmdShouldPass("odo", "delete", "javaee-war-test", "-f")
})
helper.CmdShouldPass("odo", "delete", "javaee-war-test", "-f", "--context", context)
})*/

It("Should be able to deploy a git repo that contains a java uberjar application using openjdk", func() {
oc.ImportJavaIsToNspace(project)

// Deploy the git repo / wildfly example
helper.CmdShouldPass("odo", "create", "java", "uberjar-git-test", "--project",
project, "--ref", "master", "--git", jarGitRepo)
project, "--ref", "master", "--git", jarGitRepo, "--context", context)

// Create a URL
helper.CmdShouldPass("odo", "url", "create", "uberjar", "--port", "8080")
helper.CmdShouldPass("odo", "push")
routeURL := helper.DetermineRouteURL("")
helper.CmdShouldPass("odo", "url", "create", "uberjar", "--port", "8080", "--context", context)
helper.CmdShouldPass("odo", "push", "--context", context)
routeURL := helper.DetermineRouteURL(context)

// Ping said URL
helper.HttpWaitFor(routeURL, "Hello World", 90, 1)

// Delete the component
helper.CmdShouldPass("odo", "delete", "uberjar-git-test", "-f")
helper.CmdShouldPass("odo", "delete", "uberjar-git-test", "-f", "--context", context)
})

It("Should be able to deploy a spring boot uberjar file using openjdk", func() {
// https://github.com/openshift/odo/issues/1846
Copy link
Contributor

Choose a reason for hiding this comment

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

I am assuming these tests do not pass as of now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, you are right.

Copy link
Contributor

Choose a reason for hiding this comment

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

It would be a good idea to record this as an issue so we remember to fix it

/*It("Should be able to deploy a spring boot uberjar file using openjdk", func() {
oc.ImportJavaIsToNspace(project)

helper.CmdShouldPass("odo", "create", "java", "sb-jar-test", "--project",
project, "--binary", "../examples/binary/java/openjdk/sb.jar")
project, "--binary", "../examples/binary/java/openjdk/sb.jar", "--context", context)

// Create a URL
helper.CmdShouldPass("odo", "url", "create", "uberjaropenjdk", "--port", "8080")
helper.CmdShouldPass("odo", "push")
routeURL := helper.DetermineRouteURL("")
helper.CmdShouldPass("odo", "url", "create", "uberjaropenjdk", "--port", "8080", "--context", context)
helper.CmdShouldPass("odo", "push", "--context", context)
routeURL := helper.DetermineRouteURL(context)

// Ping said URL
helper.HttpWaitFor(routeURL, "HTTP Booster", 90, 1)

// Delete the component
helper.CmdShouldPass("odo", "delete", "sb-jar-test", "-f")
})
helper.CmdShouldPass("odo", "delete", "sb-jar-test", "-f", "--context", context)
})*/

})
})