xDS router and lb integration test 3

Signed-off-by: daizhenyu <[email protected]>
daizhenyu · Oct 10, 2024 · ced44c6 · ced44c6
1 parent 6d2c21a
commit ced44c6
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 55 deletions.
diff --git a/.github/actions/scenarios/xds-service/xds-router-lb/action.yml b/.github/actions/scenarios/xds-service/xds-router-lb/action.yml
@@ -9,13 +9,7 @@ runs:
         cp -r sermant-integration-tests/xds-service-test/product/sermant-agent-*/agent sermant-integration-tests/xds-service-test/product/spring-client/
         cp -r sermant-integration-tests/xds-service-test/product/sermant-agent-*/agent sermant-integration-tests/xds-service-test/product/spring-cloud-client/
         cp -r sermant-integration-tests/xds-service-test/product/sermant-agent-*/agent sermant-integration-tests/xds-service-test/product/spring-server/
-        mvn package -Dspring.version=${{ matrix.springBootVersion }} \
-        -Dspringcloud.version=${{ matrix.springCloudVersion }} \
-        -Dhttpclient.version=${{ matrix.httpClientVersion }} \
-        -Dokhttp2.version=${{ matrix.okHttp2Version }} \
-        -Dhttpclient.async.version=${{ matrix.httpAsyncClientVersion }} \
-        -Dokhttp3.version=${{ matrix.okHttp3Version }} \
-        -DskipTests -pl spring-client,spring-cloud-client,spring-server -Pxds-router-lb --file \
+        mvn package -DskipTests -pl spring-client,spring-cloud-client,spring-server -Pxds-router-lb --file \
         sermant-integration-tests/xds-service-test/pom.xml
     - name: build docker image
       shell: bash

diff --git a/.github/workflows/agentcore_service_test.yml b/.github/workflows/agentcore_service_test.yml
@@ -145,54 +145,54 @@ jobs:
 #        uses: ./.github/actions/common/agentcore
 #      - name: test dynamic config for ${{ matrix.dynamicConfigType }}
 #        uses: ./.github/actions/scenarios/agentcore/dynamic-config
-  test-for-xds-service-discovery-onlysermant:
-    name: Test for xds service discovery with only sermant
-    runs-on: ubuntu-latest
-    if: needs.set-execution-conditions.outputs.enableXdsServicAction == 'true'
-    needs: [set-execution-conditions, build-agent-and-cache]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 100
-      - name: set java version to environment
-        run: |
-          echo "javaVersion=8" >> $GITHUB_ENV
-      - name: xds common operation
-        uses: ./.github/actions/common/xds-service
-      - name: xds service discovery
-        uses: ./.github/actions/scenarios/xds-service/xds-service-discovery/sermant-only
-  test-for-xds-service-discovery-with-server-envoy:
-    name: Test for xds service discovery with spring-server using envoy
-    runs-on: ubuntu-latest
-    if: needs.set-execution-conditions.outputs.enableXdsServicAction == 'true'
-    needs: [set-execution-conditions, build-agent-and-cache]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 100
-      - name: set java version to environment
-        run: |
-          echo "javaVersion=8" >> $GITHUB_ENV
-      - name: xds common operation
-        uses: ./.github/actions/common/xds-service
-      - name: xds service discovery
-        uses: ./.github/actions/scenarios/xds-service/xds-service-discovery/server-envoy
-  test-for-xds-service-discovery-with-client-envoy:
-    name: Test for xds service discovery with spring-client using enovy
-    runs-on: ubuntu-latest
-    if: needs.set-execution-conditions.outputs.enableXdsServicAction == 'true'
-    needs: [set-execution-conditions, build-agent-and-cache]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 100
-      - name: set java version to environment
-        run: |
-          echo "javaVersion=8" >> $GITHUB_ENV
-      - name: xds common operation
-        uses: ./.github/actions/common/xds-service
-      - name: xds service discovery
-        uses: ./.github/actions/scenarios/xds-service/xds-service-discovery/client-envoy
+#  test-for-xds-service-discovery-onlysermant:
+#    name: Test for xds service discovery with only sermant
+#    runs-on: ubuntu-latest
+#    if: needs.set-execution-conditions.outputs.enableXdsServicAction == 'true'
+#    needs: [set-execution-conditions, build-agent-and-cache]
+#    steps:
+#      - uses: actions/checkout@v3
+#        with:
+#          fetch-depth: 100
+#      - name: set java version to environment
+#        run: |
+#          echo "javaVersion=8" >> $GITHUB_ENV
+#      - name: xds common operation
+#        uses: ./.github/actions/common/xds-service
+#      - name: xds service discovery
+#        uses: ./.github/actions/scenarios/xds-service/xds-service-discovery/sermant-only
+#  test-for-xds-service-discovery-with-server-envoy:
+#    name: Test for xds service discovery with spring-server using envoy
+#    runs-on: ubuntu-latest
+#    if: needs.set-execution-conditions.outputs.enableXdsServicAction == 'true'
+#    needs: [set-execution-conditions, build-agent-and-cache]
+#    steps:
+#      - uses: actions/checkout@v3
+#        with:
+#          fetch-depth: 100
+#      - name: set java version to environment
+#        run: |
+#          echo "javaVersion=8" >> $GITHUB_ENV
+#      - name: xds common operation
+#        uses: ./.github/actions/common/xds-service
+#      - name: xds service discovery
+#        uses: ./.github/actions/scenarios/xds-service/xds-service-discovery/server-envoy
+#  test-for-xds-service-discovery-with-client-envoy:
+#    name: Test for xds service discovery with spring-client using enovy
+#    runs-on: ubuntu-latest
+#    if: needs.set-execution-conditions.outputs.enableXdsServicAction == 'true'
+#    needs: [set-execution-conditions, build-agent-and-cache]
+#    steps:
+#      - uses: actions/checkout@v3
+#        with:
+#          fetch-depth: 100
+#      - name: set java version to environment
+#        run: |
+#          echo "javaVersion=8" >> $GITHUB_ENV
+#      - name: xds common operation
+#        uses: ./.github/actions/common/xds-service
+#      - name: xds service discovery
+#        uses: ./.github/actions/scenarios/xds-service/xds-service-discovery/client-envoy
   test-for-xds-router-lb:
     name: Test for xds router and lb with router plugin
     runs-on: ubuntu-latest