changes for review comments

Author: vanajamukkara

integration-tests/README.md

@@ -198,15 +198,23 @@ K8sTestUtils - uses k8s java client api, this is used only for delete domain use
 
 * Maven and latest Git should be in PATH
 * export JAVA_HOME
-
-Command to run the tests:
+* export WEBLOGIC_IMAGE_NAME and WEBLOGIC_IMAGE_TAG if different from store/oracle/weblogic and 12.2.1.3
+* Setup docker access to WebLogic 12c Images <br>
+Method 1 <br>
+	* Setup a personal account on hub.docker.com
+	* Then sign in to hub.docker.com and signup for access to WebLogic 12c Images via https://hub.docker.com/_/oracle-weblogic-server-12c
+	* Then export the following before running the tests: 
 ```
 export DOCKER_USERNAME=<docker_username>
 export DOCKER_PASSWORD=<docker_password>
 export DOCKER_EMAIL=<docker_email>
-or
-make sure the weblogic image i.e. store/oracle/weblogic:12.2.1.3 already exists locally
-
+```
+Method 2 <br>
+	* Make sure the weblogic image i.e. store/oracle/weblogic:12.2.1.3 already exists locally
+	* Make sure the weblogic image has patch p29135930 (required for the WebLogic Kubernetes Operator). 
+		* If not, see [https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-patch-wls-for-k8s].
+* Command to run the tests: 
+```
 mvn clean verify -P java-integration-tests 2>&1 | tee log.txt
 ```
 

integration-tests/src/test/resources/deploywebapp.py

@@ -5,18 +5,18 @@
 
 connect(sys.argv[1],sys.argv[2],sys.argv[3])
 deploy(sys.argv[4],sys.argv[5],sys.argv[6],upload='false',remote='false')
-systime.sleep(30)
+#systime.sleep(15)
 
-cd ('AppDeployments')
-myapps=cmo.getAppDeployments()
+#cd ('AppDeployments')
+#myapps=cmo.getAppDeployments()
 
-for appName in myapps:
-       domainConfig()
-       cd ('/AppDeployments/'+appName.getName()+'/Targets')
-       mytargets = ls(returnMap='true')
-       domainRuntime()
-       cd('AppRuntimeStateRuntime')
-       cd('AppRuntimeStateRuntime')
-       for targetinst in mytargets:
-             curstate4=cmo.getCurrentState(appName.getName(),targetinst)
-             print '-----------', curstate4, '-----------', appName.getName()
+#for appName in myapps:
+#       domainConfig()
+#       cd ('/AppDeployments/'+appName.getName()+'/Targets')
+#       mytargets = ls(returnMap='true')
+#       domainRuntime()
+#       cd('AppRuntimeStateRuntime')
+#       cd('AppRuntimeStateRuntime')
+#       for targetinst in mytargets:
+#             curstate4=cmo.getCurrentState(appName.getName(),targetinst)
+#             print '-----------', curstate4, '-----------', appName.getName()

integration-tests/src/test/resources/statedump.sh

@@ -91,7 +91,7 @@ function state_dump {
    			fi
 	 	else
      		# command failed
-  			cat $RESULT_DIR/pvarchive.b64 | head -30
+  			cat $RESULT_DIR/pvarchive.b64 | head -100
 	 	fi
 	 	# rm $RESULT_DIR/pvarchive.b64
   	else