File tree Expand file tree Collapse file tree 2 files changed +3
-34
lines changed Expand file tree Collapse file tree 2 files changed +3
-34
lines changed Original file line number Diff line number Diff line change 11#! /bin/bash
2- # Copyright (c) 2021, Oracle and/or its affiliates.
2+ # Copyright (c) 2021, 2023, Oracle and/or its affiliates.
33# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44#
55# This script checks for the below required environment variables on Jenkins and runs the integration tests
@@ -50,19 +50,6 @@ function checkJavaVersion {
5050 exit 1
5151 fi
5252}
53- function dockerLogin {
54- echo " Info: about to do docker login"
55- if [ ! -z ${DOCKER_USERNAME+x} ] && [ ! -z ${DOCKER_PASSWORD+x} ]; then
56- out=$( echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin)
57- res=$?
58- if [ $res -ne 0 ]; then
59- echo ' docker login failed'
60- exit 1
61- fi
62- else
63- echo " Info: Docker credentials DOCKER_USERNAME and DOCKER_PASSWORD are not set."
64- fi
65- }
6653
6754# Record start time in a format appropriate for journalctl --since
6855start_time=$( date +" %Y-%m-%d %H:%M:%S" )
@@ -126,8 +113,6 @@ ulimit -a
126113echo " Info: hard limits"
127114ulimit -aH
128115
129- dockerLogin
130-
131116echo ' Info: Run build...'
132117mvn clean install
133118
@@ -141,4 +126,4 @@ sh -x ./kindtest.sh -t "${IT_TEST}" -v ${KUBE_VERSION} -p ${PARALLEL_RUN} -d ${W
141126mkdir -m777 -p " ${WORKSPACE} /logdir/${BUILD_TAG} /wl_k8s_test_results"
142127journalctl --utc --dmesg --system --since " $start_time " > " ${WORKSPACE} /logdir/${BUILD_TAG} /wl_k8s_test_results/journalctl-compute.out"
143128
144- sudo chown -R opc " ${WORKSPACE} /logdir/${BUILD_TAG} "
129+ sudo chown -R opc " ${WORKSPACE} /logdir/${BUILD_TAG} "
Original file line number Diff line number Diff line change 11#! /bin/bash
2- # Copyright (c) 2022, Oracle and/or its affiliates.
2+ # Copyright (c) 2022, 2023, Oracle and/or its affiliates.
33# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44#
55set -o errexit
@@ -32,20 +32,6 @@ usage() {
3232 exit $1
3333}
3434
35- dockerLogin () {
36- echo " Info: about to do docker login"
37- if [ ! -z ${DOCKER_USERNAME+x} ] && [ ! -z ${DOCKER_PASSWORD+x} ]; then
38- out=$( echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin)
39- res=$?
40- if [ $res -ne 0 ]; then
41- echo ' docker login failed'
42- exit 1
43- fi
44- else
45- echo " Info: Docker credentials DOCKER_USERNAME and DOCKER_PASSWORD are not set."
46- fi
47- }
48-
4935k8s_version=" 1.21"
5036
5137echo " checking nodes"
@@ -146,9 +132,7 @@ kubectl get clusterrolebindings --no-headers | awk '/traefik-/{print $1}' | xarg
146132
147133sudo rm -rf ${PV_ROOT} /*
148134
149- dockerLogin
150135export OKD=true
151-
152136echo ' docker info'
153137docker info
154138docker ps
You can’t perform that action at this time.
0 commit comments