reset ITOperator.props, corrected indented lines, cleaned commented out lines

Author: marinakog

integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java

@@ -1257,16 +1257,6 @@ public static void buildDeployWebServiceAppInPod(
     String domainNS = domain.getDomainNS();
     int managedServerPort = ((Integer) (domain.getDomainMap()).get("managedServerPort")).intValue();
     String wsServiceName = (args.length == 0) ? BaseTest.TESTWSSERVICE : args[0];
-    /*
-    String clusterURL =
-        domain.getDomainUid()
-            + "-cluster-"
-            + domain.getClusterName()
-            + "."
-            + domainNS
-            + ".svc.cluster.local:"
-            + managedServerPort;
-            */
     String clusterURL =
         retrieveClusterIP(domain.getDomainUid(), domain.getClusterName(), domainNS)
             + ":"

integration-tests/src/test/resources/OperatorIT.properties

@@ -5,5 +5,5 @@ baseDir=/scratch
 #wls admin user
 username=weblogic
 password=welcome1
-maxIterationsPod=50
+maxIterationsPod=25
 waitTimePod=10

integration-tests/src/test/resources/apps/buildDeployWSAndWSClientAppInPod.sh

@@ -56,20 +56,20 @@ echo -e "curl --noproxy '*' --silent  --user ${USER}:${PASSWORD} -H X-Requested-
 curl --noproxy '*' --silent  --user ${USER}:${PASSWORD} -H X-Requested-By:MyClient -H Accept:application/json -H Content-Type:multipart/form-data -F "model={ name: '${APP_NAME}', targets: [ { identity: [ clusters, '${DEPLOY_TARGET}' ] } ] }" -F "sourcePath=@${ARCHIVE_FILE_WS}" -H "Prefer:respond-async" -X POST http://${HOST}:${PORT}/management/weblogic/latest/edit/appDeployments -o ${APP_DIR_INPOD}/deployWS.out
 sleep 10
 grep -q "STATE_RUNNING" ${APP_DIR_INPOD}/deployWS.out
- cres=$?
- [[ $cres != 0 ]] && echo "[FAIL] Unable to deploy wsapp ..."
- [[ $cres == 0 ]] && echo "[SUCCESS] wsapp is deployed  ..."
+cres=$?
+[[ $cres != 0 ]] && echo "[FAIL] Unable to deploy wsapp ..." && exit -1
+[[ $cres == 0 ]] && echo "[SUCCESS] wsapp is deployed  ..."
 
 echo "Deploy ${APP_NAME}Servlet using curl:"
 echo -e "curl --noproxy '*' --silent  --user ${USER}:${PASSWORD} -H X-Requested-By:MyClient -H Accept:application/json -H Content-Type:multipart/form-data -F \"model={ name: '${APP_NAME}servlet', targets: [ { identity: [ clusters, '${DEPLOY_TARGET}' ] } ] }\" -F \"sourcePath=@${ARCHIVE_FILE_SERVLET}\" -H \"Prefer:respond-async\" -X POST http://${HOST}:${PORT}/management/weblogic/latest/edit/appDeployments -o ${APP_DIR_INPOD}/deployWSServlet.out\n"
 curl --noproxy '*' --silent  --user ${USER}:${PASSWORD} -H X-Requested-By:MyClient -H Accept:application/json -H Content-Type:multipart/form-data -F "model={ name: '${APP_NAME}servlet', targets: [ { identity: [ clusters, '${DEPLOY_TARGET}' ] } ] }" -F "sourcePath=@${ARCHIVE_FILE_SERVLET}" -H "Prefer:respond-async" -X POST http://${HOST}:${PORT}/management/weblogic/latest/edit/appDeployments -o ${APP_DIR_INPOD}/deployWSServlet.out
 sleep 10
 grep -q "STATE_RUNNING" ${APP_DIR_INPOD}/deployWSServlet.out
- cres=$?
- [[ $cres != 0 ]] && echo "[FAIL] Unable to deploy wsclientapp ..."
- [[ $cres == 0 ]] && echo "[SUCCESS] wsclientapp is deployed  ..."
+cres=$?
+[[ $cres != 0 ]] && echo "[FAIL] Unable to deploy wsclientapp ..." exit -1
+[[ $cres == 0 ]] && echo "[SUCCESS] wsclientapp is deployed  ..."
 
 
 rm -rf ${APP_DIR_INPOD}/buildfiles
 
-exit 0
+exit 0