@@ -598,10 +598,16 @@ jobs:
598598
599599 integration-tests-validating-webhook :
600600 runs-on : ubuntu-latest
601+ name : integration-tests-validating-webhook-${{ matrix.router_flavor }}
601602 needs :
602603 - check-docs-only
603604 - matrix_k8s_node_versions
604605 if : ${{ needs.check-docs-only.outputs.docs_only != 'true' }}
606+ strategy :
607+ matrix :
608+ router_flavor :
609+ - traditional_compatible
610+ - expressions
605611 steps :
606612 - name : Harden Runner
607613 uses : step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
@@ -623,8 +629,9 @@ jobs:
623629 run : make test.integration_validatingwebhook
624630 env :
625631 KONG_CONTROLLER_OUT : stdout
626- GOTESTSUM_JUNITFILE : integration-tests.xml
632+ GOTESTSUM_JUNITFILE : integration-tests-${{ matrix.router_flavor }} .xml
627633 KONG_CLUSTER_VERSION : ${{ needs.matrix_k8s_node_versions.outputs.latest }}
634+ TEST_KONG_ROUTER_FLAVOR : ${{ matrix.router_flavor }}
628635 # This is needed for ktf to find latest releases of addons.
629636 # This could be changed so that ktf addons have their versions pinned
630637 # in the test Makefile instead.
@@ -634,22 +641,22 @@ jobs:
634641 if : always()
635642 uses : actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
636643 with :
637- name : diagnostics-integration-validating-webhook
644+ name : diagnostics-integration-validating-webhook-${{ matrix.router_flavor }}
638645 path : /tmp/ktf-diag*
639646 if-no-files-found : ignore
640647
641648 - name : collect test coverage
642649 uses : actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
643650 with :
644- name : coverage-integration-validating-webhook
651+ name : coverage-integration-validating-webhook-${{ matrix.router_flavor }}
645652 path : coverage.integration-validatingwebhook.out
646653
647654 - name : collect test report
648655 if : always()
649656 uses : actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
650657 with :
651- name : tests-report-integration-validating-webhook
652- path : integration-tests.xml
658+ name : tests-report-integration-validating-webhook-${{ matrix.router_flavor }}
659+ path : integration-tests-${{ matrix.router_flavor }} .xml
653660
654661 integration-tests-bluegreen :
655662 runs-on : ubuntu-latest
0 commit comments