From f6cddf2a97c66cd028772115a82edf48ad3b09d5 Mon Sep 17 00:00:00 2001
From: "ANTARYAMI.PANIGRAHI@ORACLE.COM"
 <anpanigr@phx3182b0a.subnet4ad3phx.devweblogicphx.oraclevcn.com>
Date: Mon, 27 Jun 2022 19:04:59 +0000
Subject: [PATCH] initial change

---
 .../ItLiftAndShiftFromOnPremDomain.java       |  9 +++++-
 .../bash-scripts/syncTestImagesRepo.sh        | 31 ++++++++++++-------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItLiftAndShiftFromOnPremDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItLiftAndShiftFromOnPremDomain.java
index 23fd3146bc1..3001aecfd99 100644
--- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItLiftAndShiftFromOnPremDomain.java
+++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItLiftAndShiftFromOnPremDomain.java
@@ -160,7 +160,14 @@ void testCreateMiiDomainWithClusterFromOnPremDomain() {
     final String adminServerPodName = domainUid + "-admin-server";
     final String managedServerPrefix = domainUid + "-managed-server";
     final String clusterService = domainUid + "-cluster-cluster-1";
-    final int replicaCount = 5;
+
+    // As of WDT v2.3.1, the discovery tool will not put the replica count 
+    // in genererated domain resource yaml file. So the Operator will start 
+    // only one managed server (default replica count)  
+    // To add custom replica count, need to create a wdt model file with 
+    // kubernates section with custom repilca count
+    // final int replicaCount = 5;
+    final int replicaCount = 1;
 
     assertDoesNotThrow(() -> {
       logger.info("Deleting and recreating {0}", LIFT_AND_SHIFT_WORK_DIR);
diff --git a/integration-tests/src/test/resources/bash-scripts/syncTestImagesRepo.sh b/integration-tests/src/test/resources/bash-scripts/syncTestImagesRepo.sh
index e938219b9df..fee6f20d0b2 100644
--- a/integration-tests/src/test/resources/bash-scripts/syncTestImagesRepo.sh
+++ b/integration-tests/src/test/resources/bash-scripts/syncTestImagesRepo.sh
@@ -5,7 +5,7 @@
 set -eu
 set -o pipefail
 
-function dockerLogin() {
+dockerLogin() {
 
 echo "docker login to src ${SOURCE_REPO}"
 echo ${SOURCE_PASSWORD} > pwd.txt
@@ -22,7 +22,7 @@ rm -rf pwd.txt
 
 }
 
-function dockerPullPushImage() {
+dockerPullPushImage() {
  
  # Here the source image contains absolute image path
  # and source image contains relative path wrt to TARGET_REPO
@@ -30,17 +30,24 @@ function dockerPullPushImage() {
  src_image="${1}"
  tgt_image="${TARGET_REPO}/${2}"
 
- printf 'SRC[%s] TARGET[%s] \n' "${src_image}" "${tgt_image}"
-
- docker pull ${src_image}
- docker tag  ${src_image} ${tgt_image}
- docker push ${tgt_image}
-
- docker rmi -f ${src_image} 
- docker rmi -f ${tgt_image} 
+ if [ ${DRY_RUN} == "true" ]; then 
+   echo "Executing a dry run ..."
+   echo "docker pull ${src_image} "
+   echo "docker tag  ${src_image} ${tgt_image} "
+   echo "docker push ${tgt_image} "
+ else 
+   printf 'SRC[%s] TARGET[%s] \n' "${src_image}" "${tgt_image}"
+   docker pull ${src_image}
+   docker tag  ${src_image} ${tgt_image}
+   docker push ${tgt_image}
+
+   docker rmi -f ${src_image} 
+   docker rmi -f ${tgt_image} 
+ fi
+   
 }
 
-function dockerPullPushImages {
+dockerPullPushImages() {
  file="images.properties"
  egrep -v '^#' $file | grep -v "^$" |
    while IFS=";" read -r f1 f2 
@@ -67,6 +74,8 @@ TARGET_REPO=${TARGET_REPO:-phx.ocir.io}
 TARGET_USER=${TARGET_USER:-oracle}
 TARGET_PASSWORD=${TARGET_PASSWORD:-changeme}
 
+DRY_RUN=${DRY_RUN:-false}
+
 echo "SOURCE_REPO[$SOURCE_REPO] and TARGET_REPO[${TARGET_REPO}]"
 
 if [ ${SOURCE_REPO} == ${TARGET_REPO} ]; then