Skip to content

Commit 90e372f

Browse files
committed
remove internal server name references
1 parent 69e0476 commit 90e372f

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

integration-tests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ WERCKER=true:
269269
| Variable | Description |
270270
| --- | --- |
271271
| IMAGE_TAG_OPERATOR | Docker image tag for operator. Default generated based off the BRANCH_NAME. |
272-
| IMAGE_NAME_OPERATOR | Docker image name for operator. Default is wlsldi-v2.docker.oraclecorp.com/weblogic-operator |
272+
| IMAGE_NAME_OPERATOR | Docker image name for operator. Default is weblogic-kubernetes-operator |
273273
| IMAGE_PULL_POLICY_OPERATOR | Default 'Never'. |
274274
| IMAGE_PULL_SECRET_OPERATOR | Default ''. |
275275
| IMAGE_PULL_SECRET_WEBLOGIC | Default ''.

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ public class BaseTest {
4747
// property file used to configure constants for integration tests
4848
public static final String APP_PROPS_FILE = "OperatorIT.properties";
4949

50+
public static boolean QUICKTEST;
51+
public static boolean SMOKETEST;
52+
public static boolean JENKINS;
53+
public static boolean INGRESSPERDOMAIN = true;
54+
5055
private static String resultRoot = "";
5156
private static String pvRoot = "";
5257
private static String resultDir = "";
@@ -61,11 +66,6 @@ public class BaseTest {
6166
private static String appLocationInPod = "/u01/oracle/apps";
6267
private static Properties appProps;
6368

64-
public static boolean QUICKTEST;
65-
public static boolean SMOKETEST;
66-
public static boolean JENKINS;
67-
public static boolean INGRESSPERDOMAIN = true;
68-
6969
// Set QUICKTEST env var to true to run a small subset of tests.
7070
// Set SMOKETEST env var to true to run an even smaller subset of tests
7171
// set INGRESSPERDOMAIN to false to create LB's ingress by kubectl yaml file
@@ -74,7 +74,9 @@ public class BaseTest {
7474
System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true");
7575
SMOKETEST =
7676
System.getenv("SMOKETEST") != null && System.getenv("SMOKETEST").equalsIgnoreCase("true");
77-
if (SMOKETEST) QUICKTEST = true;
77+
if (SMOKETEST) {
78+
QUICKTEST = true;
79+
}
7880
if (System.getenv("JENKINS") != null) {
7981
JENKINS = new Boolean(System.getenv("JENKINS")).booleanValue();
8082
}

integration-tests/src/test/resources/setupenv.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ function setup_jenkins {
1515
set -x
1616
id
1717

18-
docker login -u [email protected] -p $docker_pass wlsldi-v2.docker.oraclecorp.com
1918
docker images
2019

2120
pull_tag_images

0 commit comments

Comments
 (0)