You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/03/29 14:13:24 UTC
[skywalking-nginx-lua] branch master updated: improve nginx e2e
test (#72)
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-nginx-lua.git
The following commit(s) were added to refs/heads/master by this push:
new 7d672d9 improve nginx e2e test (#72)
7d672d9 is described below
commit 7d672d9a983ed4b1b6b9d498d90b6708eb99b13b
Author: Daming <zt...@foxmail.com>
AuthorDate: Mon Mar 29 22:13:16 2021 +0800
improve nginx e2e test (#72)
Co-authored-by: zhuanghaochao <zh...@yy.com>
---
.github/workflows/e2e.yaml | 2 +-
test/e2e/agent-test-tools/pom.xml | 2 +-
.../nginx}/docker/bin/startup.sh | 8 +++++++-
.../nginx}/docker/conf.d/nginx.conf | 2 +-
.../nginx}/pom.xml | 18 +++++++++++++-----
.../org/apache/skywalking/e2e/DataAssertITCase.java | 0
.../nginx}/src/test/resources/expectedData.yaml | 0
test/e2e/{ => e2e-test}/pom.xml | 20 +++++++++++++++-----
test/e2e/pom.xml | 4 ++--
9 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index d08adb3..cd607ce 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -45,4 +45,4 @@ jobs:
run: export MAVEN_OPTS='-Dmaven.repo.local=~/.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'
- name: Compile & E2E Test
run: |
- ./mvnw -f ./test/e2e/pom.xml package verify
+ ./mvnw -f ./test/e2e/pom.xml verify
diff --git a/test/e2e/agent-test-tools/pom.xml b/test/e2e/agent-test-tools/pom.xml
index 30d972d..413a00c 100644
--- a/test/e2e/agent-test-tools/pom.xml
+++ b/test/e2e/agent-test-tools/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.skywalking.plugin.nginx-lua</groupId>
- <artifactId>e2e-tests</artifactId>
+ <artifactId>e2e</artifactId>
<version>1.0.0</version>
</parent>
diff --git a/test/e2e/e2e-with-mock-collector/docker/bin/startup.sh b/test/e2e/e2e-test/nginx/docker/bin/startup.sh
similarity index 87%
rename from test/e2e/e2e-with-mock-collector/docker/bin/startup.sh
rename to test/e2e/e2e-test/nginx/docker/bin/startup.sh
index abb4561..fefa653 100644
--- a/test/e2e/e2e-with-mock-collector/docker/bin/startup.sh
+++ b/test/e2e/e2e-test/nginx/docker/bin/startup.sh
@@ -16,7 +16,13 @@
# specific language governing permissions and limitations
# under the License.
+apt update
+
+apt install -y luarocks
+
+luarocks make rockspec/skywalking-nginx-lua-master-0.rockspec
+
COLLECTOR=$(grep "skywalking-collector" /etc/hosts |awk -F" " '{print $1}')
sed -e "s%\${collector}%${COLLECTOR}%g" /var/nginx/conf.d/nginx.conf > /var/run/nginx.conf
-/usr/bin/openresty -c /var/run/nginx.conf
\ No newline at end of file
+/usr/bin/openresty -c /var/run/nginx.conf
diff --git a/test/e2e/e2e-with-mock-collector/docker/conf.d/nginx.conf b/test/e2e/e2e-test/nginx/docker/conf.d/nginx.conf
similarity index 97%
rename from test/e2e/e2e-with-mock-collector/docker/conf.d/nginx.conf
rename to test/e2e/e2e-test/nginx/docker/conf.d/nginx.conf
index be89a69..ab6bbe5 100644
--- a/test/e2e/e2e-with-mock-collector/docker/conf.d/nginx.conf
+++ b/test/e2e/e2e-test/nginx/docker/conf.d/nginx.conf
@@ -25,7 +25,7 @@ events {
worker_connections 1024;
}
http {
- lua_package_path "/usr/local/skywalking-nginx-lua/lib/?.lua;;";
+ lua_package_path "/usr/local/share/lua/5.1/skywalking/?.lua;;";
# Buffer represents the register inform and the queue of the finished segment
lua_shared_dict tracing_buffer 100m;
diff --git a/test/e2e/e2e-with-mock-collector/pom.xml b/test/e2e/e2e-test/nginx/pom.xml
similarity index 89%
rename from test/e2e/e2e-with-mock-collector/pom.xml
rename to test/e2e/e2e-test/nginx/pom.xml
index 1286e15..e171fe3 100644
--- a/test/e2e/e2e-with-mock-collector/pom.xml
+++ b/test/e2e/e2e-test/nginx/pom.xml
@@ -22,10 +22,11 @@
<parent>
<groupId>org.apache.skywalking.plugin.nginx-lua</groupId>
- <artifactId>e2e-tests</artifactId>
+ <artifactId>e2e-test</artifactId>
<version>1.0.0</version>
</parent>
- <artifactId>e2e-with-mock-collector</artifactId>
+
+ <artifactId>nginx</artifactId>
<packaging>jar</packaging>
<build>
@@ -37,8 +38,15 @@
<containerNamePattern>%a-%t-%i</containerNamePattern>
<images>
<image>
- <name>openresty/openresty</name>
- <alias>openresty-with-skywalking</alias>
+ <name>openresty-with-skywalking</name>
+ <build>
+ <from>openresty/openresty</from>
+ <workdir>/skywalking-nginx-lua</workdir>
+ <cmd>
+ <shell>apt update</shell>
+ <shell>apt install -y luarocks</shell>
+ </cmd>
+ </build>
<run>
<dependsOn>
<container>skywalking-collector</container>
@@ -51,7 +59,7 @@
<volume>${project.basedir}/docker/conf.d:/var/nginx/conf.d</volume>
<volume>${project.basedir}/docker/bin:/opt/bin</volume>
<volume>
- ${project.basedir}/../../../lib:/usr/local/skywalking-nginx-lua/lib
+ ${project.basedir}/../../../..:/skywalking-nginx-lua/
</volume>
</bind>
</volumes>
diff --git a/test/e2e/e2e-with-mock-collector/src/test/java/org/apache/skywalking/e2e/DataAssertITCase.java b/test/e2e/e2e-test/nginx/src/test/java/org/apache/skywalking/e2e/DataAssertITCase.java
similarity index 100%
rename from test/e2e/e2e-with-mock-collector/src/test/java/org/apache/skywalking/e2e/DataAssertITCase.java
rename to test/e2e/e2e-test/nginx/src/test/java/org/apache/skywalking/e2e/DataAssertITCase.java
diff --git a/test/e2e/e2e-with-mock-collector/src/test/resources/expectedData.yaml b/test/e2e/e2e-test/nginx/src/test/resources/expectedData.yaml
similarity index 100%
rename from test/e2e/e2e-with-mock-collector/src/test/resources/expectedData.yaml
rename to test/e2e/e2e-test/nginx/src/test/resources/expectedData.yaml
diff --git a/test/e2e/pom.xml b/test/e2e/e2e-test/pom.xml
similarity index 95%
copy from test/e2e/pom.xml
copy to test/e2e/e2e-test/pom.xml
index bc30b91..5910793 100644
--- a/test/e2e/pom.xml
+++ b/test/e2e/e2e-test/pom.xml
@@ -23,16 +23,19 @@
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.skywalking.plugin.nginx-lua</groupId>
- <artifactId>e2e-tests</artifactId>
- <version>1.0.0</version>
+ <parent>
+ <groupId>org.apache.skywalking.plugin.nginx-lua</groupId>
+ <artifactId>e2e</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>e2e-test</artifactId>
<name>SkyWalking Nginx Lua E2E Tests</name>
<packaging>pom</packaging>
<modules>
- <module>agent-test-tools</module>
- <module>e2e-with-mock-collector</module>
+ <module>nginx</module>
</modules>
<properties>
@@ -217,6 +220,13 @@
</configuration>
<executions>
<execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ <execution>
<id>start</id>
<phase>pre-integration-test</phase>
<goals>
diff --git a/test/e2e/pom.xml b/test/e2e/pom.xml
index bc30b91..20685bb 100644
--- a/test/e2e/pom.xml
+++ b/test/e2e/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.skywalking.plugin.nginx-lua</groupId>
- <artifactId>e2e-tests</artifactId>
+ <artifactId>e2e</artifactId>
<version>1.0.0</version>
<name>SkyWalking Nginx Lua E2E Tests</name>
@@ -32,7 +32,7 @@
<modules>
<module>agent-test-tools</module>
- <module>e2e-with-mock-collector</module>
+ <module>e2e-test</module>
</modules>
<properties>