From 2b755d7b3fe6ebae4251c1929350b512537f1544 Mon Sep 17 00:00:00 2001
From: Paul Banks <pbanks@hashicorp.com>
Date: Fri, 27 Aug 2021 23:23:34 +0100
Subject: [PATCH] Allow skipping v2 compat tests for SDS as it's only the SDS
 server integration that doesn't support v2

---
 .../connect/envoy/case-ingress-gateway-sds/vars.sh         | 4 ++++
 test/integration/connect/envoy/run-tests.sh                | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/test/integration/connect/envoy/case-ingress-gateway-sds/vars.sh b/test/integration/connect/envoy/case-ingress-gateway-sds/vars.sh
index b53032fbe4..689ca94fc2 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-sds/vars.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-sds/vars.sh
@@ -1,3 +1,7 @@
 #!/bin/bash
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES ingress-gateway-primary test-sds-server"
+
+if is_set $TEST_V2_XDS; then
+  export SKIP_CASE="test SDS server doesn't support V2"
+fi
\ No newline at end of file
diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh
index fc5c1861a8..890a567155 100755
--- a/test/integration/connect/envoy/run-tests.sh
+++ b/test/integration/connect/envoy/run-tests.sh
@@ -287,6 +287,7 @@ function run_tests {
   CASE_DIR="${CASE_DIR?CASE_DIR must be set to the path of the test case}"
   CASE_NAME=$( basename $CASE_DIR | cut -c6- )
   export CASE_NAME
+  export SKIP_CASE=""
 
   init_vars
 
@@ -300,6 +301,12 @@ function run_tests {
 
   global_setup
 
+  # Allow vars.sh to set a reason to skip this test case based on the ENV
+  if [ "$SKIP_CASE" != "" ] ; then
+    echoyellow "SKIPPING CASE: $SKIP_CASE"
+    return 0
+  fi
+
   # Wipe state
   wipe_volumes