Merge branch 'main' of https://github.com/oracle/weblogic-deploy-tooling into main

Author: rosemarymarano

.gitignore

@@ -27,3 +27,4 @@ release.properties
 **/*$py.class
 **/*.pyc
 **/.DS_Store
+system-test/domains

CONTRIBUTING.md

@@ -5,7 +5,7 @@ If you want to submit a pull request to fix a bug or enhance an existing feature
 
 If you have any questions about a possible submission, feel free to open an issue too.
 
-## [Contributing to the Oracle WLS Deploy repository](http://github.com/oracle/wls-deploy/blob/master/CONTRIBUTING.md)
+## [Contributing to the WebLogic Deploy repository](http://github.com/oracle/wls-deploy/blob/master/CONTRIBUTING.md)
 Pull requests can be made under [The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html) (OCA).
 
 For pull requests to be accepted, the bottom of your commit message must have the following line using your name and e-mail address as it appears in the OCA Signatories list.

Jenkinsfile

@@ -78,6 +78,7 @@ pipeline {
        stage ('Alias Test') {
             // only run this stage when triggered by a cron timer and the commit does not have []skip-ci in the message
             // for example, only run integration tests during the timer triggered nightly build
+
             when {
                 allOf {
                     triggeredBy 'TimerTrigger'
@@ -105,15 +106,16 @@ pipeline {
                         steps {
                            sh  '/u01/verify/alias-test/src/test/resources/runIntegrationTest.sh -wls_version ${WLS_VERSION} -testfiles_path /u01/verify/testfiles;cp /u01/verify/testfiles/report* $WORKSPACE'
                         }
-                        post {
-                           always {
-                             archiveArtifacts artifacts: 'report*', fingerprint: true
-                           }
-                        }
                     }
                 }
+
             }
             // after all sets are complete, the job will continue here.
+            post {
+               always {
+                 archiveArtifacts artifacts: 'report*', fingerprint: true
+               }
+            }
         }
         stage ('Save Nightly Installer'){
             when {

alias-test/pom.xml

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>2.7</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

core/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <artifactId>weblogic-deploy</artifactId>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
-        <version>1.9.12-SNAPSHOT</version>
+        <version>1.9.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

core/src/main/python/update.py

@@ -135,8 +135,9 @@ def __update_online(model, model_context, aliases):
     __logger.info("WLSDPLY-09007", admin_url, method_name=_method_name, class_name=_class_name)
 
     topology_updater = TopologyUpdater(model, model_context, aliases, wlst_mode=WlstModes.ONLINE)
+    jdbc_names = None
     try:
-        topology_updater.update_machines_clusters_and_servers(delete_now=False)
+        jdbc_names = topology_updater.update_machines_clusters_and_servers(delete_now=False)
         topology_updater.warn_set_server_groups()
     except DeployException, de:
         deployer_utils.release_edit_session_and_disconnect()
@@ -157,6 +158,7 @@ def __update_online(model, model_context, aliases):
         raise ex
 
     try:
+        topology_updater.clear_placeholder_targeting(jdbc_names)
         topology_updater.update()
         model_deployer.deploy_resources(model, model_context, aliases, wlst_mode=__wlst_mode)
         deployer_utils.delete_online_deployment_targets(model, aliases, __wlst_mode)
@@ -197,7 +199,7 @@ def __update_offline(model, model_context, aliases):
 
     topology_updater = TopologyUpdater(model, model_context, aliases, wlst_mode=WlstModes.OFFLINE)
     # deleting servers that are added by templates before set server groups causes mayhem
-    topology_updater.update_machines_clusters_and_servers(delete_now=False)
+    jdbc_names = topology_updater.update_machines_clusters_and_servers(delete_now=False)
 
     # update rcu schema password must happen before updating jrf domain
     if model_context.get_update_rcu_schema_pass() is True:
@@ -207,7 +209,7 @@ def __update_offline(model, model_context, aliases):
     __update_offline_domain()
 
     topology_updater.set_server_groups()
-
+    topology_updater.clear_placeholder_targeting(jdbc_names)
     topology_updater.update()
 
     # Add resources after server groups are established to prevent auto-renaming

core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py

@@ -150,6 +150,9 @@ def update_machines_clusters_and_servers(self, delete_now=True):
         self._process_section(self._topology, folder_list, MIGRATABLE_TARGET, location, delete_now)
 
         # targets may have been inadvertently assigned when clusters were added
+        return jdbc_names
+
+    def clear_placeholder_targeting(self, jdbc_names):
         self.topology_helper.clear_jdbc_placeholder_targeting(jdbc_names)
 
     def warn_set_server_groups(self):

installer/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
         <artifactId>weblogic-deploy</artifactId>
-        <version>1.9.12-SNAPSHOT</version>
+        <version>1.9.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

installer/src/main/bin/compareModel.sh

@@ -43,11 +43,11 @@ usage() {
 
 WLSDEPLOY_PROGRAM_NAME="compareModel"; export WLSDEPLOY_PROGRAM_NAME
 
-scriptName=`basename $0`
+scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
 scriptArgs=$*
 
-. $scriptPath/shared.sh
+. "$scriptPath/shared.sh"
 
 umask 27
 

installer/src/main/bin/createDomain.sh

@@ -107,11 +107,11 @@ usage() {
 
 WLSDEPLOY_PROGRAM_NAME="createDomain"; export WLSDEPLOY_PROGRAM_NAME
 
-scriptName=`basename $0`
+scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
 scriptArgs=$*
 
-. $scriptPath/shared.sh
+. "$scriptPath/shared.sh"
 
 umask 27