@@ -826,7 +826,7 @@ jobs:
826826 KUBERNETES_VERSION : ${{ matrix.versions.kubernetes }}
827827 ALS_ANALYZER : ${{ matrix.analyzer }}
828828 with :
829- e2e-file : $GITHUB_WORKSPACE/ test/e2e-v2/cases/istio/als/e2e.yaml
829+ e2e-file : test/e2e-v2/cases/istio/als/e2e.yaml
830830 - if : ${{ failure() }}
831831 run : |
832832 df -h
@@ -839,6 +839,67 @@ jobs:
839839 name : test-logs-${{ matrix.test.name }}
840840 path : " ${{ env.SW_INFRA_E2E_LOG_DIR }}"
841841
842+ e2e-test-istio-ambient :
843+ if : |
844+ ( always() && ! cancelled() ) &&
845+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
846+ name : E2E test
847+ needs : [docker]
848+ runs-on : ubuntu-24.04
849+ timeout-minutes : 60
850+ strategy :
851+ fail-fast : false
852+ matrix :
853+ analyzer : [k8s-mesh, mx-mesh]
854+ versions :
855+ - istio : 1.23.0
856+ kubernetes : 28
857+ - istio : 1.24.0
858+ kubernetes : 28
859+ steps :
860+ - uses : actions/checkout@v4
861+ with :
862+ submodules : true
863+ persist-credentials : false
864+ - run : grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
865+ - uses : apache/skywalking-cli/actions/setup@master
866+ with :
867+ version : ${{ env.SW_CTL_COMMIT }}
868+ - uses : actions/download-artifact@v4
869+ name : Download docker images
870+ with :
871+ name : docker-images-11
872+ path : docker-images
873+ - name : Load docker images
874+ run : |
875+ find docker-images -name "*.tar" -exec docker load -i {} \;
876+ find docker-images -name "*.tar" -exec rm {} \;
877+ - name : Login to ghcr
878+ uses : docker/login-action@v3
879+ with :
880+ registry : ghcr.io
881+ username : ${{ github.repository_owner }}
882+ password : ${{ secrets.GITHUB_TOKEN }}
883+ - name : ${{ matrix.test.name }}
884+ uses : apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
885+ env :
886+ ISTIO_VERSION : ${{ matrix.versions.istio }}
887+ KUBERNETES_VERSION : ${{ matrix.versions.kubernetes }}
888+ ALS_ANALYZER : ${{ matrix.analyzer }}
889+ with :
890+ e2e-file : test/e2e-v2/cases/istio/ambient-als/e2e.yaml
891+ - if : ${{ failure() }}
892+ run : |
893+ df -h
894+ du -sh .
895+ docker images
896+ - uses : actions/upload-artifact@v4
897+ if : ${{ failure() }}
898+ name : Upload Logs
899+ with :
900+ name : test-istio-ambient-logs-${{ matrix.versions.istio }}-${{ matrix.versions.kubernetes }}-${{ matrix.analyzer }}
901+ path : " ${{ env.SW_INFRA_E2E_LOG_DIR }}"
902+
842903 e2e-test-java-versions :
843904 if : |
844905 ( always() && ! cancelled() ) &&
@@ -1004,6 +1065,7 @@ jobs:
10041065 - slow-integration-test
10051066 - e2e-test
10061067 - e2e-test-istio
1068+ - e2e-test-istio-ambient
10071069 - e2e-test-java-versions
10081070 runs-on : ubuntu-latest
10091071 timeout-minutes : 10
@@ -1023,13 +1085,15 @@ jobs:
10231085 timeConsumingITResults=${{ needs.slow-integration-test.result }};
10241086 e2eResults=${{ needs.e2e-test.result }};
10251087 e2eIstioResults=${{ needs.e2e-test-istio.result }};
1088+ e2eIstioAmbientResults=${{ needs.e2e-test-istio-ambient.result }};
10261089 e2eJavaVersionResults=${{ needs.e2e-test-java-versions.result }};
10271090
10281091 [[ ${depLicenseResults} == 'success' ]] || [[ ${execute} != 'true' && ${depLicenseResults} == 'skipped' ]] || exit -2;
10291092 [[ ${unitResults} == 'success' ]] || [[ ${execute} != 'true' && ${unitResults} == 'skipped' ]] || exit -3;
10301093 [[ ${integrationResults} == 'success' ]] || [[ ${execute} != 'true' && ${integrationResults} == 'skipped' ]] || exit -4;
10311094 [[ ${e2eResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eResults} == 'skipped' ]] || exit -5;
10321095 [[ ${e2eIstioResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eIstioResults} == 'skipped' ]] || exit -6;
1096+ [[ ${e2eIstioAmbientResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eIstioAmbientResults} == 'skipped' ]] || exit -6;
10331097 [[ ${e2eJavaVersionResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eJavaVersionResults} == 'skipped' ]] || exit -7;
10341098 [[ ${timeConsumingITResults} == 'success' ]] || [[ ${execute} != 'true' && ${timeConsumingITResults} == 'skipped' ]] || exit -8;
10351099
0 commit comments