From c596f2864585d86379e1c824f3f390d0642bdfe3 Mon Sep 17 00:00:00 2001 From: aktas Date: Mon, 6 Sep 2021 13:23:35 +0300 Subject: [PATCH] Removing juju installation in the jenkins pipeline With the new way of the juju accces in k8s_08 testsuite, installing juju in the container is not needed. k8s_08 testsuite changes: https://osm.etsi.org/gerrit/c/osm/tests/+/11104 Change-Id: I945aa6995241869926c5f76ec9c3eaf960576920 Signed-off-by: aktas (cherry picked from commit 8e0504fac0d2280b41a07f1e4c124c376997c50d) --- README.md | 5 ----- docker/Dockerfile | 16 +--------------- robot-systest/run_test.sh | 4 +--- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 1d7d5dc..68741c2 100644 --- a/README.md +++ b/README.md @@ -64,9 +64,6 @@ OS_SDNC= # K8S config file K8S_CREDENTIALS= -# Juju data file -JUJU_DATA= - # The following set of environment variables will be used in host # of the robot framework. Not needed for docker execution @@ -106,7 +103,6 @@ Volumes: * [OPTIONAL]: It is the absolute path to the clouds.yaml file in the host * [OPTIONAL]: It is the absolute path to the sdncs.yaml file in the host * [OPTIONAL]: It is the kubeconfig file to be used for k8s clusters -* [OPTIONAL]: It is the jujudata file to be used for juju cli ```bash docker run --rm=true -t osmtests --env-file \ @@ -114,7 +110,6 @@ docker run --rm=true -t osmtests --env-file \ -v :/robot-systest/clouds.yaml \ -v :/robot-systest/sdncs.yaml \ -v :/root/.kube/config \ - -v :/root/.local/share/juju \ -o \ -p \ -t diff --git a/docker/Dockerfile b/docker/Dockerfile index a0740ff..b3b7860 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,18 +21,7 @@ FROM ubuntu:18.04 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install git software-properties-common \ make python3 debhelper python3-pip apt-utils ssh iputils-ping libcurl4-openssl-dev libssl-dev cargo rustc -# Installing Juju -ARG JUJU_VERSION_M=2.8 -ARG JUJU_VERSION_R=11 -ARG JUJU_VERSION=$JUJU_VERSION_M.$JUJU_VERSION_R - -RUN curl --output /tmp/juju-$JUJU_VERSION-linux-amd64.tar.xz -LO \ - https://launchpad.net/juju/$JUJU_VERSION_M/$JUJU_VERSION/+download/juju-$JUJU_VERSION-linux-amd64.tar.xz && \ - tar -xf /tmp/juju-$JUJU_VERSION-linux-amd64.tar.xz -C /tmp && \ - install /tmp/juju /usr/local/bin/juju && \ - rm /tmp/juju /tmp/juju-$JUJU_VERSION-linux-amd64.tar.xz - -RUN add-apt-repository -y ppa:rmescandon/yq && apt update && apt install yq -y +RUN add-apt-repository -y ppa:rmescandon/yq && apt update && apt install yq -y RUN python3 -m pip install -U pip @@ -67,9 +56,6 @@ ENV ROBOT_REPORT_FOLDER=/robot-systest/reports # Kubeconfig file ENV K8S_CREDENTIALS=/root/.kube/config -# Juju data folder -ENV JUJU_DATA=/root/.local/share/juju - # OSM RSA file ENV OSM_RSA_FILE=/root/osm_id_rsa diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh index 75cd0d4..dd77f8e 100755 --- a/robot-systest/run_test.sh +++ b/robot-systest/run_test.sh @@ -150,7 +150,6 @@ Usage: -v :/reports osmtests \\ -v :/robot-systest/clouds.yaml \\ -v :/root/.kube/config \\ - -v :/root/.local/share/juju \\ -o \\ -p \\ -t @@ -166,8 +165,7 @@ Options: Volumes: [OPTIONAL]: It is the absolute path to reports location in the host [OPTIONAL]: It is the absolute path to the clouds.yaml file in the host - [OPTIONAL]: It is the kubeconfig file to be used for k8s clusters - [OPTIONAL]: It is the jujudata file to be used for juju cli" + [OPTIONAL]: It is the kubeconfig file to be used for k8s clusters" exit 0 ;; -- 2.25.1