Skip to content

Commit f3fa84f

Browse files
committed
remove internal server dependencies
1 parent ee417b8 commit f3fa84f

File tree

5 files changed

+4
-32
lines changed

5 files changed

+4
-32
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ public static void tearDown() throws Exception {
604604

605605
ExecResult result = ExecCommand.exec(cmd.toString());
606606
if (result.exitValue() == 0) {
607-
// logger.info("Executed statedump.sh " + result.stdout());
607+
logger.info("Executed statedump.sh " + result.stdout());
608608
} else {
609609
logger.info("Execution of statedump.sh failed, " + result.stderr() + "\n" + result.stdout());
610610
}

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -896,12 +896,7 @@ private void callCreateDomainScript(String outputDir) throws Exception {
896896
StandardCopyOption.REPLACE_EXISTING);
897897
}
898898

899-
StringBuffer createDomainScriptCmd = new StringBuffer("export JAVA_HOME=");
900-
901-
createDomainScriptCmd
902-
.append(System.getenv("JAVA_HOME"))
903-
.append(" && export PATH=$JAVA_HOME/bin:$PATH && ")
904-
.append(BaseTest.getResultDir());
899+
StringBuffer createDomainScriptCmd = new StringBuffer(BaseTest.getResultDir());
905900

906901
// call different create-domain.sh based on the domain type
907902
if (domainMap.containsKey("domainHomeImageBase")) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ private void initialize(
469469
} else {
470470
operatorMap.put(
471471
"image",
472-
"wlsldi-v2.docker.oraclecorp.com/weblogic-operator"
472+
"weblogic-kubernetes-operator"
473473
+ ":test_"
474474
+ BaseTest.getBranchName().replaceAll("/", "_"));
475475
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ public static void deletePVC(String pvcName, String namespace, String domainUid)
191191
public static ExecResult exec(String cmd) throws Exception {
192192
ExecResult result = ExecCommand.exec(cmd);
193193
if (result.exitValue() != 0) {
194+
logger.info("Command " + cmd + " failed with " + result.stderr() + " \n " + result.stdout());
194195
throw new RuntimeException(
195196
"FAILURE: Command " + cmd + " failed with " + result.stderr() + " \n " + result.stdout());
196197
}

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -92,29 +92,7 @@ function pull_tag_images {
9292
docker pull $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC
9393
fi
9494
set -x
95-
echo "Pull and tag the images we need"
96-
docker pull wlsldi-v2.docker.oraclecorp.com/store-serverjre-8:latest
97-
docker tag wlsldi-v2.docker.oraclecorp.com/store-serverjre-8:latest store/oracle/serverjre:8
9895

99-
docker pull wlsldi-v2.docker.oraclecorp.com/weblogic-webtier-apache-12.2.1.3.0:latest
100-
docker tag wlsldi-v2.docker.oraclecorp.com/weblogic-webtier-apache-12.2.1.3.0:latest store/oracle/apache:12.2.1.3
101-
}
102-
103-
104-
function create_image_pull_secret_jenkins {
105-
echo "Creating Secret"
106-
kubectl create secret docker-registry wlsldi-secret \
107-
--docker-server=wlsldi-v2.docker.oraclecorp.com \
108-
109-
--docker-password=$docker_pass \
110-
111-
112-
echo "Checking Secret"
113-
local SECRET="`kubectl get secret wlsldi-secret | grep wlsldi | wc | awk ' { print $1; }'`"
114-
if [ "$SECRET" != "1" ]; then
115-
echo 'secret wlsldi-secret was not created successfully'
116-
exit 1
117-
fi
11896
}
11997

12098
function get_wlthint3client_from_image {
@@ -203,8 +181,6 @@ elif [ "$JENKINS" = "true" ]; then
203181

204182
setup_jenkins
205183

206-
create_image_pull_secret_jenkins
207-
208184
/usr/local/packages/aime/ias/run_as_root "mkdir -p $PV_ROOT"
209185
/usr/local/packages/aime/ias/run_as_root "mkdir -p $RESULT_ROOT"
210186

0 commit comments

Comments
 (0)