From b9703c7d1c7691de7afc022f97ae923290ca6036 Mon Sep 17 00:00:00 2001
From: Rohan Kumar <rohaan@redhat.com>
Date: Thu, 3 Oct 2024 19:39:38 +0530
Subject: [PATCH] temp : enable debug logging

Signed-off-by: Rohan Kumar <rohaan@redhat.com>
---
 .../springboot/complete/CompleteOcDockerITCase.java  | 11 ++++++++---
 .../CompleteOcDockerLayersDisabledITCase.java        | 12 +++++++++---
 pom.xml                                              |  2 +-
 projects-to-be-tested/maven/spring/complete/pom.xml  | 12 ++++++++++++
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/complete/CompleteOcDockerITCase.java b/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/complete/CompleteOcDockerITCase.java
index 5d59d400..939fefa6 100644
--- a/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/complete/CompleteOcDockerITCase.java
+++ b/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/complete/CompleteOcDockerITCase.java
@@ -53,6 +53,11 @@ public List<String> getProfiles() {
     return Collections.singletonList("OpenShift-Docker");
   }
 
+  @Override
+  public String getApplication() {
+    return "spring-boot-complete-openshift-docker";
+  }
+
   @Test
   @Order(1)
   @ResourceLock(value = CLUSTER_RESOURCE_INTENSIVE, mode = READ_WRITE)
@@ -86,9 +91,9 @@ void ocResource() throws Exception {
     final File metaInfDirectory = new File(
       String.format("../%s/target/classes/META-INF", getProject()));
     assertThat(metaInfDirectory.exists(), equalTo(true));
-    assertListResource(new File(metaInfDirectory, "jkube/openshift.yml"));
-    assertThat(new File(metaInfDirectory, "jkube/openshift/spring-boot-complete-deploymentconfig.yml"), yaml(not(anEmptyMap())));
-    assertThat(new File(metaInfDirectory, "jkube/openshift/spring-boot-complete-service.yml"), yaml(not(anEmptyMap())));
+    assertListResource(new File(metaInfDirectory, "jkube-openshift-docker/openshift.yml"));
+    assertThat(new File(metaInfDirectory, "jkube-openshift-docker/openshift/spring-boot-complete-openshift-docker-deploymentconfig.yml"), yaml(not(anEmptyMap())));
+    assertThat(new File(metaInfDirectory, "jkube-openshift-docker/openshift/spring-boot-complete-openshift-docker-service.yml"), yaml(not(anEmptyMap())));
   }
 
   @Test
diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/complete/CompleteOcDockerLayersDisabledITCase.java b/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/complete/CompleteOcDockerLayersDisabledITCase.java
index bd6aefee..7d25a25b 100644
--- a/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/complete/CompleteOcDockerLayersDisabledITCase.java
+++ b/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/complete/CompleteOcDockerLayersDisabledITCase.java
@@ -53,6 +53,12 @@ public List<String> getProfiles() {
     return Collections.singletonList("OpenShift-Docker-Spring-Layers-Disabled");
   }
 
+
+  @Override
+  public String getApplication() {
+    return "spring-boot-complete-oc-docker-spring-layers-disabled";
+  }
+
   @Test
   @Order(1)
   @ResourceLock(value = CLUSTER_RESOURCE_INTENSIVE, mode = READ_WRITE)
@@ -84,9 +90,9 @@ void ocResource() throws Exception {
     final File metaInfDirectory = new File(
       String.format("../%s/target/classes/META-INF", getProject()));
     assertThat(metaInfDirectory.exists(), equalTo(true));
-    assertListResource(new File(metaInfDirectory, "jkube/openshift.yml"));
-    assertThat(new File(metaInfDirectory, "jkube/openshift/spring-boot-complete-deploymentconfig.yml"), yaml(not(anEmptyMap())));
-    assertThat(new File(metaInfDirectory, "jkube/openshift/spring-boot-complete-service.yml"), yaml(not(anEmptyMap())));
+    assertListResource(new File(metaInfDirectory, "jkube-oc-docker-spring-layers-disabled/openshift.yml"));
+    assertThat(new File(metaInfDirectory, "jkube-oc-docker-spring-layers-disabled/openshift/spring-boot-complete-oc-docker-spring-layers-disabled-deploymentconfig.yml"), yaml(not(anEmptyMap())));
+    assertThat(new File(metaInfDirectory, "jkube-oc-docker-spring-layers-disabled/openshift/spring-boot-complete-oc-docker-spring-layers-disabled-service.yml"), yaml(not(anEmptyMap())));
   }
 
   @Test
diff --git a/pom.xml b/pom.xml
index 302eb1d3..c06343e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
     <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
     <javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>
     <!-- JKube version also needs to be updated in projects-to-be-tested/maven/buildpacks/simple/pom.xml -->
-    <jkube.version>1.17-SNAPSHOT</jkube.version>
+    <jkube.version>1.18-SNAPSHOT</jkube.version>
     <junit.version>5.11.0</junit.version>
     <karaf.version>4.4.6</karaf.version>
     <license-maven-plugin.version>4.2</license-maven-plugin.version>
diff --git a/projects-to-be-tested/maven/spring/complete/pom.xml b/projects-to-be-tested/maven/spring/complete/pom.xml
index efe0175e..1b3f5d60 100644
--- a/projects-to-be-tested/maven/spring/complete/pom.xml
+++ b/projects-to-be-tested/maven/spring/complete/pom.xml
@@ -189,6 +189,12 @@
       <properties>
         <jkube.environment>oc</jkube.environment>
         <jkube.build.strategy>docker</jkube.build.strategy>
+        <jkube.generator.name>spring-boot-complete-openshift-docker</jkube.generator.name>
+        <jkube.targetDir>${project.build.outputDirectory}/META-INF/jkube-openshift-docker</jkube.targetDir>
+        <jkube.openshiftManifest>${project.build.outputDirectory}/META-INF/jkube-openshift-docker/openshift.yml</jkube.openshiftManifest>
+        <jkube.enricher.jkube-controller.name>spring-boot-complete-openshift-docker</jkube.enricher.jkube-controller.name>
+        <jkube.enricher.jkube-project-label.app>spring-boot-complete-openshift-docker</jkube.enricher.jkube-project-label.app>
+        <jkube.enricher.jkube-service.name>spring-boot-complete-openshift-docker</jkube.enricher.jkube-service.name>
       </properties>
       <build>
         <plugins>
@@ -219,6 +225,12 @@
       <id>OpenShift-Docker-Spring-Layers-Disabled</id>
       <properties>
         <jkube.build.strategy>docker</jkube.build.strategy>
+        <jkube.generator.name>spring-boot-complete-oc-docker-spring-layers-disabled</jkube.generator.name>
+        <jkube.targetDir>${project.build.outputDirectory}/META-INF/jkube-oc-docker-spring-layers-disabled</jkube.targetDir>
+        <jkube.openshiftManifest>${project.build.outputDirectory}/META-INF/jkube-oc-docker-spring-layers-disabled/openshift.yml</jkube.openshiftManifest>
+        <jkube.enricher.jkube-controller.name>spring-boot-complete-oc-docker-spring-layers-disabled</jkube.enricher.jkube-controller.name>
+        <jkube.enricher.jkube-project-label.app>spring-boot-complete-oc-docker-spring-layers-disabled</jkube.enricher.jkube-project-label.app>
+        <jkube.enricher.jkube-service.name>spring-boot-complete-oc-docker-spring-layers-disabled</jkube.enricher.jkube-service.name>
       </properties>
       <build>
         <plugins>