kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716365585
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
> If you only want to update the agent image in one place, please take a
look, It have been define in the GHA file:
https://github.com/apache/skywalking/pull/7810/files#diff-29a4ad0b26179d51ca486039a03d45f783f02a5906e198292001358a29673c2fR44-R45
What I want is update it in one place, and take effect both locally and in
GHA.
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
The current codes will make it different in local tests and in GHA. If
we update the GHA env var and forgot to update the default value.
##########
File path:
test/e2e-v2/cases/satellite/native-protocols/expected/dependency-services.yml
##########
@@ -0,0 +1,58 @@
+# 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.
+
+nodes:
+{{- range .nodes }}
+{{- if eq .name "User" }}
+- id: VXNlcg==.0
Review comment:
Use `{{ b64 "User }}.0` for better readability and maintainability, the
same for other places in the expected files
##########
File path:
test/e2e-v2/cases/satellite/native-protocols/expected/dependency-services.yml
##########
@@ -0,0 +1,58 @@
+# 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.
+
+nodes:
+{{- range .nodes }}
+{{- if eq .name "User" }}
+- id: VXNlcg==.0
Review comment:
Use `{{ b64 "User" }}.0` for better readability and maintainability, the
same for other places in the expected files
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
> But for the satellite, we also need to use the dockerfile to define
it. because we need to using `nc` to check health. The satellite is using
scratch as the base image.
The `ARG` can also be specified in `docker-compose.yaml` file. What you need
to do is just remove the default value in `Dockerfile.satellite` and set it in
`docker-compose.yaml`, so we can manage all versions in the
`docker-compose.yaml`
```yaml
satellite:
build:
context: ../
dockerfile: Dockerfile.satellite
args:
- SW_AGENT_SATELLITE_COMMIT=${SW_AGENT_SATELLITE_COMMIT}
```
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
@mrproliu OK, then please create a single file to manage the versions.
Maybe we can just export the versions in `setup` steps ?
P.S. I think we need to support the `.env` file feature in infra-e2e, which
seems to be a more standard means in docker-compose to customize the variables.
--
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-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
