From 33df7c9b85d3fcf8b0c03d0cb5c79520737f2c38 Mon Sep 17 00:00:00 2001 From: Daming Date: Tue, 5 Nov 2019 10:01:39 +0800 Subject: [PATCH] [test/plugin] Don't copy all optional plugins by default (#3781) * Not support copy all optional plugins * fix * Update test/plugin/run.sh to correct the mistakes of grammar Co-Authored-By: kezhenxu94 --- test/plugin/run.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/plugin/run.sh b/test/plugin/run.sh index 377d615b2d..b4c024388b 100644 --- a/test/plugin/run.sh +++ b/test/plugin/run.sh @@ -143,7 +143,7 @@ test -z "$scenario_name" && exitWithMessage "Missing value for the scenario argu if [[ ! -d ${agent_home} ]]; then echo "[WARN] SkyWalking Agent not exists" - ${mvnw} -f ${home}/../../pom.xml -Pagent -DskipTests clean package + ${mvnw} -f ${home}/../../pom.xml -Pagent -DskipTests -DBUILD_NO=${BUILD_NO:=local} clean package fi [[ "$force_build" == "on" ]] && ${mvnw} -f ${home}/pom.xml clean package -DskipTests docker:build @@ -172,9 +172,8 @@ running_mode=$(grep "^runningMode" ${scenario_home}/configuration.yml |sed -e "s with_plugins=$(grep "^withPlugins" ${scenario_home}/configuration.yml |sed -e "s/ //g" |awk -F: '{print $2}') if [[ -n "${running_mode}" ]]; then - # [[ -z "${with_plugins}" ]] ; then&& exitWithMessage \ - # "'withPlugins' has required configuration when 'runningMode' was set as 'optional_plugins' or 'bootstrap_plugins'" - [[ -z "${with_plugins}" ]] && with_plugins="*.jar" + [[ -z "${with_plugins}" ]] && exitWithMessage \ + "'withPlugins' is required configuration when 'runningMode' was set as 'optional_plugins' or 'bootstrap_plugins'" agent_home_selector ${running_mode} ${with_plugins} fi -- GitLab