[skywalking] branch master updated: Switch to SkyWalking CI nodes (#3546)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 13547c6  Switch to SkyWalking CI nodes (#3546)
13547c6 is described below

commit 13547c66997baca04664b6d18d27bc4ad474b724
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Sep 30 12:32:22 2019 +0800

    Switch to SkyWalking CI nodes (#3546)
    
    * Switch to SkyWalking CI nodes
    
    * Switch E2E to SkyWalking CI nodes
    
    * Identify CI container name
---
 Jenkinsfile     | 2 +-
 Jenkinsfile-E2E | 2 +-
 pom.xml         | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 673bc66..b63dc9e 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
             parallel {
                 stage('JDK 1.8 on Linux') {
                     agent {
-                        label 'xenial'
+                        label 'skywalking'
                     }
 
                     tools {
diff --git a/Jenkinsfile-E2E b/Jenkinsfile-E2E
index 2275386..1bb9e89 100755
--- a/Jenkinsfile-E2E
+++ b/Jenkinsfile-E2E
@@ -18,7 +18,7 @@
 
 pipeline {
     agent {
-        label 'xenial'
+        label 'skywalking'
     }
 
     tools {
diff --git a/pom.xml b/pom.xml
index 7ae2edb..641d0a8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -322,6 +322,9 @@
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
                     <version>${maven-docker-plugin.version}</version>
+                    <configuration>
+                        <containerNamePattern>%a-%t-%i</containerNamePattern>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>