You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2020/03/22 13:36:39 UTC
[skywalking] branch chore/licensing-and-e2e updated: Fix license
headers and rename E2E job name
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch chore/licensing-and-e2e
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/chore/licensing-and-e2e by this push:
new 1e9aabd Fix license headers and rename E2E job name
1e9aabd is described below
commit 1e9aabd55cdfa69808999449549faec805313e2b
Author: kezhenxu94 <ke...@163.com>
AuthorDate: Sun Mar 22 21:36:17 2020 +0800
Fix license headers and rename E2E job name
---
.github/workflows/e2e.yaml | 2 +-
test/e2e/e2e-test/docker/cluster/download-mysql.sh | 15 +++++++--------
test/e2e/e2e-test/docker/profile/download-mysql.sh | 15 +++++++--------
test/e2e/e2e-test/docker/storage/download-mysql.sh | 15 +++++++--------
test/e2e/pom.xml | 8 ++++++++
5 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 8ee9d81..554f9b9 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -80,7 +80,7 @@ jobs:
name: logs
path: logs
- Gateway:
+ FeatureGroup03:
name: Gateway
runs-on: ubuntu-latest
steps:
diff --git a/test/e2e/e2e-test/docker/cluster/download-mysql.sh b/test/e2e/e2e-test/docker/cluster/download-mysql.sh
index ede411e..970937c 100755
--- a/test/e2e/e2e-test/docker/cluster/download-mysql.sh
+++ b/test/e2e/e2e-test/docker/cluster/download-mysql.sh
@@ -1,11 +1,9 @@
-#!/usr/bin/env bash
-# Licensed to the SkyAPM under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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
+# 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 regarding copyright ownership.
+# The ASF licenses this file to You 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
#
@@ -14,6 +12,7 @@
# 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.
+#!/usr/bin/env bash
set -ex
diff --git a/test/e2e/e2e-test/docker/profile/download-mysql.sh b/test/e2e/e2e-test/docker/profile/download-mysql.sh
index ede411e..970937c 100755
--- a/test/e2e/e2e-test/docker/profile/download-mysql.sh
+++ b/test/e2e/e2e-test/docker/profile/download-mysql.sh
@@ -1,11 +1,9 @@
-#!/usr/bin/env bash
-# Licensed to the SkyAPM under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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
+# 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 regarding copyright ownership.
+# The ASF licenses this file to You 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
#
@@ -14,6 +12,7 @@
# 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.
+#!/usr/bin/env bash
set -ex
diff --git a/test/e2e/e2e-test/docker/storage/download-mysql.sh b/test/e2e/e2e-test/docker/storage/download-mysql.sh
index ede411e..970937c 100755
--- a/test/e2e/e2e-test/docker/storage/download-mysql.sh
+++ b/test/e2e/e2e-test/docker/storage/download-mysql.sh
@@ -1,11 +1,9 @@
-#!/usr/bin/env bash
-# Licensed to the SkyAPM under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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
+# 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 regarding copyright ownership.
+# The ASF licenses this file to You 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
#
@@ -14,6 +12,7 @@
# 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.
+#!/usr/bin/env bash
set -ex
diff --git a/test/e2e/pom.xml b/test/e2e/pom.xml
index 0e37bb2..0283b75 100644
--- a/test/e2e/pom.xml
+++ b/test/e2e/pom.xml
@@ -111,6 +111,14 @@
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/docker</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>