Merge pull request #531 from oracle/introspector-jenkins

ixes issues found in jenkins java-integration-tests in domain-introspector branch

Author: alai8

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

@@ -296,13 +296,13 @@ private Domain testAllUseCasesForADomain(Operator operator, String domainYamlFil
     logger.info("Creating Domain & verifing the domain creation");
     // create domain1
     Domain domain = testDomainCreation(domainYamlFile);
+    testClusterScaling(operator, domain);
     if (System.getenv("QUICKTEST") == null
         || (System.getenv("QUICKTEST") != null
             && !System.getenv("QUICKTEST").equalsIgnoreCase("true"))) {
       testDomainLifecyle(operator, domain);
       testOperatorLifecycle(operator, domain);
     }
-    testClusterScaling(operator, domain);
     return domain;
   }
 

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

@@ -3,6 +3,7 @@
 from java.io import File
 import sys, socket
 import os
+import time as systime
 hostname = socket.gethostname()
 
 k8s_master_host=os.environ.get('KUBERNETES_SERVICE_HOST')
@@ -63,4 +64,22 @@
 wh1.addNotification(scriptAct)
 
 save()
-activate()
+activate(block='true')
+
+print "wait for harvester watch to become active"
+
+domainRuntime()
+
+cd('ServerRuntimes/admin-server/WLDFRuntime/WLDFRuntime/WLDFWatchNotificationRuntime/WatchNotification')
+
+numWatchEval=cmo.getTotalHarvesterWatchEvaluations()
+maxwait=300
+
+while(numWatchEval < 1) and (maxwait > 0):
+  print numWatchEval
+  maxwait -= 1
+  systime.sleep(1)
+  numWatchEval=cmo.getTotalHarvesterWatchEvaluations()
+
+print "wldf.py done numWatchEval is ", numWatchEval, " maxwait is ", maxwait
+

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wdt/wdt_model_dynamic.yaml

@@ -17,8 +17,6 @@ topology:
     Server:
         '@@PROP:adminServerName@@':
             ListenAddress: '@@PROP:domainUID@@-@@PROP:adminServerName@@'
-            Log:
-                FileName: '/shared/logs/@@PROP:domainUID@@/@@PROP:adminServerName@@.log'
             NetworkAccessPoint:
                 T3Channel:
                     ListenAddress: '@@PROP:domainUID@@-@@PROP:adminServerName@@'
@@ -30,7 +28,5 @@ topology:
             Cluster: '@@PROP:clusterName@@'
             ListenAddress: '@@PROP:domainUID@@-@@PROP:managedServerNameBase@@${id}'
             ListenPort: '@@PROP:managedServerPort@@'
-            Log:
-                FileName: '/shared/logs/@@PROP:domainUID@@/@@PROP:managedServerNameBase@@${id}.log'
             JTAMigratableTarget:
                 Cluster: '@@PROP:clusterName@@'