[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project URL: https://github.com/apache/skywalking/pull/4268#discussion_r368265731 ## File path: test/e2e/e2e-profile/e2e-profile-test-runner/pom.xml ## @@ -46,5 +46,254 @@ + +e2e-profile-service +1.1 + skywalking-e2e-container-${build.id}-profile + + + + + +mysql + + + +io.fabric8 +docker-maven-plugin + + %a-%t-%i + + + mysql/mysql-server:${mysql.version} + ${e2e.container.name.prefix}-datasource + + +Socket: '/var/run/mysqld/mysqlx.sock' bind-address: '::' port: 3306 +12 + + + root@1234 + swtest + % + + +mysql.port:3306 + + + + + skyapm/e2e-container:${e2e.container.version} + ${e2e.container.name.prefix}-runner + + +mysql + jdbc:mysql://${e2e.container.name.prefix}-datasource:3306/swtest + + ${provider.name}-${project.version}.jar + + + -DSW_AGENT_COLLECTOR_BACKEND_SERVICES=127.0.0.1:11800 +-DSW_AGENT_PROFILE_ACTIVE=true + -DSW_AGENT_NAME=${provider.name} +-Dserver.port=9090 + + + + ${e2e.container.name.prefix}-datasource + + + ${e2e.container.name.prefix}-datasource + + + +webapp.host:webapp.port:8081 + +service.host:service.port:9090 + + + +${sw.home}:/sw + ${project.build.directory}:/home + ../${provider.name}/target/${provider.name}-${project.version}.jar:/home/${provider.name}-${project.version}.jar + ${project.basedir}/src/docker/rc.d:/rc.d:ro + ${project.basedir}/src/docker/clusterize.awk:/clusterize.awk + + + +SkyWalking e2e container is ready for tests +300 + + + + + + + + + + + + +h2 + + + +io.fabric8 +docker-maven-plugin + + %a-%t-%i +Always + + + skyapm/e2e-container:${e2e.container.version} +${e2e.container.name.prefix} + + +h2 +
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project URL: https://github.com/apache/skywalking/pull/4268#discussion_r368265708 ## File path: test/e2e/e2e-profile/e2e-profile-test-runner/pom.xml ## @@ -46,5 +46,254 @@ + +e2e-profile-service +1.1 + skywalking-e2e-container-${build.id}-profile + + + + Review comment: ```suggestion ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project URL: https://github.com/apache/skywalking/pull/4268#discussion_r368266217 ## File path: test/e2e/e2e-profile/e2e-profile-test-runner/src/docker/clusterize.awk ## @@ -0,0 +1,64 @@ +# 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 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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/awk -f + +BEGIN { Review comment: The file name `clusterize.awk` should be changed (after copying), `clusterize.awk` is originally used to modify the `application.yml` to make it run in cluster mode (to test coordinators), here should be named with something like `adapt_storage` or other storage related names, if you like This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project URL: https://github.com/apache/skywalking/pull/4268#discussion_r368265675 ## File path: .github/workflows/e2e.yaml ## @@ -111,10 +111,10 @@ jobs: ./mvnw -Dcheckstyle.skip -Drat.skip -T2 -Dmaven.compile.fork -Dmaven.compiler.maxmem=3072 -DskipTests clean install ./mvnw -f test/e2e/pom.xml -pl e2e-base clean install - name: Profile Tests H2(JDK8) -run: export E2E_VERSION=jdk8-1.3 && bash -x test/e2e/run.sh e2e-profile/e2e-profile-h2-test-runner +run: export E2E_VERSION=jdk8-1.3 && bash -x test/e2e/run.sh e2e-profile/e2e-profile-test-runner --env=h2 Review comment: change the name `env` to `storage` please, we may have other `env` in the future This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project URL: https://github.com/apache/skywalking/pull/4268#discussion_r368265760 ## File path: test/e2e/run.sh ## @@ -70,6 +73,7 @@ do -De2e.container.version="${E2E_VERSION}" \ -Delasticsearch.version="${ES_VERSION}" \ -Dsw.home="${base_dir}/$test_case/${DIST_PACKAGE//.tar.gz/}" \ + `if [ ! -z "${env}" ] ; then echo -P"${env}"; fi` \ Review comment: same here This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project URL: https://github.com/apache/skywalking/pull/4268#discussion_r368265752 ## File path: test/e2e/run.sh ## @@ -36,6 +36,9 @@ while [[ $# -gt 0 ]]; do --profiles=*) profiles=${1#*=} ;; +--env=*) Review comment: `env` -> `storage` please This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project URL: https://github.com/apache/skywalking/pull/4268#discussion_r368265716 ## File path: test/e2e/e2e-profile/e2e-profile-test-runner/pom.xml ## @@ -46,5 +46,254 @@ + +e2e-profile-service +1.1 + skywalking-e2e-container-${build.id}-profile + + + + + +mysql + + + +io.fabric8 +docker-maven-plugin + + %a-%t-%i + + + mysql/mysql-server:${mysql.version} + ${e2e.container.name.prefix}-datasource + + +Socket: '/var/run/mysqld/mysqlx.sock' bind-address: '::' port: 3306 +12 + + + root@1234 + swtest + % + + +mysql.port:3306 + + + + + skyapm/e2e-container:${e2e.container.version} + ${e2e.container.name.prefix}-runner + + +mysql + jdbc:mysql://${e2e.container.name.prefix}-datasource:3306/swtest + + ${provider.name}-${project.version}.jar + + + -DSW_AGENT_COLLECTOR_BACKEND_SERVICES=127.0.0.1:11800 +-DSW_AGENT_PROFILE_ACTIVE=true + -DSW_AGENT_NAME=${provider.name} +-Dserver.port=9090 + + + + ${e2e.container.name.prefix}-datasource + + + ${e2e.container.name.prefix}-datasource + + + +webapp.host:webapp.port:8081 + +service.host:service.port:9090 + + + +${sw.home}:/sw + ${project.build.directory}:/home + ../${provider.name}/target/${provider.name}-${project.version}.jar:/home/${provider.name}-${project.version}.jar + ${project.basedir}/src/docker/rc.d:/rc.d:ro + ${project.basedir}/src/docker/clusterize.awk:/clusterize.awk + + + +SkyWalking e2e container is ready for tests +300 + + + + + + + + + + + Review comment: ```suggestion ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services