fix: accurately count copy dir statements (#399)

eclipse-jkube · Jan 9, 2025 · 97d70ee · 97d70ee
1 parent ecbbe7a
commit 97d70ee
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/...c/test/java/org/eclipse/jkube/integrationtests/springboot/complete/CompleteK8sITCase.java b/...c/test/java/org/eclipse/jkube/integrationtests/springboot/complete/CompleteK8sITCase.java
@@ -80,6 +80,7 @@ void k8sBuild() throws Exception {
     assertThat(imageFiles, hasItem("/deployments/org/springframework/boot/loader/JarLauncher.class"));
     final List<String> imageHistory = getImageHistory(String.format("%s/%s", "integration-tests", getApplication()));
     long dirCopyLayers = imageHistory.stream()
+      .filter(l -> !l.startsWith("<missing>"))
       .filter(l -> l.contains("COPY dir:"))
       .count();
     assertThat(dirCopyLayers, equalTo(4L));

diff --git a/...a/org/eclipse/jkube/integrationtests/springboot/zeroconfig/ZeroConfigK8sGradleITCase.java b/...a/org/eclipse/jkube/integrationtests/springboot/zeroconfig/ZeroConfigK8sGradleITCase.java
@@ -104,6 +104,7 @@ void k8sBuild() throws Exception {
     assertThat(imageFiles, hasItem("/deployments/org/springframework/boot/loader/JarLauncher.class"));
     final List<String> imageHistory = getImageHistory(String.format("%s/%s", "gradle", getApplication()));
     long dirCopyLayers = imageHistory.stream()
+      .filter(l -> !l.startsWith("<missing>"))
       .filter(l -> l.contains("COPY dir:"))
       .count();
     assertThat(dirCopyLayers, equalTo(3L));

diff --git a/...st/java/org/eclipse/jkube/integrationtests/springboot/zeroconfig/ZeroConfigK8sITCase.java b/...st/java/org/eclipse/jkube/integrationtests/springboot/zeroconfig/ZeroConfigK8sITCase.java
@@ -88,6 +88,7 @@ void k8sBuild() throws Exception {
     assertThat(imageFiles, hasItem("/deployments/org/springframework/boot/loader/JarLauncher.class"));
     final List<String> imageHistory = getImageHistory(String.format("%s/%s", "integration-tests", getApplication()));
     long dirCopyLayers = imageHistory.stream()
+      .filter(l -> !l.startsWith("<missing>"))
       .filter(l -> l.contains("COPY dir:"))
       .count();
     assertThat(dirCopyLayers, equalTo(3L));

diff --git a/...eclipse/jkube/integrationtests/springboot/zeroconfigfatjar/ZeroConfigFatJarK8sITCase.java b/...eclipse/jkube/integrationtests/springboot/zeroconfigfatjar/ZeroConfigFatJarK8sITCase.java
@@ -66,6 +66,7 @@ void k8sBuild() throws Exception {
     assertThat(imageFiles, hasItem("/deployments/spring-boot-zero-config-fatjar-0.0.0-SNAPSHOT.jar"));
     final List<String> imageHistory = getImageHistory(String.format("%s/%s", "integration-tests", getApplication()));
     long dirCopyLayers = imageHistory.stream()
+      .filter(l -> !l.startsWith("<missing>"))
       .filter(l -> l.contains("COPY dir:"))
       .count();
     assertThat(dirCopyLayers, equalTo(1L));