From 7334f68a8186a8a0e78f72422bba3fda42e0152b Mon Sep 17 00:00:00 2001 From: Felipe Vicens Date: Wed, 24 Jun 2020 15:59:59 +0200 Subject: [PATCH] Adding tests repository to CI/CD pipeline Change-Id: I7ec51ef7e3e3d1a5c111c9678205a425b81e148b Signed-off-by: Felipe Vicens --- docker/Makefile | 2 +- docker/mk/Makefile.include | 3 +- docker/tests/Dockerfile | 63 ++++++++++++++++++++++++++ docker/tests/Makefile | 19 ++++++++ jenkins/ci-pipelines/ci_stage_3.groovy | 2 +- 5 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 docker/tests/Dockerfile create mode 100644 docker/tests/Makefile diff --git a/docker/Makefile b/docker/Makefile index f2c4ec7a..a3b40288 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -14,5 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # -SUBDIRS = MON NBI osmclient RO LCM light-ui POL Keystone NG-UI PLA +SUBDIRS = MON NBI osmclient RO LCM light-ui POL Keystone NG-UI PLA tests include mk/dirs.mk diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include index 6d5f2615..b4e63f93 100644 --- a/docker/mk/Makefile.include +++ b/docker/mk/Makefile.include @@ -34,7 +34,7 @@ CONTAINER_NAME ?= $(LOWER_MDG) CMD_DOCKER_ARGS ?= -q DOCKER_ARGS = $(CMD_DOCKER_ARGS) -DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui ngui PLA +DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui ngui PLA tests DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS)) @@ -74,6 +74,7 @@ build: $(MKBUILD) $(DEPS_TARGETS) --build-arg N2VC_VERSION==$(shell cat $(MKBUILD)/.dep_N2VC) \ --build-arg LWUI_VERSION==$(shell cat $(MKBUILD)/.dep_lightui) \ --build-arg NGUI_VERSION==$(shell cat $(MKBUILD)/.dep_ngui) \ + --build-arg TESTS_VERSION==$(shell cat $(MKBUILD)/.dep_tests) \ $(DOCKER_ARGS) . clean: diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile new file mode 100644 index 00000000..a7153186 --- /dev/null +++ b/docker/tests/Dockerfile @@ -0,0 +1,63 @@ +# Copyright 2020 ETSI +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM ubuntu:18.04 + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install git software-properties-common \ + curl xz-utils gnupg2 apt-transport-https make python3 debhelper python3-setuptools python3-pip apt-utils \ + ssh iputils-ping libcurl4-openssl-dev libssl-dev python3-openstackclient +RUN add-apt-repository -y ppa:rmescandon/yq && apt update && apt install yq -y +RUN python3 -m pip install haikunator requests robotframework robotframework-seleniumlibrary \ + robotframework-requests robotframework-jsonlibrary robotframework-sshlibrary charm-tools \ + git+https://osm.etsi.org/gerrit/osm/IM.git git+https://osm.etsi.org/gerrit/osm/osmclient.git + +ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian +ARG RELEASE=ReleaseSEVEN-daily +ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg +ARG REPOSITORY=testing +ARG TESTS_VERSION + +RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add - +RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} tests" && apt-get update + +RUN apt-get install -y osm-tests${TESTS_VERSION} && \ + rm -rf /var/lib/apt/lists/* + +RUN mv /usr/share/osm-tests/robot-systest /robot-systest +RUN mv /usr/share/osm-tests/charm.sh /usr/sbin/charm + +WORKDIR /robot-systest + +RUN git clone https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git --recurse-submodules /robot-systest/osm-packages + +# Folder where Robot tests are stored +ENV ROBOT_DEVOPS_FOLDER=/robot-systest + +# Folder to save alternative DUT environments (optional) +ENV ENVIRONMENTS_FOLDER=environments + +# Folder where all required packages are stored +ENV PACKAGES_FOLDER=/robot-systest/osm-packages + +# Folder where test results should be exported +ENV ROBOT_REPORT_FOLDER=/robot-systest/results + +# Kubeconfig file +ENV K8S_CREDENTIALS=/root/.kube/config + +ENV LC_ALL=C.UTF-8 +ENV LANG=C.UTF-8 + +ENTRYPOINT [ "/robot-systest/run_test.sh"] \ No newline at end of file diff --git a/docker/tests/Makefile b/docker/tests/Makefile new file mode 100644 index 00000000..0fb388be --- /dev/null +++ b/docker/tests/Makefile @@ -0,0 +1,19 @@ +## +# Copyright 2020 ETSI +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## + +include ../mk/Makefile.include + +MDG=$(shell basename $(CURDIR)) diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index b75ebd0c..1f600535 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -135,7 +135,7 @@ node("${params.NODE}") { // grab all stable upstream builds based on the dir("${RELEASE}") { - def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM", "POL", "LW-UI", "NG-UI", "PLA"] + def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM", "POL", "LW-UI", "NG-UI", "PLA", "tests"] for (component in list) { step ([$class: 'CopyArtifact', projectName: "${component}${upstream_main_job}/${GERRIT_BRANCH}"]) -- 2.25.1