You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2021/07/19 02:04:15 UTC

[GitHub] [skywalking-satellite] kezhenxu94 commented on a change in pull request #58: Support native tracing protocol e2e

kezhenxu94 commented on a change in pull request #58:
URL: https://github.com/apache/skywalking-satellite/pull/58#discussion_r671940054



##########
File path: test/e2e/satellite/Dockerfile.satellite
##########
@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one

Review comment:
       Can we just reuse the Dockerfile in `skywalking-satellite/docker/Dockerfile`?

##########
File path: test/e2e/oap/Dockerfile.oap
##########
@@ -0,0 +1,45 @@
+# 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.
+
+FROM openjdk:8-jdk
+
+ARG COMMIT_HASH=408bbf86e6bc75f6a95f11c346daecd570f6b45e
+
+WORKDIR /sw_code
+
+RUN apt-get update && apt-get install -y make git netcat
+RUN git clone https://github.com/apache/skywalking $(pwd) && git reset --hard ${COMMIT_HASH}
+RUN export SKIP_TEST=true && make init && make build.all
+
+RUN set -ex; \
+    cd dist; \
+    tar -xzf "apache-skywalking-apm-bin.tar.gz"; \
+    rm -rf "apache-skywalking-apm-bin.tar.gz"; \
+    rm -rf "apache-skywalking-apm-bin/bin"; rm -rf "apache-skywalking-apm-bin/webapp"; rm -rf "apache-skywalking-apm-bin/agent"; \
+    rm -rf "apache-skywalking-apm-bin/config/log4j2.xml"; \
+    mkdir "apache-skywalking-apm-bin/bin"; \
+    mv "apache-skywalking-apm-bin" /skywalking;
+
+WORKDIR /skywalking
+
+COPY log4j2.xml config/
+COPY docker-entrypoint.sh .

Review comment:
       For `log4j2.xml` we might need to customized it in test case, but for `docker-entrypoint.sh`, I think we can simply reuse the one cloned in the previous steps, line 24.

##########
File path: test/e2e/test/native-tracing/e2e.yaml
##########
@@ -0,0 +1,47 @@
+# 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.
+
+# This file is used to show how to write configuration files and can be used to test.

Review comment:
       Remove this line

##########
File path: test/e2e/oap/Dockerfile.oap
##########
@@ -0,0 +1,45 @@
+# 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.
+
+FROM openjdk:8-jdk
+
+ARG COMMIT_HASH=408bbf86e6bc75f6a95f11c346daecd570f6b45e
+
+WORKDIR /sw_code
+
+RUN apt-get update && apt-get install -y make git netcat

Review comment:
       where is `netcat` used? I don't think we need this, let's only install necessary tools because this would be executed locally and we should save the execution time to avoid wait too long to finish




-- 
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.

To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org