modifies Jenkins's label and removes 2>&2

apache · Oct 8, 2019 · a6de397 · a6de397
1 parent 0b8e739
commit a6de397
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Jenkinsfile-Agent-Test b/Jenkinsfile-Agent-Test
@@ -18,7 +18,7 @@
 
 pipeline {
     agent {
-        label 'jenkins-skywalking1'
+        label 'skywalking'
     }
 
     options {

diff --git a/test/plugin/containers/tomcat-container/docker/run.sh b/test/plugin/containers/tomcat-container/docker/run.sh
@@ -55,11 +55,11 @@ cp ${SCENARIO_HOME}/*.war /usr/local/tomcat/webapps/
 
 # start mock collector
 echo "To start mock collector"
-${TOOLS_HOME}/skywalking-mock-collector/bin/collector-startup.sh 1>/dev/null 2>&2 &
+${TOOLS_HOME}/skywalking-mock-collector/bin/collector-startup.sh 1>/dev/null &
 healthCheck http://localhost:12800/receiveData
 
 echo "To start tomcat"
-/usr/local/tomcat/bin/catalina.sh start 1>/dev/null 2>&2 &
+/usr/local/tomcat/bin/catalina.sh start 1>/dev/null &
 healthCheck ${SCENARIO_HEALTH_CHECK_URL}
 
 echo "To visit entry service"
@@ -76,7 +76,7 @@ java -jar \
   -Xmx256m -Xms256m \
   -DtestDate="`date +%Y-%m-%d-%H-%M`" \
   -DtestCasePath=${SCENARIO_HOME}/data/ \
-  ${TOOLS_HOME}/skywalking-validator-tools.jar 1>/dev/null 2>&2
+  ${TOOLS_HOME}/skywalking-validator-tools.jar 1>/dev/null
 status=$?
 
 if [[ $status -eq 0 ]]; then
@@ -85,4 +85,4 @@ else
   cat ${SCENARIO_HOME}/data/actualData.yaml >&2
   exitOnError "Scenario[${SCENARIO_NAME}-${SCENARIO_VERSION}] failed!"
 fi
-exitAndClean $status
+exitAndClean $status
diff --git a/test/plugin/mock-collector/docker/docker-entrypoint.sh b/test/plugin/mock-collector/docker/docker-entrypoint.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,8 +16,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/usr/bin/env bash
-
 echo "replace GRPC_BIND_HOST with $GRPC_BIND_HOST"
 eval sed -i -e 's/\{GRPC_BIND_HOST\}/$GRPC_BIND_HOST/' /usr/local/skywalking-mock-collector/config/config.properties
 

diff --git a/test/plugin/run.sh b/test/plugin/run.sh
@@ -144,12 +144,12 @@ do
         -Doutput.dir=${case_work_base} \
         -Dagent.dir=${agent_home} \
         -Ddocker.image.version=${build_id} \
-        ${plugin_autotest_helper} 1>${case_work_logs_dir}/helper.log 2>&2
+        ${plugin_autotest_helper} 1>${case_work_logs_dir}/helper.log 
 
     [[ $? -ne 0 ]] && exitWithMessage "${testcase_name}, generate script failure!"
 
     echo "start container of testcase.name=${testcase_name}"
-    bash ${case_work_base}/scenario.sh ${task_state_house} 1>${case_work_logs_dir}/${testcase_name}.log 2>&2 &
+    bash ${case_work_base}/scenario.sh ${task_state_house} 1>${case_work_logs_dir}/${testcase_name}.log &
     sleep 3
 done
 

diff --git a/test/plugin/runner/src/main/resources/container-start-script.template b/test/plugin/runner/src/main/resources/container-start-script.template
@@ -25,7 +25,7 @@ docker run \
         --env SCENARIO_HEALTH_CHECK_URL=${health_check} \
         -v ${agent_home}:/usr/local/skywalking/scenario/agent \
         -v ${scenario_home}:/usr/local/skywalking/scenario \
-        ${docker_image_name}:${docker_image_version} 1>${scenario_home}/logs/container.log 2>&2
+        ${docker_image_name}:${docker_image_version} 1>${scenario_home}/logs/container.log
 
 status="$?"