From 1385704866939d9c28d352d5414755dd75db07e8 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Tue, 13 Dec 2022 16:20:14 +0100
Subject: [PATCH] Disable Istio ITs when not run in a Kubernetes context

---
 .../istio/maven-invoker-way/pom.xml           | 51 ++++++-------------
 1 file changed, 16 insertions(+), 35 deletions(-)

diff --git a/integration-tests/istio/maven-invoker-way/pom.xml b/integration-tests/istio/maven-invoker-way/pom.xml
index 2c8be7e530a8f..a449d28ccf71d 100644
--- a/integration-tests/istio/maven-invoker-way/pom.xml
+++ b/integration-tests/istio/maven-invoker-way/pom.xml
@@ -12,6 +12,10 @@
     <name>Quarkus - Integration Tests - Istio - Invoker</name>
     <description>Istio integration tests that need to use the maven invoker because they test various dependency related scenarios</description>
 
+    <properties>
+        <invoker.skip>${skipTests}</invoker.skip>
+    </properties>
+
     <dependencies>
         <!-- made test scope only to force Maven to build these dependencies before running the tests-->
         <dependency>
@@ -209,7 +213,6 @@
                     <cloneClean>true</cloneClean>
                     <postBuildHookScript>verify</postBuildHookScript>
                     <addTestClassPath>true</addTestClassPath>
-                    <skipInvocation>${skipTests}</skipInvocation>
                     <streamLogs>true</streamLogs>
                     <invokerPropertiesFile>invoker.properties</invokerPropertiesFile>
                 </configuration>
@@ -230,48 +233,17 @@
 
     <profiles>
         <profile>
-            <id>basic-test-suite</id>
+            <id>disable-tests</id>
             <activation>
                 <property>
-                    <name>basicTests</name>
+                    <name>!e2e-tests</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-invoker-plugin</artifactId>
-                        <configuration>
-                            <skipInvocation>true</skipInvocation>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
             <properties>
                 <maven.test.skip>true</maven.test.skip>
+                <invoker.skip>true</invoker.skip>
             </properties>
         </profile>
-        <profile>
-            <id>offline-tests</id>
-            <activation>
-                <property>
-                    <name>!e2e-tests</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-invoker-plugin</artifactId>
-                        <configuration>
-                            <filterProperties>
-                                <kubernetes-client-master-url>-Dquarkus.kubernetes-client.master-url=http://localhost:12345</kubernetes-client-master-url>
-                                <build-result>failure</build-result>
-                            </filterProperties>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>kubernetes-e2e-tests</id>
             <activation>
@@ -279,6 +251,9 @@
                     <name>kubernetes-e2e-tests</name>
                 </property>
             </activation>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -305,6 +280,9 @@
                     <name>openshift-e2e-tests</name>
                 </property>
             </activation>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -331,6 +309,9 @@
                     <name>knative-e2e-tests</name>
                 </property>
             </activation>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
             <build>
                 <plugins>
                     <plugin>