move ambient tests to ambient profile (istio#15241)

Signed-off-by: Faseela K <[email protected]>
craigbox · Jun 26, 2024 · 7180428 · 7180428
1 parent 5e7178e
commit 7180428
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/content/en/docs/ambient/getting-started/cleanup/index.md b/content/en/docs/ambient/getting-started/cleanup/index.md
@@ -18,12 +18,19 @@ $ kubectl label namespace default istio.io/dataplane-mode-
 $ kubectl label namespace default istio.io/use-waypoint-
 {{< /text >}}
 
-## Remove waypoint proxies and uninstall Istio
+## Remove waypoint proxies
 
 To remove waypoint proxies, installed policies, and uninstall Istio, run the following commands:
 
 {{< text bash >}}
 $ istioctl x waypoint delete --all
+{{< /text >}}
+
+## Uninstall Istio
+
+To uninstall Istio:
+
+{{< text syntax=bash snip_id=none >}}
 $ istioctl uninstall -y --purge
 $ kubectl delete namespace istio-system
 {{< /text >}}

diff --git a/content/en/docs/ambient/getting-started/cleanup/snips.sh b/content/en/docs/ambient/getting-started/cleanup/snips.sh
@@ -25,10 +25,8 @@ kubectl label namespace default istio.io/dataplane-mode-
 kubectl label namespace default istio.io/use-waypoint-
 }
 
-snip_remove_waypoint_proxies_and_uninstall_istio_1() {
+snip_remove_waypoint_proxies_1() {
 istioctl x waypoint delete --all
-istioctl uninstall -y --purge
-kubectl delete namespace istio-system
 }
 
 snip_remove_the_sample_application_1() {

diff --git a/content/en/docs/ambient/getting-started/test.sh b/content/en/docs/ambient/getting-started/test.sh
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# @setup profile=none
+# @setup profile=ambient
 
 set -e
 set -u
@@ -27,7 +27,6 @@ source "content/en/docs/ambient/getting-started/enforce-auth-policies/snips.sh"
 source "content/en/docs/ambient/getting-started/manage-traffic/snips.sh"
 source "content/en/docs/ambient/getting-started/cleanup/snips.sh"
 
-snip_install_ambient
 snip_install_k8s_gateway_api
 
 _wait_for_deployment istio-system istiod
@@ -71,7 +70,7 @@ _verify_lines snip_test_traffic_split "
 
 # @cleanup
 snip_remove_the_ambient_and_waypoint_labels_1
-snip_remove_waypoint_proxies_and_uninstall_istio_1
+snip_remove_waypoint_proxies_1
 snip_remove_the_sample_application_1
 samples/bookinfo/platform/kube/cleanup.sh
-snip_remove_the_kubernetes_gateway_api_crds_1
+snip_remove_the_kubernetes_gateway_api_crds_1
diff --git a/content/en/docs/ambient/usage/extend-waypoint-wasm/test.sh b/content/en/docs/ambient/usage/extend-waypoint-wasm/test.sh
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# @setup profile=none
+# @setup profile=ambient
 
 set -e
 set -u
@@ -31,9 +31,6 @@ source "content/en/docs/ambient/getting-started/cleanup/snips.sh"
 # Kubernetes Gateway API CRDs are required by waypoint proxy.
 snip_install_k8s_gateway_api
 
-# install istio with ambient profile
-snip_install_ambient
-
 _wait_for_deployment istio-system istiod
 _wait_for_daemonset istio-system ztunnel
 _wait_for_daemonset istio-system istio-cni-node
@@ -98,7 +95,7 @@ _verify_same snip_verify_the_traffic_targeting_the_service_3 "$snip_verify_the_t
 # @cleanup
 snip_cleanup_1
 snip_remove_the_ambient_and_waypoint_labels_1
-snip_remove_waypoint_proxies_and_uninstall_istio_1
+snip_remove_waypoint_proxies_1
 snip_remove_the_sample_application_1
 samples/bookinfo/platform/kube/cleanup.sh
 snip_remove_the_kubernetes_gateway_api_crds_1