Fix script

knative · Jun 28, 2023 · f09b26e · f09b26e
1 parent ea05855
commit f09b26e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml
@@ -121,6 +121,7 @@ jobs:
         - ingress: istio-ambient
           namespace-resources: virtualservices
           ingress-class: istio
+          ambient: 1
 
         - ingress: kourier-tls
           ingress-class: kourier
@@ -139,6 +140,7 @@ jobs:
       KIND: 1
       INGRESS_CLASS: ${{ matrix.ingress-class || matrix.ingress }}.ingress.networking.knative.dev
       ENABLE_TLS: ${{ matrix.enable-tls || 0 }}
+      AMBIENT: ${{ matrix.ambient || 0 }}
 
     steps:
     - name: Set up Go 1.19.x

diff --git a/test/e2e-common.sh b/test/e2e-common.sh
@@ -128,9 +128,6 @@ function parse_flags() {
       ;;
     --no-mesh)
       readonly MESH=0
-      # DO_NOT_SUBMIT:
-      # Just a demonstration now. Enable AMBIENT on no-mesh.
-      readonly AMBIENT=1
       return 1
       ;;
     --perf)

diff --git a/test/e2e-networking-library.sh b/test/e2e-networking-library.sh
@@ -80,7 +80,7 @@ function download_net_istio_yamls() {
     echo "Got NET_ISTIO_COMMIT from ${1}: ${sha}"
   fi
 
-  local istio_yaml="https://raw.githubusercontent.com/nak3/net-istio/add-ambient-3/third_party/istio-latest/istio-kind-ambient/istio.yaml"
+  local istio_yaml="$(net_istio_file_url "$sha" istio.yaml)"
   local istio_config_yaml="$(net_istio_file_url "$sha" config-istio.yaml)"
 
   wget -P "${target_dir}" "${istio_yaml}" \
@@ -103,7 +103,11 @@ function net_istio_file_url() {
   local profile="istio-ci-no-mesh"
 
   if (( KIND )); then
-    profile="istio-kind-no-mesh"
+    if (( AMBIENT )); then
+      profile="istio-kind-ambient"
+    else
+      profile="istio-kind-no-mesh"
+    fi
   elif (( MESH )); then
     profile="istio-ci-mesh"
   fi