Renaming for tooling image

project-ncl · Jan 13, 2025 · 21218a9 · 21218a9
1 parent d975235
commit 21218a9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ provided, all of which are intended to be called from a Tekton pipeline e.g.
 
 ```
     - name: deploy
-      image: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+      image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
       securityContext:
         runAsUser: 0
       volumeMounts:
@@ -26,10 +26,10 @@ provided, all of which are intended to be called from a Tekton pipeline e.g.
 
 The current tools are:
 
-* Preprocessor : used to preprocess build sources to add a build script and Containerfile.
-* Deploy: used (with MavenRepositoryDeployer) to deploy files to a maven repository.
-* CopyArtifacts: used by Ant builds to move built artifacts to the correct location.
-* Notify: used to notify PNC components that a pipeline has finished.
+* copy-artifacts: used by Ant builds to move built artifacts to the correct location.
+* deploy: used (with MavenRepositoryDeployer) to deploy files to a maven repository.
+* notify: used to notify PNC components that a pipeline has finished.
+* prepare : used to preprocess build sources to add a build script and Containerfile.
 
 
 It is deployed as an image to https://quay.io/repository/redhat-user-workloads/konflux-jbs-pnc-tenant/konflux-tooling?tab=tags&tag=latest
diff --git a/src/main/java/org/jboss/pnc/konfluxtooling/EntryPoint.java b/src/main/java/org/jboss/pnc/konfluxtooling/EntryPoint.java
@@ -3,7 +3,7 @@
 import org.jboss.pnc.konfluxtooling.deploy.CopyArtifactsCommand;
 import org.jboss.pnc.konfluxtooling.deploy.DeployCommand;
 import org.jboss.pnc.konfluxtooling.notification.NotifyCommand;
-import org.jboss.pnc.konfluxtooling.prebuild.Preprocessor;
+import org.jboss.pnc.konfluxtooling.prebuild.PreprocessorCommand;
 
 import io.quarkus.picocli.runtime.annotations.TopCommand;
 import picocli.CommandLine;
@@ -13,7 +13,7 @@
         CopyArtifactsCommand.class,
         DeployCommand.class,
         NotifyCommand.class,
-        Preprocessor.class
+        PreprocessorCommand.class
 })
 public class EntryPoint {
 }
diff --git a/...konfluxtooling/prebuild/Preprocessor.java → ...tooling/prebuild/PreprocessorCommand.java b/...konfluxtooling/prebuild/Preprocessor.java → ...tooling/prebuild/PreprocessorCommand.java
@@ -15,7 +15,7 @@
  * We keep all the options the same between maven, gradle, sbt and ant for now to keep the pipeline setup simpler.
  */
 @CommandLine.Command(name = "prepare")
-public class Preprocessor implements Runnable {
+public class PreprocessorCommand implements Runnable {
 
     /**
      * Equivalent to <code>$(workspaces.source.path)/source</code>
@@ -27,8 +27,8 @@ public class Preprocessor implements Runnable {
     @CommandLine.Option(names = "--recipe-image", required = true)
     String recipeImage;
 
-    @CommandLine.Option(names = "--request-processor-image", required = true)
-    String buildRequestProcessorImage;
+    @CommandLine.Option(names = "--tooling-image", required = true)
+    String toolingImage;
 
     @CommandLine.Option(names = "--java-version", required = true)
     String javaVersion;
@@ -201,7 +201,7 @@ String getContainerFile() {
         if (type == ToolType.ANT) {
             // Don't think we need to mess with keystore as copy-artifacts is simply calling copy commands.
             containerFile += """
-                    FROM %s AS build-request-processor
+                    FROM %s AS artifact-post-process
                     USER 0
                     WORKDIR /var/workdir
                     COPY --from=0 /var/workdir/ /var/workdir/
@@ -210,7 +210,7 @@ String getContainerFile() {
                     COPY --from=1 /var/workdir/workspace/artifacts /deployment/
                     COPY --from=1 /var/workdir/build.log /log/
                     """
-                    .formatted(buildRequestProcessorImage);
+                    .formatted(toolingImage);
         } else {
             containerFile += """
                     FROM scratch