JBS79: Rename JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE to PNC_KONFLUX_TOO…

…LING_IMAGE
redhat-appstudio · Jan 14, 2025 · f01986a · f01986a
1 parent 05e2bf9
commit f01986a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 26 deletions.
diff --git a/deploy/pipeline/mw-pipeline-v0.1.yaml b/deploy/pipeline/mw-pipeline-v0.1.yaml
@@ -66,7 +66,7 @@ spec:
       type: string
     - name: INDY_PROXY_CLIENT_CREDENTIAL
       type: string
-    - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
+    - name: PNC_KONFLUX_TOOLING_IMAGE
       type: string
       default: "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/konflux-tooling:latest"
     - name: NOTIFICATION_CONTEXT
@@ -105,8 +105,8 @@ spec:
       runAfter:
         - git-clone
       params:
-        - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
-          value: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+        - name: PNC_KONFLUX_TOOLING_IMAGE
+          value: $(params.PNC_KONFLUX_TOOLING_IMAGE)
         - name: IMAGE_URL
           value: $(params.QUAY_REPO):trusted-source-$(context.pipelineRun.name)
         - name: NAME
@@ -130,7 +130,7 @@ spec:
         resolver: http
         params:
           - name: url
-            value: https://raw.githubusercontent.com/rnc/jvm-build-service/refs/heads/BR1/deploy/tasks/pre-build.yaml
+            value: https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/refs/heads/main/deploy/tasks/pre-build.yaml
       workspaces:
         - name: source
           workspace: source
@@ -199,8 +199,8 @@ spec:
       runAfter:
         - buildah-oci-ta
       params:
-        - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
-          value: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+        - name: PNC_KONFLUX_TOOLING_IMAGE
+          value: $(params.PNC_KONFLUX_TOOLING_IMAGE)
         - name: IMAGE_URL
           value: $(tasks.buildah-oci-ta.results.IMAGE_URL)
         - name: IMAGE_DIGEST
@@ -221,8 +221,8 @@ spec:
       params:
         - name: ACCESS_TOKEN
           value: $(params.ACCESS_TOKEN)
-        - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
-          value: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+        - name: PNC_KONFLUX_TOOLING_IMAGE
+          value: $(params.PNC_KONFLUX_TOOLING_IMAGE)
         - name: NOTIFICATION_CONTEXT
           value: $(params.NOTIFICATION_CONTEXT)
         - name: STATUS
@@ -233,8 +233,8 @@ spec:
             description: Access token for OAuth.
             type: string
             default: ""
-          - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
-            description: Name of the processor image. Useful to override for development.
+          - name: PNC_KONFLUX_TOOLING_IMAGE
+            description: Name of the tooling image.
             type: string
           - name: NOTIFICATION_CONTEXT
             description: Notification context
@@ -244,7 +244,7 @@ spec:
             type: string
         steps:
           - name: notification
-            image: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+            image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
             args:
               - notify
               - --context=$(params.NOTIFICATION_CONTEXT)

diff --git a/deploy/tasks/maven-deployment.yaml b/deploy/tasks/maven-deployment.yaml
@@ -39,8 +39,8 @@ spec:
       description: Access token for OAuth.
       type: string
       default: ""
-    - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
-      description: Name of the processor image. Useful to override for development.
+    - name: PNC_KONFLUX_TOOLING_IMAGE
+      description: Name of the tooling image.
       type: string
     - name: caTrustConfigMapKey
       description: The name of the key in the ConfigMap that contains the
@@ -81,7 +81,7 @@ spec:
         - name: IMAGE_URL
           value: $(params.IMAGE_URL)
     - name: deploy
-      image: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+      image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
       securityContext:
         runAsUser: 0
       computeResources:

diff --git a/deploy/tasks/pre-build.yaml b/deploy/tasks/pre-build.yaml
@@ -24,8 +24,8 @@ spec:
     - name: IMAGE_URL
       description: URL of the OCI image to use.
       type: string
-    - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
-      description: Name of the processor image. Useful to override for development.
+    - name: PNC_KONFLUX_TOOLING_IMAGE
+      description: Name of the tooling image.
       type: string
     - name: RECIPE_IMAGE
       description: The image from the build recipe to use
@@ -38,7 +38,7 @@ spec:
       mountPath: /var/workdir
   steps:
     - name: preprocessor
-      image: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+      image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
       securityContext:
         runAsUser: 0
       computeResources:
@@ -53,7 +53,7 @@ spec:
         - --build-tool-version=$(params.BUILD_TOOL_VERSION)
         - --java-version=$(params.JAVA_VERSION)
         - --recipe-image=$(params.RECIPE_IMAGE)
-        - --request-processor-image=$(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+        - --tooling-image=$(params.PNC_KONFLUX_TOOLING_IMAGE)
         - --type=$(params.BUILD_TOOL)
         - $(workspaces.source.path)/source
       env:

diff --git a/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go b/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
@@ -47,8 +47,8 @@ type SystemConfigList struct {
 
 const (
 	KonfluxGitDefinition          = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/git-clone/0.1/git-clone.yaml"
-	KonfluxPreBuildDefinitions    = "https://raw.githubusercontent.com/rnc/jvm-build-service/BR1/deploy/tasks/pre-build.yaml"
-	KonfluxPreBuildGitDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/BR1/deploy/tasks/pre-build-git.yaml"
+	KonfluxPreBuildDefinitions    = "https://raw.githubusercontent.com/rnc/jvm-build-service/JBS79/deploy/tasks/pre-build.yaml"
+	KonfluxPreBuildGitDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build-git.yaml"
 	KonfluxBuildDefinitions       = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/buildah-oci-ta.yaml"
-	KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/BR1/deploy/tasks/maven-deployment.yaml"
+	KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/JBS79/deploy/tasks/maven-deployment.yaml"
 )
diff --git a/pkg/reconciler/dependencybuild/buildrecipeyaml.go b/pkg/reconciler/dependencybuild/buildrecipeyaml.go
@@ -33,7 +33,8 @@ const (
 	PostBuildTaskName   = "post-build"
 	DeployTaskName      = "deploy"
 
-	DomainProxyImage = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/domain-proxy:latest"
+	DomainProxyImage       = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/domain-proxy:latest"
+	PNCKonfluxToolingImage = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/konflux-tooling:latest"
 )
 
 //go:embed scripts/maven-build.sh
@@ -428,10 +429,10 @@ func createPipelineSpec(log logr.Logger, tool string, commitTime int64, jbsConfi
 				//	},
 				//},
 				{
-					Name: "JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE",
+					Name: "PNC_KONFLUX_TOOLING_IMAGE",
 					Value: tektonpipeline.ParamValue{
 						Type:      tektonpipeline.ParamTypeString,
-						StringVal: "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/konflux-tooling:latest",
+						StringVal: PNCKonfluxToolingImage,
 					},
 				},
 			},
@@ -781,10 +782,10 @@ use-archive oci:$URL@$AARCHIVE=%s`, orasOptions, registryArgsWithDefaults(jbsCon
 					},
 				},
 				{
-					Name: "JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE",
+					Name: "PNC_KONFLUX_TOOLING_IMAGE",
 					Value: tektonpipeline.ParamValue{
 						Type:      tektonpipeline.ParamTypeString,
-						StringVal: buildRequestProcessorImage,
+						StringVal: PNCKonfluxToolingImage,
 					},
 				},
 			},