Skip to content

Commit 63c7a96

Browse files
committed
jenkins changes, adding some debug
1 parent 4aa8758 commit 63c7a96

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ private void initialize() throws Exception {
277277
operatorProps.put("externalRestHttpsPort", externalRestHttpsPort);
278278
}
279279
}
280+
logger.info("IMAGE_NAME_OPERATOR=" + System.getenv("IMAGE_NAME_OPERATOR"));
281+
logger.info("IMAGE_TAG_OPERATOR=" + System.getenv("IMAGE_TAG_OPERATOR"));
280282
// customize the inputs yaml file to use our pre-built docker image
281283
if (System.getenv("IMAGE_NAME_OPERATOR") != null
282284
&& System.getenv("IMAGE_TAG_OPERATOR") != null) {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/bin/bash
12
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
23
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
34

@@ -60,6 +61,11 @@ function create_image_pull_secret_jenkins {
6061

6162
export SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
6263
export PROJECT_ROOT="$SCRIPTPATH/../../../.."
64+
export RESULT_ROOT=${RESULT_ROOT:-/scratch/$USER/wl_k8s_test_results}
65+
export PV_ROOT=${PV_ROOT:-$RESULT_ROOT}
66+
echo "RESULT_ROOT$RESULT_ROOT PV_ROOT$PV_ROOT"
67+
export BRANCH_NAME="${BRANCH_NAME:-$WERCKER_GIT_BRANCH}"
68+
6369
if [ -z "$BRANCH_NAME" ]; then
6470
export BRANCH_NAME="`git branch | grep \* | cut -d ' ' -f2-`"
6571
if [ ! "$?" = "0" ] ; then

wercker.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ integration-test:
113113
cp $WERCKER_PIPELINE_DIR/hosts /etc/hosts
114114
115115
echo "OCI_K8S_WORKER0_IP =$OCI_K8S_WORKER0_IP"
116-
echo "hostname `hostname`"
117116
118117
# Update KUBECONFIG for K8S cluster
119118
export K8S_NODEPORT_HOST="${OCI_K8S_WORKER0_HOSTNAME}"
@@ -217,7 +216,6 @@ integration-test-java:
217216
sed -i -e "s,%CLIENT_CERT_DATA%,$OCI_K8S_CLIENT_CERT_DATA,g" $WERCKER_SOURCE_DIR/build/kube.config
218217
sed -i -e "s,%CLIENT_KEY_DATA%,$OCI_K8S_CLIENT_KEY_DATA,g" $WERCKER_SOURCE_DIR/build/kube.config
219218
export KUBECONFIG="$WERCKER_SOURCE_DIR/build/kube.config"
220-
echo "hostname `hostname`"
221219
222220
# running on Wercker
223221
export WERCKER="true"

0 commit comments

Comments
 (0)