Fix and enable basetests in CI following MODCLUSTER-797 resolution.

modcluster · Aug 10, 2023 · 58a11c7 · 58a11c7
1 parent 7767403
commit 58a11c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -175,7 +175,7 @@ jobs:
           res=0
           # Those are currently all tests we have. In CI only MODCLUSTER-{734,755}/testit.sh pass, so until we fix the issue, only these tests are enabled.
           # basetests.sh hangingtests.sh maintests.sh JBCS-1236/testit.sh MODCLUSTER-640/testit.sh MODCLUSTER-734/testit.sh MODCLUSTER-755/testit.sh MODCLUSTER-785/testit.sh
-          for testcase in MODCLUSTER-734/testit.sh MODCLUSTER-755/testit.sh
+          for testcase in basetests.sh MODCLUSTER-734/testit.sh MODCLUSTER-755/testit.sh
           do
             run_test $testcase $(echo $testcase | cut -f1 -d/)
             res=$(expr $res + $?)

diff --git a/test/basetests.sh b/test/basetests.sh
@@ -13,7 +13,10 @@ tomcat_wait_for_n_nodes 2  || exit 1
 
 # Copy testapp and wait for its start
 docker cp testapp tomcat8081:/usr/local/tomcat/webapps
-sleep 10
+
+# The above statement relies on 'autoDeploy' to be enabled in Tomcat; and while the scan interval of auto deploy is 10 seconds,
+# this needs to be adequately higher to propagate the MCMP commands to the reverse proxies in time.
+sleep 12
 
 # Basic 200 and 404 tests.
 echo "basic 200 and 404 tests"