Skip to content

Commit f3b0b33

Browse files
committed
Shorten tests
1 parent b8d7d33 commit f3b0b33

File tree

1 file changed

+21
-18
lines changed
  • src/integration-tests/bash

1 file changed

+21
-18
lines changed

src/integration-tests/bash/run.sh

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1860,31 +1860,34 @@ function test_suite {
18601860
# shutdown domain2 before create domain3
18611861
shutdown_domain domain2
18621862

1863+
# need to shorten tests as wercker's max runtime is 25 minutes
1864+
if [ ! "${WERCKER}" = "true" ]; then
18631865
# create another domain in the test namespace and verify it
1864-
test_domain_creation domain3 weblogic-operator
1866+
test_domain_creation domain3 weblogic-operator
18651867

1866-
# shutdown domain3
1867-
shutdown_domain domain3
1868+
# shutdown domain3
1869+
shutdown_domain domain3
18681870

1869-
# Create another operator in weblogic-operator-2 namespace, managing namesapce test2
1870-
# the only remaining running domain should not be affacted
1871-
deploy_operator weblogic-operator-2
1872-
verify_domain domain1 weblogic-operator
1871+
# Create another operator in weblogic-operator-2 namespace, managing namesapce test2
1872+
# the only remaining running domain should not be affacted
1873+
deploy_operator weblogic-operator-2
1874+
verify_domain domain1 weblogic-operator
18731875

1874-
# create another domain in the test2 namespace and verify it
1875-
test_domain_creation domain4 weblogic-operator-2
1876+
# create another domain in the test2 namespace and verify it
1877+
test_domain_creation domain4 weblogic-operator-2
18761878

1877-
# Make sure scale up a domain managed by one operator does not impact other domains
1878-
test_cluster_scale domain4 weblogic-operator-2
1879-
verify_domain domain1 weblogic-operator
1879+
# Make sure scale up a domain managed by one operator does not impact other domains
1880+
test_cluster_scale domain4 weblogic-operator-2
1881+
verify_domain domain1 weblogic-operator
18801882

1881-
# scale domain1 up and down, make sure that domain4 is not impacted
1882-
test_domain_lifecycle domain1 weblogic-operator
1883-
verify_domain domain4 weblogic-operator-2
1883+
# scale domain1 up and down, make sure that domain4 is not impacted
1884+
test_domain_lifecycle domain1 weblogic-operator
1885+
verify_domain domain4 weblogic-operator-2
1886+
1887+
# test managed server 1 pod auto-restart
1888+
test_wls_liveness_probe domain1
1889+
fi
18841890

1885-
# test managed server 1 pod auto-restart
1886-
test_wls_liveness_probe domain1
1887-
18881891
# TODO temporarily commenting out test:
18891892
# this test failed in Jenkins run #895 during setup its setup with
18901893
# "ERROR: the domain directory ${domain_dir} does not exist, exiting!"

0 commit comments

Comments
 (0)