Skip to content

Commit a741bc9

Browse files
committed
remove k8s installation from tests
1 parent 0da01ce commit a741bc9

File tree

1 file changed

+3
-30
lines changed

1 file changed

+3
-30
lines changed

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

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,7 @@
22
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
33
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44

5-
function clean_jenkins {
6-
echo "Cleaning."
7-
/usr/local/packages/aime/ias/run_as_root "${PROJECT_ROOT}/src/integration-tests/bash/clean_docker_k8s.sh -y"
8-
}
9-
10-
function setup_jenkins {
11-
echo "Setting up."
12-
/usr/local/packages/aime/ias/run_as_root "sh ${PROJECT_ROOT}/src/integration-tests/bash/install_docker_k8s.sh -y -u wls -v ${K8S_VERSION}"
13-
if [ $? -ne 0 ]; then
14-
echo "k8s installation is not successful"
15-
exit 1
16-
fi
17-
set +x
18-
. ~/.dockerk8senv
19-
set -x
20-
id
21-
5+
function pull_tag_build_images {
226
docker images
237

248
if [ "$JRF_ENABLED" = true ] ; then
@@ -33,16 +17,7 @@ function setup_jenkins {
3317
docker tag "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}" weblogic-kubernetes-operator:latest
3418

3519
docker images
36-
37-
echo "Helm installation starts"
38-
wget -q -O /tmp/helm-v2.8.2-linux-amd64.tar.gz https://kubernetes-helm.storage.googleapis.com/helm-v2.8.2-linux-amd64.tar.gz
39-
mkdir /tmp/helm
40-
tar xzf /tmp/helm-v2.8.2-linux-amd64.tar.gz -C /tmp/helm
41-
chmod +x /tmp/helm/linux-amd64/helm
42-
/usr/local/packages/aime/ias/run_as_root "cp /tmp/helm/linux-amd64/helm /usr/bin/"
43-
rm -rf /tmp/helm
44-
helm init
45-
echo "Helm is configured."
20+
4621
}
4722

4823
function docker_login {
@@ -275,9 +250,7 @@ elif [ "$JENKINS" = "true" ]; then
275250
export M2_HOME=${M2_HOME:?}
276251
export K8S_VERSION=${K8S_VERSION}
277252

278-
clean_jenkins
279-
280-
setup_jenkins
253+
pull_tag_build_images
281254

282255
/usr/local/packages/aime/ias/run_as_root "mkdir -p $PV_ROOT"
283256
/usr/local/packages/aime/ias/run_as_root "mkdir -p $RESULT_ROOT"

0 commit comments

Comments
 (0)