Merge pull request quarkusio#15946 from geoand/broken-k8s-tests

Fix broken kubernetes tests
gsmet · Mar 23, 2021 · 3a8c2ea · 3a8c2ea
2 parents 5ce554c + 1bed4cc
commit 3a8c2ea
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/...dard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDockerBuildStrategyTest.java b/...dard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDockerBuildStrategyTest.java
@@ -49,7 +49,7 @@ public void assertGeneratedResources() throws IOException {
                     assertThat(c.getCommand()).isNullOrEmpty();
                     assertThat(c.getArgs()).isNullOrEmpty();
                     //We explicitly remove them when using the `docker build strategy`.
-                    assertThat(c.getEnv()).extracting("name").doesNotContain("JAVA_APP_JAR", "JAVA_LIB_DIR");
+                    assertThat(c.getEnv()).extracting("name").doesNotContain("JAVA_APP_JAR");
                 });
             });
         });

diff --git a/...dard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithLegacySidecarAndS2iTest.java b/...dard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithLegacySidecarAndS2iTest.java
@@ -64,7 +64,7 @@ public void assertGeneratedResources() throws IOException {
     private void assertApplicationContainer(PodSpec podSpec) {
         assertThat(podSpec.getContainers()).filteredOn(ps -> "openshift-sidecar-test".equals(ps.getName()))
                 .singleElement().satisfies(c -> {
-                    assertThat(c.getEnv()).extracting("name").contains("JAVA_APP_JAR", "JAVA_LIB_DIR");
+                    assertThat(c.getEnv()).extracting("name").contains("JAVA_APP_JAR");
                 });
     }
 
@@ -83,7 +83,7 @@ private void assertSidecar(PodSpec podSpec) {
                     assertThat(c.getPorts()).singleElement().satisfies(p -> {
                         assertThat(p.getContainerPort()).isEqualTo(3000);
                     });
-                    assertThat(c.getEnv()).extracting("name").doesNotContain("JAVA_APP_JAR", "JAVA_LIB_DIR");
+                    assertThat(c.getEnv()).extracting("name").doesNotContain("JAVA_APP_JAR");
                 });
     }
 }
diff --git a/...tes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java b/...tes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java
@@ -76,14 +76,6 @@ public void assertGeneratedResources() throws IOException {
                                 assertThat(envVar.getName()).isEqualTo("JAVA_APP_JAR");
                                 assertThat(envVar.getValue()).isEqualTo("/deployments/quarkus-run.jar");
                             });
-                            assertThat(envVars).anySatisfy(envVar -> {
-                                assertThat(envVar.getName()).isEqualTo("JAVA_LIB_DIR");
-                                assertThat(envVar.getValue()).isEqualTo("/deployments/lib");
-                            });
-                            assertThat(envVars).anySatisfy(envVar -> {
-                                assertThat(envVar.getName()).isEqualTo("JAVA_CLASSPATH");
-                                assertThat(envVar.getValue()).isNotBlank();
-                            });
                             assertThat(envVars).anySatisfy(envVar -> {
                                 assertThat(envVar.getName()).isEqualTo("JAVA_OPTIONS");
                                 assertThat(envVar.getValue())

diff --git a/...s-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithSidecarAndS2iTest.java b/...s-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithSidecarAndS2iTest.java
@@ -64,7 +64,7 @@ public void assertGeneratedResources() throws IOException {
     private void assertApplicationContainer(PodSpec podSpec) {
         assertThat(podSpec.getContainers()).filteredOn(ps -> "openshift-sidecar-test".equals(ps.getName()))
                 .singleElement().satisfies(c -> {
-                    assertThat(c.getEnv()).extracting("name").contains("JAVA_APP_JAR", "JAVA_LIB_DIR");
+                    assertThat(c.getEnv()).extracting("name").contains("JAVA_APP_JAR");
                 });
     }
 
@@ -83,7 +83,7 @@ private void assertSidecar(PodSpec podSpec) {
                     assertThat(c.getPorts()).singleElement().satisfies(p -> {
                         assertThat(p.getContainerPort()).isEqualTo(3000);
                     });
-                    assertThat(c.getEnv()).extracting("name").doesNotContain("JAVA_APP_JAR", "JAVA_LIB_DIR");
+                    assertThat(c.getEnv()).extracting("name").doesNotContain("JAVA_APP_JAR");
                 });
     }
 }