diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 46cd288deb46..7e5cc26a8abd 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -769,7 +769,7 @@ jobs: if: matrix.test.docker != null run: docker build -t ${{ matrix.test.docker.name }} -f ${{ matrix.test.docker.base }}/${{ matrix.test.docker.file }} ${{ matrix.test.docker.base }} - name: ${{ matrix.test.name }} - uses: apache/skywalking-infra-e2e@ef073adb8b9e148e4eaf3f905fa4e238ee5cc7d6 + uses: apache/skywalking-infra-e2e@530f9976e4bf12b65a6604ea0efbeafabeeea2a3 with: e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }} - if: ${{ failure() }} @@ -843,7 +843,7 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: ALS ${{ matrix.storage }}, ${{ matrix.analyzer }}, istio-${{ matrix.versions.istio }}, k8s-${{ matrix.versions.kubernetes }} - uses: apache/skywalking-infra-e2e@ef073adb8b9e148e4eaf3f905fa4e238ee5cc7d6 + uses: apache/skywalking-infra-e2e@530f9976e4bf12b65a6604ea0efbeafabeeea2a3 env: ISTIO_VERSION: ${{ matrix.versions.istio }} KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }} @@ -915,7 +915,7 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: ${{ matrix.test.name }} - uses: apache/skywalking-infra-e2e@ef073adb8b9e148e4eaf3f905fa4e238ee5cc7d6 + uses: apache/skywalking-infra-e2e@530f9976e4bf12b65a6604ea0efbeafabeeea2a3 env: ISTIO_VERSION: ${{ matrix.versions.istio }} KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }} @@ -979,7 +979,7 @@ jobs: shell: bash run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean package - name: Java version ${{ matrix.java-version }} - uses: apache/skywalking-infra-e2e@ef073adb8b9e148e4eaf3f905fa4e238ee5cc7d6 + uses: apache/skywalking-infra-e2e@530f9976e4bf12b65a6604ea0efbeafabeeea2a3 env: SW_AGENT_JDK_VERSION: ${{ matrix.java-version }} with: @@ -1075,7 +1075,7 @@ jobs: fi docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml down -v - name: ${{ matrix.test.name }} - uses: apache/skywalking-infra-e2e@ef073adb8b9e148e4eaf3f905fa4e238ee5cc7d6 + uses: apache/skywalking-infra-e2e@530f9976e4bf12b65a6604ea0efbeafabeeea2a3 with: e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }} - if: ${{ failure() }} diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7f6e56474dfc..b100ed7d673d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3.8' services: elasticsearch: profiles: diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 375ef49e9da6..bfa0c816e69b 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -1,6 +1,8 @@ ## 10.5.0 #### Project +* Bump infra-e2e to testcontainers-go v0.42.0 (apache/skywalking-infra-e2e#146), which uses Docker Compose v2 plugin natively and removes docker-compose v1 dependency. +* Remove deprecated `version` field from all docker-compose files for Compose v2 compatibility. #### OAP Server * Add Zipkin Virtual GenAI e2e test. Use `zipkin_json` exporter to avoid protobuf dependency conflict @@ -28,6 +30,5 @@ #### Documentation - All issues and pull requests are [here](https://github.com/apache/skywalking/issues?q=milestone:10.5.0) diff --git a/test/e2e-v2/cases/activemq/docker-compose.yml b/test/e2e-v2/cases/activemq/docker-compose.yml index 2b58f5eff52a..8aac1bcf5252 100644 --- a/test/e2e-v2/cases/activemq/docker-compose.yml +++ b/test/e2e-v2/cases/activemq/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: "2.1" - services: oap: extends: diff --git a/test/e2e-v2/cases/alarm/banyandb/docker-compose.yml b/test/e2e-v2/cases/alarm/banyandb/docker-compose.yml index a08b02cad0b4..f138e44204a0 100644 --- a/test/e2e-v2/cases/alarm/banyandb/docker-compose.yml +++ b/test/e2e-v2/cases/alarm/banyandb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: banyandb: extends: diff --git a/test/e2e-v2/cases/alarm/es/docker-compose.yml b/test/e2e-v2/cases/alarm/es/docker-compose.yml index fd9ed272963f..2a4ce7e50134 100644 --- a/test/e2e-v2/cases/alarm/es/docker-compose.yml +++ b/test/e2e-v2/cases/alarm/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml index aa79e2efd48d..53b4ce440edb 100644 --- a/test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/alarm/mysql/docker-compose.yml b/test/e2e-v2/cases/alarm/mysql/docker-compose.yml index 340dac7dff1b..ac58312d09a5 100644 --- a/test/e2e-v2/cases/alarm/mysql/docker-compose.yml +++ b/test/e2e-v2/cases/alarm/mysql/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: mysql: image: mysql/mysql-server:8.0.13 diff --git a/test/e2e-v2/cases/alarm/postgres/docker-compose.yml b/test/e2e-v2/cases/alarm/postgres/docker-compose.yml index 11c5f30cc197..f8c076c70d06 100644 --- a/test/e2e-v2/cases/alarm/postgres/docker-compose.yml +++ b/test/e2e-v2/cases/alarm/postgres/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: postgres: image: postgres:13 diff --git a/test/e2e-v2/cases/apisix/otel-collector/docker-compose.yml b/test/e2e-v2/cases/apisix/otel-collector/docker-compose.yml index cb717c2f94c1..22ed38123f54 100644 --- a/test/e2e-v2/cases/apisix/otel-collector/docker-compose.yml +++ b/test/e2e-v2/cases/apisix/otel-collector/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/aws/api-gateway/docker-compose.yml b/test/e2e-v2/cases/aws/api-gateway/docker-compose.yml index 77a0f9efdeaf..c22df968a860 100644 --- a/test/e2e-v2/cases/aws/api-gateway/docker-compose.yml +++ b/test/e2e-v2/cases/aws/api-gateway/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/aws/dynamodb/docker-compose.yml b/test/e2e-v2/cases/aws/dynamodb/docker-compose.yml index 5dc01ea6894a..198351c8477e 100644 --- a/test/e2e-v2/cases/aws/dynamodb/docker-compose.yml +++ b/test/e2e-v2/cases/aws/dynamodb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/aws/eks/docker-compose.yml b/test/e2e-v2/cases/aws/eks/docker-compose.yml index 77a0f9efdeaf..c22df968a860 100644 --- a/test/e2e-v2/cases/aws/eks/docker-compose.yml +++ b/test/e2e-v2/cases/aws/eks/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/aws/s3/docker-compose.yml b/test/e2e-v2/cases/aws/s3/docker-compose.yml index 77a0f9efdeaf..c22df968a860 100644 --- a/test/e2e-v2/cases/aws/s3/docker-compose.yml +++ b/test/e2e-v2/cases/aws/s3/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/banyandb/docker-compose.yml b/test/e2e-v2/cases/banyandb/docker-compose.yml index c95c595a7577..2b0d618a8178 100644 --- a/test/e2e-v2/cases/banyandb/docker-compose.yml +++ b/test/e2e-v2/cases/banyandb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: @@ -47,5 +45,3 @@ services: networks: e2e: - - diff --git a/test/e2e-v2/cases/baseline/banyandb/docker-compose.yml b/test/e2e-v2/cases/baseline/banyandb/docker-compose.yml index 719c046ecc52..8570f93ca99e 100644 --- a/test/e2e-v2/cases/baseline/banyandb/docker-compose.yml +++ b/test/e2e-v2/cases/baseline/banyandb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: banyandb: extends: diff --git a/test/e2e-v2/cases/baseline/es/docker-compose.yml b/test/e2e-v2/cases/baseline/es/docker-compose.yml index f4dcf9537868..8e48eebb81d5 100644 --- a/test/e2e-v2/cases/baseline/es/docker-compose.yml +++ b/test/e2e-v2/cases/baseline/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml index e247fbe48166..001e80973851 100644 --- a/test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/browser/docker-compose.yml b/test/e2e-v2/cases/browser/docker-compose.yml index b9bbecf655c6..8e37bc627836 100644 --- a/test/e2e-v2/cases/browser/docker-compose.yml +++ b/test/e2e-v2/cases/browser/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/browser/es/docker-compose.yml b/test/e2e-v2/cases/browser/es/docker-compose.yml index 0c009a2e8301..66667af3ab36 100644 --- a/test/e2e-v2/cases/browser/es/docker-compose.yml +++ b/test/e2e-v2/cases/browser/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml index 45198e2c4243..c7554d610542 100644 --- a/test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/clickhouse/clickhouse-prometheus-endpoint/docker-compose.yml b/test/e2e-v2/cases/clickhouse/clickhouse-prometheus-endpoint/docker-compose.yml index cc2227cdbcd0..1be11455e79b 100644 --- a/test/e2e-v2/cases/clickhouse/clickhouse-prometheus-endpoint/docker-compose.yml +++ b/test/e2e-v2/cases/clickhouse/clickhouse-prometheus-endpoint/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/cluster/zk/banyandb/docker-compose.yml b/test/e2e-v2/cases/cluster/zk/banyandb/docker-compose.yml index b17906e41a2c..41ec8fc86f09 100644 --- a/test/e2e-v2/cases/cluster/zk/banyandb/docker-compose.yml +++ b/test/e2e-v2/cases/cluster/zk/banyandb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: zk: image: zookeeper:3.5 diff --git a/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml b/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml index 8c62c28a1d00..16e56c46a68c 100644 --- a/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml +++ b/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: zk: image: zookeeper:3.5 diff --git a/test/e2e-v2/cases/elasticsearch/docker-compose.yml b/test/e2e-v2/cases/elasticsearch/docker-compose.yml index 82049885921e..5dd44be0e3e0 100644 --- a/test/e2e-v2/cases/elasticsearch/docker-compose.yml +++ b/test/e2e-v2/cases/elasticsearch/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/event/banyandb/docker-compose.yml b/test/e2e-v2/cases/event/banyandb/docker-compose.yml index 551c4063b723..aa3bb421222f 100644 --- a/test/e2e-v2/cases/event/banyandb/docker-compose.yml +++ b/test/e2e-v2/cases/event/banyandb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3.8' - services: banyandb: extends: diff --git a/test/e2e-v2/cases/event/es/docker-compose.yml b/test/e2e-v2/cases/event/es/docker-compose.yml index 0cc10dfb6678..fe5062446169 100644 --- a/test/e2e-v2/cases/event/es/docker-compose.yml +++ b/test/e2e-v2/cases/event/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3.8' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/event/mysql/docker-compose.yml b/test/e2e-v2/cases/event/mysql/docker-compose.yml index c514c451cec7..de8d36b101db 100644 --- a/test/e2e-v2/cases/event/mysql/docker-compose.yml +++ b/test/e2e-v2/cases/event/mysql/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3.8' - services: mysql: image: mysql/mysql-server:8.0.13 diff --git a/test/e2e-v2/cases/exporter/kafka/docker-compose.yml b/test/e2e-v2/cases/exporter/kafka/docker-compose.yml index 44b4afc2dbf4..97ea1a99e168 100644 --- a/test/e2e-v2/cases/exporter/kafka/docker-compose.yml +++ b/test/e2e-v2/cases/exporter/kafka/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: zookeeper: image: zookeeper:3.4 diff --git a/test/e2e-v2/cases/flink/docker-compose.yml b/test/e2e-v2/cases/flink/docker-compose.yml index 7a8f1b102a80..922e04f4fa11 100644 --- a/test/e2e-v2/cases/flink/docker-compose.yml +++ b/test/e2e-v2/cases/flink/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: "3" - services: oap: extends: diff --git a/test/e2e-v2/cases/gateway/docker-compose.yml b/test/e2e-v2/cases/gateway/docker-compose.yml index 0ebaf48123cb..5fe602ebabcd 100644 --- a/test/e2e-v2/cases/gateway/docker-compose.yml +++ b/test/e2e-v2/cases/gateway/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: zk: image: zookeeper:3.5 diff --git a/test/e2e-v2/cases/go/docker-compose.yml b/test/e2e-v2/cases/go/docker-compose.yml index 8dc12b67604d..c1673c6b8c4b 100644 --- a/test/e2e-v2/cases/go/docker-compose.yml +++ b/test/e2e-v2/cases/go/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml b/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml index f39f72a8d07d..afc4a0182616 100644 --- a/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml +++ b/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3' - services: oap: extends: diff --git a/test/e2e-v2/cases/kafka/log/docker-compose.yml b/test/e2e-v2/cases/kafka/log/docker-compose.yml index 814f8a53d250..c61f72674bea 100644 --- a/test/e2e-v2/cases/kafka/log/docker-compose.yml +++ b/test/e2e-v2/cases/kafka/log/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: zookeeper: image: zookeeper:3.4 diff --git a/test/e2e-v2/cases/kafka/meter/docker-compose.yml b/test/e2e-v2/cases/kafka/meter/docker-compose.yml index 49245d70c598..e82f95295750 100644 --- a/test/e2e-v2/cases/kafka/meter/docker-compose.yml +++ b/test/e2e-v2/cases/kafka/meter/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: zookeeper: image: zookeeper:3.4 diff --git a/test/e2e-v2/cases/kafka/profile/docker-compose.yml b/test/e2e-v2/cases/kafka/profile/docker-compose.yml index c2bb171bc433..f6459facb978 100644 --- a/test/e2e-v2/cases/kafka/profile/docker-compose.yml +++ b/test/e2e-v2/cases/kafka/profile/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: zookeeper: image: zookeeper:3.4 diff --git a/test/e2e-v2/cases/kafka/simple-so11y/docker-compose.yml b/test/e2e-v2/cases/kafka/simple-so11y/docker-compose.yml index fe59b642f225..f3abfbec93d4 100644 --- a/test/e2e-v2/cases/kafka/simple-so11y/docker-compose.yml +++ b/test/e2e-v2/cases/kafka/simple-so11y/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: zookeeper: image: zookeeper:3.4 diff --git a/test/e2e-v2/cases/kong/docker-compose.yml b/test/e2e-v2/cases/kong/docker-compose.yml index b69c312b443d..c626c461da40 100644 --- a/test/e2e-v2/cases/kong/docker-compose.yml +++ b/test/e2e-v2/cases/kong/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/log/banyandb/docker-compose.yml b/test/e2e-v2/cases/log/banyandb/docker-compose.yml index d3a0dad769a6..ac9818f0e380 100644 --- a/test/e2e-v2/cases/log/banyandb/docker-compose.yml +++ b/test/e2e-v2/cases/log/banyandb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: banyandb: extends: diff --git a/test/e2e-v2/cases/log/es/docker-compose.yml b/test/e2e-v2/cases/log/es/docker-compose.yml index f7bfbfd9ea60..801ee6ac3f77 100644 --- a/test/e2e-v2/cases/log/es/docker-compose.yml +++ b/test/e2e-v2/cases/log/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:${ES_VERSION} diff --git a/test/e2e-v2/cases/log/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/log/es/es-sharding/docker-compose.yml index 0925a209de80..aedc13ce4da6 100644 --- a/test/e2e-v2/cases/log/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/log/es/es-sharding/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:${ES_VERSION} diff --git a/test/e2e-v2/cases/log/fluent-bit/docker-compose.yml b/test/e2e-v2/cases/log/fluent-bit/docker-compose.yml index 448b407b7514..7a38376c4cc5 100644 --- a/test/e2e-v2/cases/log/fluent-bit/docker-compose.yml +++ b/test/e2e-v2/cases/log/fluent-bit/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:${ES_VERSION} diff --git a/test/e2e-v2/cases/log/log-base-compose.yml b/test/e2e-v2/cases/log/log-base-compose.yml index 8aebe75ddef1..d5e17bb30bcf 100644 --- a/test/e2e-v2/cases/log/log-base-compose.yml +++ b/test/e2e-v2/cases/log/log-base-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/log/mysql/docker-compose.yml b/test/e2e-v2/cases/log/mysql/docker-compose.yml index 70df63180eac..1ffaa168f903 100644 --- a/test/e2e-v2/cases/log/mysql/docker-compose.yml +++ b/test/e2e-v2/cases/log/mysql/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: mysql: image: mysql/mysql-server:8.0.13 diff --git a/test/e2e-v2/cases/log/postgres/docker-compose.yml b/test/e2e-v2/cases/log/postgres/docker-compose.yml index 0c97992fd141..3ef17eed28fa 100644 --- a/test/e2e-v2/cases/log/postgres/docker-compose.yml +++ b/test/e2e-v2/cases/log/postgres/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: postgres: image: postgres:13 diff --git a/test/e2e-v2/cases/logql/docker-compose.yml b/test/e2e-v2/cases/logql/docker-compose.yml index 8c586fc30c50..8ad7d15cf2b5 100644 --- a/test/e2e-v2/cases/logql/docker-compose.yml +++ b/test/e2e-v2/cases/logql/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/lua/docker-compose.yml b/test/e2e-v2/cases/lua/docker-compose.yml index b269318b490f..31e30be6acb5 100644 --- a/test/e2e-v2/cases/lua/docker-compose.yml +++ b/test/e2e-v2/cases/lua/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/mariadb/mariadb-slowsql/docker-compose.yaml b/test/e2e-v2/cases/mariadb/mariadb-slowsql/docker-compose.yaml index 7df892e24aa1..98308778f5db 100644 --- a/test/e2e-v2/cases/mariadb/mariadb-slowsql/docker-compose.yaml +++ b/test/e2e-v2/cases/mariadb/mariadb-slowsql/docker-compose.yaml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/menu/banyandb/docker-compose.yml b/test/e2e-v2/cases/menu/banyandb/docker-compose.yml index 6ed03994eedb..90e9b894e3c9 100644 --- a/test/e2e-v2/cases/menu/banyandb/docker-compose.yml +++ b/test/e2e-v2/cases/menu/banyandb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: banyandb: extends: diff --git a/test/e2e-v2/cases/menu/es/docker-compose.yml b/test/e2e-v2/cases/menu/es/docker-compose.yml index bb1f3875462b..c13a70f329af 100644 --- a/test/e2e-v2/cases/menu/es/docker-compose.yml +++ b/test/e2e-v2/cases/menu/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/menu/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/menu/es/es-sharding/docker-compose.yml index 3e038bc839ce..72abbe6c4ee9 100644 --- a/test/e2e-v2/cases/menu/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/menu/es/es-sharding/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/menu/mysql/docker-compose.yml b/test/e2e-v2/cases/menu/mysql/docker-compose.yml index 29f70d9ad5f9..f16437cf0d6b 100644 --- a/test/e2e-v2/cases/menu/mysql/docker-compose.yml +++ b/test/e2e-v2/cases/menu/mysql/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: mysql: image: mysql/mysql-server:8.0.13 diff --git a/test/e2e-v2/cases/menu/opensearch/docker-compose.yml b/test/e2e-v2/cases/menu/opensearch/docker-compose.yml index 53a47c75b1be..dfc6e6f69522 100644 --- a/test/e2e-v2/cases/menu/opensearch/docker-compose.yml +++ b/test/e2e-v2/cases/menu/opensearch/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: opensearch: image: opensearchproject/opensearch:${OPENSEARCH_VERSION} diff --git a/test/e2e-v2/cases/menu/postgres/docker-compose.yml b/test/e2e-v2/cases/menu/postgres/docker-compose.yml index bb0449d1edc9..f4d04f0f5403 100644 --- a/test/e2e-v2/cases/menu/postgres/docker-compose.yml +++ b/test/e2e-v2/cases/menu/postgres/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: postgres: image: postgres:13 diff --git a/test/e2e-v2/cases/meter/docker-compose.yml b/test/e2e-v2/cases/meter/docker-compose.yml index 736f27310e14..23d9c96111a1 100644 --- a/test/e2e-v2/cases/meter/docker-compose.yml +++ b/test/e2e-v2/cases/meter/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: environment: diff --git a/test/e2e-v2/cases/mongodb/docker-compose.yml b/test/e2e-v2/cases/mongodb/docker-compose.yml index 4118621675b0..2c0d728995b6 100644 --- a/test/e2e-v2/cases/mongodb/docker-compose.yml +++ b/test/e2e-v2/cases/mongodb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/mqe/docker-compose.yml b/test/e2e-v2/cases/mqe/docker-compose.yml index d6924cbce8eb..1e544edfd905 100644 --- a/test/e2e-v2/cases/mqe/docker-compose.yml +++ b/test/e2e-v2/cases/mqe/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/mysql/mysql-slowsql/docker-compose.yaml b/test/e2e-v2/cases/mysql/mysql-slowsql/docker-compose.yaml index c3dc306bd9d5..df5e3ec693db 100644 --- a/test/e2e-v2/cases/mysql/mysql-slowsql/docker-compose.yaml +++ b/test/e2e-v2/cases/mysql/mysql-slowsql/docker-compose.yaml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/nginx/docker-compose.yml b/test/e2e-v2/cases/nginx/docker-compose.yml index 92111eac8e07..3451ac22b766 100644 --- a/test/e2e-v2/cases/nginx/docker-compose.yml +++ b/test/e2e-v2/cases/nginx/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/nodejs/docker-compose.yml b/test/e2e-v2/cases/nodejs/docker-compose.yml index 4c78c4f48d03..bb3c379be2ea 100644 --- a/test/e2e-v2/cases/nodejs/docker-compose.yml +++ b/test/e2e-v2/cases/nodejs/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/otlp-traces/docker-compose.yml b/test/e2e-v2/cases/otlp-traces/docker-compose.yml index 2d5b81f30103..72eb02bf7f55 100644 --- a/test/e2e-v2/cases/otlp-traces/docker-compose.yml +++ b/test/e2e-v2/cases/otlp-traces/docker-compose.yml @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3.9' x-default-logging: &logging driver: "json-file" options: diff --git a/test/e2e-v2/cases/otlp-virtual-genai/docker-compose.yml b/test/e2e-v2/cases/otlp-virtual-genai/docker-compose.yml index fd198ef5b5a1..465fc8be0da6 100644 --- a/test/e2e-v2/cases/otlp-virtual-genai/docker-compose.yml +++ b/test/e2e-v2/cases/otlp-virtual-genai/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: "3" - services: oap: extends: diff --git a/test/e2e-v2/cases/php/docker-compose.yml b/test/e2e-v2/cases/php/docker-compose.yml index 734a4fb24fb0..fc7d7c743755 100644 --- a/test/e2e-v2/cases/php/docker-compose.yml +++ b/test/e2e-v2/cases/php/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/postgresql/postgres-exporter/docker-compose.yml b/test/e2e-v2/cases/postgresql/postgres-exporter/docker-compose.yml index cfd49556687e..fb4cdc3cfc0b 100644 --- a/test/e2e-v2/cases/postgresql/postgres-exporter/docker-compose.yml +++ b/test/e2e-v2/cases/postgresql/postgres-exporter/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/profiling/async-profiler/banyandb/docker-compose.yml b/test/e2e-v2/cases/profiling/async-profiler/banyandb/docker-compose.yml index 99aff4e41d90..26c537b517d0 100644 --- a/test/e2e-v2/cases/profiling/async-profiler/banyandb/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/async-profiler/banyandb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3.8' - services: banyandb: extends: diff --git a/test/e2e-v2/cases/profiling/async-profiler/es/docker-compose.yml b/test/e2e-v2/cases/profiling/async-profiler/es/docker-compose.yml index 9c4b0885b132..33a48a7161d8 100644 --- a/test/e2e-v2/cases/profiling/async-profiler/es/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/async-profiler/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3.8' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/profiling/async-profiler/mysql/docker-compose.yml b/test/e2e-v2/cases/profiling/async-profiler/mysql/docker-compose.yml index 8b98f4d64bb4..00543691b627 100644 --- a/test/e2e-v2/cases/profiling/async-profiler/mysql/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/async-profiler/mysql/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: mysql: image: mysql/mysql-server:8.0.13 diff --git a/test/e2e-v2/cases/profiling/pprof/banyandb/docker-compose.yml b/test/e2e-v2/cases/profiling/pprof/banyandb/docker-compose.yml index f8964fe7a8d3..1b167fafdaac 100644 --- a/test/e2e-v2/cases/profiling/pprof/banyandb/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/pprof/banyandb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3.8' - services: banyandb: extends: diff --git a/test/e2e-v2/cases/profiling/pprof/es/docker-compose.yml b/test/e2e-v2/cases/profiling/pprof/es/docker-compose.yml index 6669917382b2..1b78a6114a57 100644 --- a/test/e2e-v2/cases/profiling/pprof/es/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/pprof/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3.8' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/profiling/pprof/mysql/docker-compose.yml b/test/e2e-v2/cases/profiling/pprof/mysql/docker-compose.yml index 828163d3eeda..e70d29a2fc87 100644 --- a/test/e2e-v2/cases/profiling/pprof/mysql/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/pprof/mysql/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: mysql: image: mysql/mysql-server:8.0.13 diff --git a/test/e2e-v2/cases/profiling/trace/banyandb/docker-compose.yml b/test/e2e-v2/cases/profiling/trace/banyandb/docker-compose.yml index 26502d7fff79..052bb5bd58c2 100644 --- a/test/e2e-v2/cases/profiling/trace/banyandb/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/trace/banyandb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3.8' - services: banyandb: extends: diff --git a/test/e2e-v2/cases/profiling/trace/es/docker-compose.yml b/test/e2e-v2/cases/profiling/trace/es/docker-compose.yml index b7352440c7a2..e5fd1315dda9 100644 --- a/test/e2e-v2/cases/profiling/trace/es/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/trace/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3.8' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/profiling/trace/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/profiling/trace/es/es-sharding/docker-compose.yml index c23b2105b66e..30c6ea94a37c 100644 --- a/test/e2e-v2/cases/profiling/trace/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/trace/es/es-sharding/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3.8' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/profiling/trace/go/docker-compose.yml b/test/e2e-v2/cases/profiling/trace/go/docker-compose.yml index d1df1d9c806c..309ed1fd672f 100644 --- a/test/e2e-v2/cases/profiling/trace/go/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/trace/go/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/profiling/trace/mysql/docker-compose.yml b/test/e2e-v2/cases/profiling/trace/mysql/docker-compose.yml index 7c290ae516ff..0c86590fcb15 100644 --- a/test/e2e-v2/cases/profiling/trace/mysql/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/trace/mysql/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: mysql: image: mysql/mysql-server:8.0.13 diff --git a/test/e2e-v2/cases/profiling/trace/opensearch/docker-compose.yml b/test/e2e-v2/cases/profiling/trace/opensearch/docker-compose.yml index c25ad6fa7b44..8cbebd36d2be 100644 --- a/test/e2e-v2/cases/profiling/trace/opensearch/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/trace/opensearch/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: opensearch: image: opensearchproject/opensearch:${OPENSEARCH_VERSION} diff --git a/test/e2e-v2/cases/profiling/trace/postgres/docker-compose.yml b/test/e2e-v2/cases/profiling/trace/postgres/docker-compose.yml index 859bd6f1f781..65a1396ee325 100644 --- a/test/e2e-v2/cases/profiling/trace/postgres/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/trace/postgres/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: postgres: image: postgres:13 diff --git a/test/e2e-v2/cases/promql/docker-compose.yml b/test/e2e-v2/cases/promql/docker-compose.yml index 437c8473bf9d..d5bfd04d39b4 100644 --- a/test/e2e-v2/cases/promql/docker-compose.yml +++ b/test/e2e-v2/cases/promql/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: @@ -60,7 +58,5 @@ services: service: banyandb ports: - 17912 - - networks: e2e: diff --git a/test/e2e-v2/cases/pulsar/docker-compose.yml b/test/e2e-v2/cases/pulsar/docker-compose.yml index 132eaacaa528..206d3756b8e9 100644 --- a/test/e2e-v2/cases/pulsar/docker-compose.yml +++ b/test/e2e-v2/cases/pulsar/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '3' - services: oap: extends: diff --git a/test/e2e-v2/cases/python/docker-compose.yml b/test/e2e-v2/cases/python/docker-compose.yml index ff3a4236aaa6..f821dcb4b3ab 100644 --- a/test/e2e-v2/cases/python/docker-compose.yml +++ b/test/e2e-v2/cases/python/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: zookeeper: image: zookeeper:3.4 @@ -155,8 +153,6 @@ services: timeout: 60s retries: 120 entrypoint: ['python3', '/provider-kafka.py'] - - consumer-py: build: context: . diff --git a/test/e2e-v2/cases/rabbitmq/docker-compose.yml b/test/e2e-v2/cases/rabbitmq/docker-compose.yml index 8333b8fdda16..e87e779f852c 100644 --- a/test/e2e-v2/cases/rabbitmq/docker-compose.yml +++ b/test/e2e-v2/cases/rabbitmq/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/redis/redis-exporter/docker-compose.yml b/test/e2e-v2/cases/redis/redis-exporter/docker-compose.yml index 2cfd5537a6e4..a0e511ad2453 100644 --- a/test/e2e-v2/cases/redis/redis-exporter/docker-compose.yml +++ b/test/e2e-v2/cases/redis/redis-exporter/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/rocketmq/docker-compose.yml b/test/e2e-v2/cases/rocketmq/docker-compose.yml index a7ce08cc4275..501583a2c250 100644 --- a/test/e2e-v2/cases/rocketmq/docker-compose.yml +++ b/test/e2e-v2/cases/rocketmq/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: "3" - services: oap: extends: diff --git a/test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml b/test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml index aed10a7c9b56..2d76836ad0f4 100644 --- a/test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml +++ b/test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: etcd: diff --git a/test/e2e-v2/cases/simple/auth/docker-compose.yml b/test/e2e-v2/cases/simple/auth/docker-compose.yml index be13b40d9335..07c42960eba8 100644 --- a/test/e2e-v2/cases/simple/auth/docker-compose.yml +++ b/test/e2e-v2/cases/simple/auth/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/simple/jdk/docker-compose.yml b/test/e2e-v2/cases/simple/jdk/docker-compose.yml index 55e6f5f1f813..406124753d62 100644 --- a/test/e2e-v2/cases/simple/jdk/docker-compose.yml +++ b/test/e2e-v2/cases/simple/jdk/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/simple/mtls/docker-compose.yml b/test/e2e-v2/cases/simple/mtls/docker-compose.yml index 1f2de2a27187..3d2ac7de20e4 100644 --- a/test/e2e-v2/cases/simple/mtls/docker-compose.yml +++ b/test/e2e-v2/cases/simple/mtls/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/simple/ssl/docker-compose.yml b/test/e2e-v2/cases/simple/ssl/docker-compose.yml index b8d04edbf8ab..e597282cb83f 100644 --- a/test/e2e-v2/cases/simple/ssl/docker-compose.yml +++ b/test/e2e-v2/cases/simple/ssl/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/so11y/docker-compose.yml b/test/e2e-v2/cases/so11y/docker-compose.yml index d45d9383894d..7996e11635f2 100644 --- a/test/e2e-v2/cases/so11y/docker-compose.yml +++ b/test/e2e-v2/cases/so11y/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/storage/banyandb/data-generate/docker-compose.yml b/test/e2e-v2/cases/storage/banyandb/data-generate/docker-compose.yml index d61a317c5ade..7d0c3d59c55e 100644 --- a/test/e2e-v2/cases/storage/banyandb/data-generate/docker-compose.yml +++ b/test/e2e-v2/cases/storage/banyandb/data-generate/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: banyandb: image: "ghcr.io/apache/skywalking-banyandb:${SW_BANYANDB_COMMIT}" diff --git a/test/e2e-v2/cases/storage/banyandb/docker-compose.yml b/test/e2e-v2/cases/storage/banyandb/docker-compose.yml index f51dabc4eb8f..21991a297f33 100644 --- a/test/e2e-v2/cases/storage/banyandb/docker-compose.yml +++ b/test/e2e-v2/cases/storage/banyandb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: banyandb: extends: diff --git a/test/e2e-v2/cases/storage/banyandb/stages/docker-compose.yml b/test/e2e-v2/cases/storage/banyandb/stages/docker-compose.yml index f44df42d26e0..f156df269680 100644 --- a/test/e2e-v2/cases/storage/banyandb/stages/docker-compose.yml +++ b/test/e2e-v2/cases/storage/banyandb/stages/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: data-hot1: extends: @@ -114,4 +112,3 @@ services: networks: e2e: - diff --git a/test/e2e-v2/cases/storage/banyandb/tls/docker-compose.yml b/test/e2e-v2/cases/storage/banyandb/tls/docker-compose.yml index 1218179a635f..2ed16d31240a 100644 --- a/test/e2e-v2/cases/storage/banyandb/tls/docker-compose.yml +++ b/test/e2e-v2/cases/storage/banyandb/tls/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: banyandb: extends: diff --git a/test/e2e-v2/cases/storage/es/docker-compose.yml b/test/e2e-v2/cases/storage/es/docker-compose.yml index 221d427c0c87..dbe36ebb8088 100644 --- a/test/e2e-v2/cases/storage/es/docker-compose.yml +++ b/test/e2e-v2/cases/storage/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:${ES_VERSION} diff --git a/test/e2e-v2/cases/storage/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/storage/es/es-sharding/docker-compose.yml index f4b8141dce77..e056cafc6db9 100644 --- a/test/e2e-v2/cases/storage/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/storage/es/es-sharding/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/storage/mysql/docker-compose.yml b/test/e2e-v2/cases/storage/mysql/docker-compose.yml index f19c1fbf9c86..2533e454b901 100644 --- a/test/e2e-v2/cases/storage/mysql/docker-compose.yml +++ b/test/e2e-v2/cases/storage/mysql/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: mysql: image: mysql/mysql-server:8.0.13 diff --git a/test/e2e-v2/cases/storage/opensearch/docker-compose.yml b/test/e2e-v2/cases/storage/opensearch/docker-compose.yml index 9a6876c63a1a..b95023e3d820 100644 --- a/test/e2e-v2/cases/storage/opensearch/docker-compose.yml +++ b/test/e2e-v2/cases/storage/opensearch/docker-compose.yml @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: "2.1" services: opensearch: image: opensearchproject/opensearch:${OPENSEARCH_VERSION} diff --git a/test/e2e-v2/cases/storage/postgres/docker-compose.yml b/test/e2e-v2/cases/storage/postgres/docker-compose.yml index 522f075d622e..506b338f8da0 100644 --- a/test/e2e-v2/cases/storage/postgres/docker-compose.yml +++ b/test/e2e-v2/cases/storage/postgres/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: postgres: image: postgres:13 diff --git a/test/e2e-v2/cases/traceql/skywalking/docker-compose.yml b/test/e2e-v2/cases/traceql/skywalking/docker-compose.yml index 464ecd3aae8d..cc45d85b82b5 100644 --- a/test/e2e-v2/cases/traceql/skywalking/docker-compose.yml +++ b/test/e2e-v2/cases/traceql/skywalking/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: banyandb: extends: diff --git a/test/e2e-v2/cases/traceql/zipkin/docker-compose.yml b/test/e2e-v2/cases/traceql/zipkin/docker-compose.yml index b781530e5479..d5b0a0688cbd 100644 --- a/test/e2e-v2/cases/traceql/zipkin/docker-compose.yml +++ b/test/e2e-v2/cases/traceql/zipkin/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: banyandb: extends: @@ -77,4 +75,3 @@ services: networks: e2e: - diff --git a/test/e2e-v2/cases/ttl/es/docker-compose.yml b/test/e2e-v2/cases/ttl/es/docker-compose.yml index eb23bb09fb1d..774342257d72 100644 --- a/test/e2e-v2/cases/ttl/es/docker-compose.yml +++ b/test/e2e-v2/cases/ttl/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:${ES_VERSION} diff --git a/test/e2e-v2/cases/virtual-genai/docker-compose.yml b/test/e2e-v2/cases/virtual-genai/docker-compose.yml index 9159ce298f90..ff673f7eea53 100644 --- a/test/e2e-v2/cases/virtual-genai/docker-compose.yml +++ b/test/e2e-v2/cases/virtual-genai/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: "3" - services: oap: extends: diff --git a/test/e2e-v2/cases/virtual-mq/docker-compose.yml b/test/e2e-v2/cases/virtual-mq/docker-compose.yml index accb4d0c81ba..b702d88cc715 100644 --- a/test/e2e-v2/cases/virtual-mq/docker-compose.yml +++ b/test/e2e-v2/cases/virtual-mq/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/vm/prometheus-node-exporter/docker-compose.yml b/test/e2e-v2/cases/vm/prometheus-node-exporter/docker-compose.yml index 05d0efba7d50..82c7e3fcf67b 100644 --- a/test/e2e-v2/cases/vm/prometheus-node-exporter/docker-compose.yml +++ b/test/e2e-v2/cases/vm/prometheus-node-exporter/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/vm/telegraf/docker-compose.yml b/test/e2e-v2/cases/vm/telegraf/docker-compose.yml index 83067b93f65d..95d4abf5a36c 100644 --- a/test/e2e-v2/cases/vm/telegraf/docker-compose.yml +++ b/test/e2e-v2/cases/vm/telegraf/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/vm/zabbix/docker-compose.yml b/test/e2e-v2/cases/vm/zabbix/docker-compose.yml index 177541ae3319..5d4c0313eea5 100644 --- a/test/e2e-v2/cases/vm/zabbix/docker-compose.yml +++ b/test/e2e-v2/cases/vm/zabbix/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/win/docker-compose.yml b/test/e2e-v2/cases/win/docker-compose.yml index 3a92e5be574d..1335c4f0b4e9 100644 --- a/test/e2e-v2/cases/win/docker-compose.yml +++ b/test/e2e-v2/cases/win/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: extends: diff --git a/test/e2e-v2/cases/zipkin-virtual-genai/docker-compose.yml b/test/e2e-v2/cases/zipkin-virtual-genai/docker-compose.yml index 83af7a65a8c1..0ad3bd041f90 100644 --- a/test/e2e-v2/cases/zipkin-virtual-genai/docker-compose.yml +++ b/test/e2e-v2/cases/zipkin-virtual-genai/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: "3" - services: oap: extends: diff --git a/test/e2e-v2/cases/zipkin/banyandb/docker-compose.yml b/test/e2e-v2/cases/zipkin/banyandb/docker-compose.yml index 325f9acd2a7c..beefe5da0261 100644 --- a/test/e2e-v2/cases/zipkin/banyandb/docker-compose.yml +++ b/test/e2e-v2/cases/zipkin/banyandb/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: banyandb: extends: diff --git a/test/e2e-v2/cases/zipkin/docker-compose-brave.yml b/test/e2e-v2/cases/zipkin/docker-compose-brave.yml index a14c8a83b416..950380da4790 100644 --- a/test/e2e-v2/cases/zipkin/docker-compose-brave.yml +++ b/test/e2e-v2/cases/zipkin/docker-compose-brave.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: frontend: image: ghcr.io/openzipkin/brave-example:armeria diff --git a/test/e2e-v2/cases/zipkin/es/docker-compose.yml b/test/e2e-v2/cases/zipkin/es/docker-compose.yml index 07d77506be74..31be0aeebb03 100644 --- a/test/e2e-v2/cases/zipkin/es/docker-compose.yml +++ b/test/e2e-v2/cases/zipkin/es/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/zipkin/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/zipkin/es/es-sharding/docker-compose.yml index 85e721730596..d36d5f43227f 100644 --- a/test/e2e-v2/cases/zipkin/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/zipkin/es/es-sharding/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: es: image: elastic/elasticsearch:8.18.8 diff --git a/test/e2e-v2/cases/zipkin/kafka/docker-compose.yml b/test/e2e-v2/cases/zipkin/kafka/docker-compose.yml index bd3751873606..60277430c86f 100644 --- a/test/e2e-v2/cases/zipkin/kafka/docker-compose.yml +++ b/test/e2e-v2/cases/zipkin/kafka/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: zookeeper: image: zookeeper:3.4 diff --git a/test/e2e-v2/cases/zipkin/mysql/docker-compose.yml b/test/e2e-v2/cases/zipkin/mysql/docker-compose.yml index 95b8bd4bab1a..239f992d27a7 100644 --- a/test/e2e-v2/cases/zipkin/mysql/docker-compose.yml +++ b/test/e2e-v2/cases/zipkin/mysql/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: mysql: image: mysql/mysql-server:8.0.13 diff --git a/test/e2e-v2/cases/zipkin/opensearch/docker-compose.yml b/test/e2e-v2/cases/zipkin/opensearch/docker-compose.yml index 5d40c5bf534b..b09f0ceb2b32 100644 --- a/test/e2e-v2/cases/zipkin/opensearch/docker-compose.yml +++ b/test/e2e-v2/cases/zipkin/opensearch/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: opensearch: image: opensearchproject/opensearch:1.2.0 diff --git a/test/e2e-v2/cases/zipkin/postgres/docker-compose.yml b/test/e2e-v2/cases/zipkin/postgres/docker-compose.yml index acd65e6329f6..286d90cf60d3 100644 --- a/test/e2e-v2/cases/zipkin/postgres/docker-compose.yml +++ b/test/e2e-v2/cases/zipkin/postgres/docker-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: postgres: image: postgres:13 diff --git a/test/e2e-v2/script/docker-compose/base-compose.yml b/test/e2e-v2/script/docker-compose/base-compose.yml index 2ed82f1c7abe..c80036a1399c 100644 --- a/test/e2e-v2/script/docker-compose/base-compose.yml +++ b/test/e2e-v2/script/docker-compose/base-compose.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2.1' - services: oap: image: skywalking/oap:latest