From f40c3b6d38ddb3532897dff991662b4b7d1d66b6 Mon Sep 17 00:00:00 2001 From: ecaiyanlinux Date: Thu, 4 Jun 2020 09:34:31 +0200 Subject: [PATCH] prepare for jenkins test Signed-off-by: ecaiyanlinux Issue-ID: NONRTRIC-237 Change-Id: Iabcc2f514bf1ff73545ddfa6697c23f3a4f5c31c --- policy-agent/pom.xml | 28 +++++++++++++++++++++++++--- test/jenkins/.gitignore | 9 +++++++++ test/jenkins/run_test.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 test/jenkins/.gitignore create mode 100755 test/jenkins/run_test.sh diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml index 2943ef8b..76f3c33a 100644 --- a/policy-agent/pom.xml +++ b/policy-agent/pom.xml @@ -61,6 +61,7 @@ 2.1.1 3.7.0.1746 0.8.5 + 1.6.0 @@ -226,7 +227,7 @@ ${project.basedir}/eclipse-formatter.xml - @@ -241,8 +242,8 @@ - @@ -360,6 +361,27 @@ sonar-maven-plugin ${sonar-maven-plugin.version} + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + run-test-script + verify + + exec + + + + + bash + + run_test.sh + + ../test/jenkins/ + + diff --git a/test/jenkins/.gitignore b/test/jenkins/.gitignore new file mode 100644 index 00000000..e8cbd0e2 --- /dev/null +++ b/test/jenkins/.gitignore @@ -0,0 +1,9 @@ +.consul_config.json +.docker-images-table +.httplog_FTC10.txt +.image-list +.output.consul_config.json +.resultFTC10.txt +.timer_measurement.txt +.tmp.curl.json +logs/ diff --git a/test/jenkins/run_test.sh b/test/jenkins/run_test.sh new file mode 100755 index 00000000..469288d6 --- /dev/null +++ b/test/jenkins/run_test.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +# ============LICENSE_START=============================================== +# Copyright (C) 2020 Nordix Foundation. All rights reserved. +# ======================================================================== +# 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. +# ============LICENSE_END================================================= +# + +# This script is to set up test env in jenkins vm + +echo "--> run_integration.sh" + +# Install docker-compose +curl -L "https://github.com/docker/compose/releases/download/1.26.0/docker-compose-$(uname -s)-$(uname -m)" -o ./docker-compose +chmod +x docker-compose +export PATH=$PATH:`pwd` + +# Run auto-test scripts +cd ../auto-test/ +bash FTC10.sh remote auto-clean --use-local-image PA SDNC + +echo "--> run_integration.sh END" + +FILE=.resultFTC10.txt +if [[ -f "$FILE" ]]; then + res=$(cat .resultFTC10.txt) + docker system prune -f + exit $res +fi +docker system prune -f +exit 1 -- 2.16.6