fix regression job (#6489)

Author: vepatel

.github/workflows/regression.yml

@@ -231,7 +231,7 @@ jobs:
       - name: Set image variables
         id: image_details
         run: |
-          echo "name=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic${{ contains(matrix.images.nap_modules, 'dos') && '-dos' || '' }}${{ contains(matrix.images.nap_modules, 'waf') && '-nap' || '' }}/nginx${{ contains(matrix.images.image, 'plus') && '-plus' || '' }}-ingress" >> $GITHUB_OUTPUT
+          echo "name=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic${{ contains(matrix.images.nap_modules, 'dos') && '-dos' || '' }}${{ contains(matrix.images.nap_modules, 'waf') && '-nap' || '' }}${{ contains(matrix.images.image, 'v5') && '-v5' || '' }}/nginx${{ contains(matrix.images.image, 'plus') && '-plus' || '' }}-ingress" >> $GITHUB_OUTPUT
           echo "tag=${{ needs.checks.outputs.stable_tag }}${{ contains(matrix.images.image, 'ubi') && '-ubi' || '' }}${{ contains(matrix.images.image, 'alpine') && '-alpine' || '' }}${{ contains(matrix.images.target, 'aws') && '-mktpl' || '' }}${{ contains(matrix.images.image, 'fips') && '-fips' || ''}}" >> $GITHUB_OUTPUT
 
       - name: Authenticate to Google Cloud
@@ -260,6 +260,11 @@ jobs:
         run: |
           docker pull ${{ steps.image_details.outputs.name }}:${{ steps.image_details.outputs.tag }}
 
+      - name: Generate WAF v5 tgz from JSON
+        run: |
+          docker run --rm --user root -v /var/run/docker.sock:/var/run/docker.sock -v ${{ github.workspace }}/tests/data/ap-waf-v5:/data gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/nap/waf-compiler:5.2.0 -p /data/wafv5.json -o /data/wafv5.tgz
+        if: ${{ contains(matrix.images.image, 'nap-v5')}}
+
       - name: Run Regression Tests
         id: regression-tests
         uses: ./.github/actions/smoke-tests

tests/conftest.py

@@ -169,7 +169,7 @@ def pytest_collection_modifyitems(config, items) -> None:
         for item in items:
             if "skip_for_loadbalancer" in item.keywords:
                 item.add_marker(skip_for_loadbalancer)
-    if "-nap" not in config.getoption("--image"):
+    if ("-nap" or "-nap-v5") not in config.getoption("--image"):
         appprotect = pytest.mark.skip(reason="Skip AppProtect test in non-AP image")
         for item in items:
             if "appprotect" in item.keywords:

tests/suite/test_app_protect_wafv5_integration.py

@@ -18,6 +18,7 @@ def waf_setup(kube_apis, test_namespace) -> None:
     wait_before_test()
 
 
+@pytest.mark.skip_for_nginx_oss
 @pytest.mark.appprotect_waf_v5
 @pytest.mark.parametrize(
     "crd_ingress_controller_with_waf_v5, virtual_server_setup",
@@ -86,6 +87,7 @@ def test_ap_waf_v5_policy_block_vs(
         assert "The requested URL was rejected. Please consult with your administrator." in response.text
 
 
+@pytest.mark.skip_for_nginx_oss
 @pytest.mark.appprotect_waf_v5
 @pytest.mark.parametrize(
     "crd_ingress_controller_with_waf_v5, v_s_route_setup",