fix: don't run helm native goals in unsupported OS

eclipse-jkube · Dec 9, 2024 · 3c7ad8a · 3c7ad8a
1 parent 3d71a24
commit 3c7ad8a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -112,7 +112,7 @@ jobs:
           path: ./it/target/jkube-test-report.txt
 
   minikube-legacy:
-    name: K8S
+    name: K8S (Minikube Legacy)
     needs: build-jkube
     runs-on: ubuntu-20.04
     strategy:

diff --git a/...st/java/org/eclipse/jkube/integrationtests/springboot/helmconfig/HelmConfigK8sITCase.java b/...st/java/org/eclipse/jkube/integrationtests/springboot/helmconfig/HelmConfigK8sITCase.java
@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -118,6 +119,7 @@ void k8sHelmPush() throws Exception {
 
   @Test
   @DisplayName("k8s:helm-uninstall, no release present, display error message")
+  @DisabledIfEnvironmentVariable(named = "ImageOS", matches = "ubuntu20")
   void k8sHelmUninstall_whenNoReleasePresent_thenErrorMessageDisplayed() throws Exception {
     // Given
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -133,6 +135,7 @@ void k8sHelmUninstall_whenNoReleasePresent_thenErrorMessageDisplayed() throws Ex
   @Test
   @Order(4)
   @DisplayName("k8s:helm-install, should install the charts")
+  @DisabledIfEnvironmentVariable(named = "ImageOS", matches = "ubuntu20")
   void k8sHelmInstall() throws Exception {
     // Given
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -150,6 +153,7 @@ void k8sHelmInstall() throws Exception {
   @Test
   @Order(5)
   @DisplayName("k8s:helm-uninstall, should uninstall the charts")
+  @DisabledIfEnvironmentVariable(named = "ImageOS", matches = "ubuntu20")
   void k8sHelmUninstall() throws Exception {
     // Given
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();

diff --git a/...est/java/org/eclipse/jkube/integrationtests/springboot/helmconfig/HelmConfigOcITCase.java b/...est/java/org/eclipse/jkube/integrationtests/springboot/helmconfig/HelmConfigOcITCase.java
@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -101,6 +102,7 @@ void ocHelm() throws Exception {
   @Test
   @Order(3)
   @DisplayName("oc:helm-push, should push the charts")
+  @DisabledIfEnvironmentVariable(named = "ImageOS", matches = "ubuntu20")
   void ocHelmPush() throws Exception {
     // Given
     final Properties properties = properties(
@@ -120,6 +122,7 @@ void ocHelmPush() throws Exception {
 
   @Test
   @DisplayName("oc:helm-uninstall, no release present, display error message")
+  @DisabledIfEnvironmentVariable(named = "ImageOS", matches = "ubuntu20")
   void ocHelmUninstall_whenNoReleasePresent_thenErrorMessageDisplayed() throws Exception {
     // Given
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -135,6 +138,7 @@ void ocHelmUninstall_whenNoReleasePresent_thenErrorMessageDisplayed() throws Exc
   @Test
   @Order(4)
   @DisplayName("oc:helm-install, should install the charts")
+  @DisabledIfEnvironmentVariable(named = "ImageOS", matches = "ubuntu20")
   void ocHelmInstall() throws Exception {
     // Given
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -152,6 +156,7 @@ void ocHelmInstall() throws Exception {
   @Test
   @Order(5)
   @DisplayName("oc:helm-uninstall, should uninstall the charts")
+  @DisabledIfEnvironmentVariable(named = "ImageOS", matches = "ubuntu20")
   void ocHelmUninstall() throws Exception {
     // Given
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();