branch_name var changes

Author: vanajamukkara

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

@@ -29,6 +29,7 @@ public class BaseTest {
   private static int maxIterationsPod = 50;
   private static int waitTimePod = 5;
   private static String leaseId = "";
+  private static String branchName = "";
 
   private static Properties appProps;
 
@@ -63,10 +64,17 @@ public static void initialize(String appPropsFile) throws Exception {
     // resultDir = resultRoot + "/acceptance_test_tmp";
     userProjectsDir = resultRoot + "/acceptance_test_tmp/user-projects";
     projectRoot = System.getProperty("user.dir") + "/..";
+    if (System.getenv("BRANCH_NAME") != null) {
+      branchName = System.getenv("BRANCH_NAME");
+    } else {
+      branchName = TestUtils.getGitBranchName().replaceAll("/", "_");
+    }
+
     logger.info("RESULT_ROOT =" + resultRoot);
     logger.info("PV_ROOT =" + pvRoot);
     logger.info("userProjectsDir =" + userProjectsDir);
     logger.info("projectRoot =" + projectRoot);
+    logger.info("branchName =" + branchName);
 
     logger.info("Env var RESULT_ROOT " + System.getenv("RESULT_ROOT"));
     logger.info("Env var PV_ROOT " + System.getenv("PV_ROOT"));
@@ -79,6 +87,7 @@ public static void initialize(String appPropsFile) throws Exception {
         "Env var IMAGE_PULL_SECRET_OPERATOR " + System.getenv("IMAGE_PULL_SECRET_OPERATOR"));
     logger.info(
         "Env var IMAGE_PULL_SECRET_WEBLOGIC " + System.getenv("IMAGE_PULL_SECRET_WEBLOGIC"));
+    logger.info("Env var BRANCH_NAME " + System.getenv("BRANCH_NAME"));
 
     // create resultRoot, PVRoot, etc
     Files.createDirectories(Paths.get(resultRoot));
@@ -138,6 +147,10 @@ public static String getLeaseId() {
     return leaseId;
   }
 
+  public static String getBranchName() {
+    return branchName;
+  }
+
   protected void logTestBegin(String testName) throws Exception {
     logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
     logger.info("BEGIN " + testName);

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

@@ -277,9 +277,7 @@ private void initialize() throws Exception {
         operatorProps.put("externalRestHttpsPort", externalRestHttpsPort);
       }
     }
-    logger.info("IMAGE_NAME_OPERATOR=" + System.getenv("IMAGE_NAME_OPERATOR"));
-    logger.info("IMAGE_TAG_OPERATOR=" + System.getenv("IMAGE_TAG_OPERATOR"));
-    logger.info("Git branch " + TestUtils.getGitBranchName());
+
     // customize the inputs yaml file to use our pre-built docker image
     if (System.getenv("IMAGE_NAME_OPERATOR") != null
         && System.getenv("IMAGE_TAG_OPERATOR") != null) {
@@ -291,7 +289,7 @@ private void initialize() throws Exception {
           "weblogicOperatorImage",
           "wlsldi-v2.docker.oraclecorp.com/weblogic-operator"
               + ":test_"
-              + TestUtils.getGitBranchName().replaceAll("/", "_"));
+              + BaseTest.getBranchName());
     }
 
     if (System.getenv("IMAGE_PULL_POLICY_OPERATOR") != null) {

src/integration-tests/bash/run.sh

@@ -2902,7 +2902,8 @@ function test_suite {
 # entry point
 
 if [ "$JENKINS" = "true" ]; then
-  echo "`git branch`"
+  echo "git branch `git branch`"
+  echo "BRANCH_NAME ${BRANCH_NAME}"
   mvn test-compile integration-test -P java-integration-tests
   exit "$?"
 fi