Merge branch 'master' into oracle/issue106-as-java-options

Author: doxiao

pom.xml

@@ -82,35 +82,6 @@
                         <exclude>**/*Test.java</exclude>
                     </includes>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>default-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </execution>
-                    <!--
-                    <execution>
-                      <id>kubernetes-config</id>
-                      <phase>test</phase>
-                      <goals>
-                          <goal>test</goal>
-                      </goals>
-                      <configuration>
-                          <argLine>${surefireArgLine} -Xms512m -Xmx1500m</argLine>
-                          <environmentVariables>
-                              <KUBECONFIG>
-                                  ${project.basedir}/your.kube.config
-                              </KUBECONFIG>
-                          </environmentVariables>
-                      </configuration>
-                  </execution>
-                  -->
-                </executions>
             </plugin>
 
             <plugin>
@@ -525,6 +496,13 @@
             <artifactId>junit</artifactId>
             <version>${junit-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-exec</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <properties>

src-generated-swagger/main/java/oracle/kubernetes/operator/domain/model/oracle/kubernetes/weblogic/domain/v1/DomainSpec.java

@@ -267,20 +267,21 @@ public DomainSpec startupControl(String startupControl) {
   }
 
   /**
-   * Controls which managed servers will be started. Legal values are ADMIN, ALL,
-   * SPECIFIED or AUTO. Defaults to AUTO. ADMIN indicates that only the
-   * administration server is started. ALL indicates that all servers in the
-   * domain will be started. SPECIFIED indicates that the administration server is
-   * started and then additionally only those servers listed under serverStartup
-   * or managed servers belonging to clusters listed under clusterStartup up to
-   * the cluster's replicas field will be started. AUTO indicates that servers
-   * will be started exactly as with SPECIFIED, but then managed servers belonging
-   * to clusters not listed under clusterStartup will be started up to the
-   * replicas field.
+   * Controls which managed servers will be started. Legal values are NONE, 
+   * ADMIN, ALL, SPECIFIED or AUTO. Defaults to AUTO. NONE indicates that no
+   * servers, including the administration server, will be started.  ADMIN 
+   * indicates that only the administration server is started. ALL indicates 
+   * that all servers in the domain will be started. SPECIFIED indicates that 
+   * the administration server is started and then additionally only those 
+   * servers listed under serverStartup or managed servers belonging to 
+   * clusters listed under clusterStartup up to the cluster's replicas field 
+   * will be started. AUTO indicates that servers will be started exactly as 
+   * with SPECIFIED, but then managed servers belonging to clusters not listed 
+   * under clusterStartup will be started up to the replicas field.
    * 
    * @return startupControl
    **/
-  @ApiModelProperty(value = "Controls which managed servers will be started. Legal values are ADMIN, ALL, SPECIFIED or AUTO.  Defaults to AUTO.  ADMIN indicates that only the administration server is started.  ALL indicates that all servers in the domain will be started.  SPECIFIED indicates that the administration server is started and then additionally only those servers listed under serverStartup or managed servers belonging to clusters listed under clusterStartup up to the cluster's replicas field will be started.  AUTO indicates that servers will be started exactly as with SPECIFIED, but then managed servers belonging to clusters not listed under clusterStartup will be started up to the replicas field.")
+  @ApiModelProperty(value = "Controls which managed servers will be started. Legal values are NONE, ADMIN, ALL, SPECIFIED or AUTO.  Defaults to AUTO.  NONE indicates that no servers, including the administration server, will be started.  ADMIN indicates that only the administration server is started.  ALL indicates that all servers in the domain will be started.  SPECIFIED indicates that the administration server is started and then additionally only those servers listed under serverStartup or managed servers belonging to clusters listed under clusterStartup up to the cluster's replicas field will be started.  AUTO indicates that servers will be started exactly as with SPECIFIED, but then managed servers belonging to clusters not listed under clusterStartup will be started up to the replicas field.")
   public String getStartupControl() {
     return startupControl;
   }

src/integration-tests/bash/run.sh

@@ -11,17 +11,22 @@
 # -----------------
 #
 # This script runs a series of acceptance tests and archives the results
-# into tar.gz files upon completion.
+# into tar.gz files upon completion.  It currently runs in three modes,
+# "Wercker", "Jenkins", and "standalone" Oracle Linux, where the mode
+# is controlled by the WERCKER and JENKINS environment variables described
+# below.  A standalone run filters out verbose lines from the console output
+# while redirecting full output to the file /tmp/test_suite.out
 #
 # To cleanup after a run, see "cleanup.sh".
 #
-# The test has three levels of logging output, output that begins with:
+# The test has three levels of logging output. Output that begins with:
 #
 #     "##TEST_INFO" is very concise (one line per test (either PASS or FAIL).
 #     "[timestamp]" is concise.
 #     "+" is verbose.
 #     Anything else is semi-verbose.
 #
+#
 # This script accepts optional env var overrides:
 #
 #   RESULT_ROOT    The root directory of the test temporary files.
@@ -33,6 +38,9 @@
 #                  See "Directory Configuration and Structure" below for
 #                  defaults and a detailed description of test directies.
 #
+#   QUICKTEST      When set to "true", limits testing to a subset of
+#                  of the tests.
+#
 #   WERCKER        Set to true if invoking from Wercker, set
 #                  to false or "" if running stand-alone or from Jenkins.
 #                  Default is "".
@@ -371,6 +379,8 @@ trap ctrl_c INT
 
 function ctrl_c() {
     declare_new_test_from_trap 1 run_aborted_with_ctrl_c
+    # disable the trap:
+    trap - INT
     fail "Trapped CTRL-C"
 }
 
@@ -1449,6 +1459,8 @@ EOF
     # like local, it uses the t3 channel...
     run_wlst_script $1 hybrid ${pyfile_con} 
   else
+    # TODO The following has a dependency on java and WebLogic being in the path/classpath.
+    #      We should run on 'hybrid' mode instead if java and WebLogic aren't already setup.
     run_wlst_script $1 local ${pyfile_con} 
   fi
 
@@ -1470,6 +1482,11 @@ function run_wlst_script {
     fail "requires at least 3 parameters: domainKey local|remote|hybrid local_pyfile optionalarg1 optionalarg2 ..."
   fi 
 
+  # TODO It seems possible to obtain user/pass from the secret via WLST verbs.  This
+  #      would be better than passing it to the WLST command-line in plain-text.  See
+  #      read-domain-secret.py in domain-job-template for an example of how this is done
+  #      for WLST that runs from within a pod...
+
   local DOM_KEY="$1"
   local NAMESPACE="`dom_get $1 NAMESPACE`"
   local DOMAIN_UID="`dom_get $1 DOMAIN_UID`"
@@ -2352,8 +2369,9 @@ function test_suite_init {
 }
 
 #
-# TODO:  Make output less verbose -- suppress REST output, etc.  Move output to file and/or
-#        only report output on a failure and/or prefix output with a "+".
+# TODO:  Make output less verbose -- suppress REST, archive, and job output, etc.  In general, move
+#        move verbose output to file and/or  only report output on a failure and/or prefix output
+#        with a "+".   Also, suppress output in the pod readiness loops to only once every 30 seconds.
 #
 
 function test_suite {
@@ -2415,19 +2433,18 @@ function test_suite {
     # create first domain in default namespace and verify it
     test_domain_creation domain1 
 
-    # if QUICKTEST is true skip the rest of the tests
-    if [ ! "${QUICKTEST:-false}" = "true" ]; then
-   
-      # test shutting down and restarting a domain 
-      test_domain_lifecycle domain1 
+    # test shutting down and restarting a domain 
+    test_domain_lifecycle domain1 
 
-      # test shutting down and restarting the operator for the given domain
-      test_operator_lifecycle domain1
+    # test shutting down and restarting the operator for the given domain
+    test_operator_lifecycle domain1
 
-      # TODO move test_cluster_scale to QUICKTEST once we speedup mgd server boots
-      # test scaling domain1 cluster from 2 to 3 servers and back down to 2
-      test_cluster_scale domain1 
+    # test scaling domain1 cluster from 2 to 3 servers and back down to 2
+    test_cluster_scale domain1 
 
+    # if QUICKTEST is true skip the rest of the tests
+    if [ ! "${QUICKTEST:-false}" = "true" ]; then
+   
       # create another domain in the default namespace and verify it
       test_domain_creation domain2