Skip to content

Commit 2b3839c

Browse files
committed
Remove references to konflux-tooling image and use released version
1 parent bf7f0a4 commit 2b3839c

File tree

4 files changed

+7
-28
lines changed

4 files changed

+7
-28
lines changed

deploy/tasks/pre-build.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ spec:
2424
- name: IMAGE_URL
2525
description: URL of the OCI image to use.
2626
type: string
27-
- name: PNC_KONFLUX_TOOLING_IMAGE
28-
description: Name of the tooling image.
29-
type: string
3027
- name: RECIPE_IMAGE
3128
description: The image from the build recipe to use
3229
results:
@@ -38,7 +35,7 @@ spec:
3835
mountPath: /var/workdir
3936
steps:
4037
- name: preprocessor
41-
image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
38+
image: quay.io/konflux-ci/pnc-konflux-tooling:latest
4239
securityContext:
4340
runAsUser: 0
4441
computeResources:
@@ -53,7 +50,7 @@ spec:
5350
- --build-tool-version=$(params.BUILD_TOOL_VERSION)
5451
- --java-version=$(params.JAVA_VERSION)
5552
- --recipe-image=$(params.RECIPE_IMAGE)
56-
- --tooling-image=$(params.PNC_KONFLUX_TOOLING_IMAGE)
53+
- --tooling-image=quay.io/konflux-ci/pnc-konflux-tooling:latest
5754
- --type=$(params.BUILD_TOOL)
5855
- $(workspaces.source.path)/source
5956
env:

deploy/tasks/push-results.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ spec:
4646
description: bifrost url to upload log
4747
type: string
4848
default: ""
49-
- name: PNC_KONFLUX_TOOLING_IMAGE
50-
description: Name of the tooling image.
51-
type: string
5249
- name: caTrustConfigMapKey
5350
description: The name of the key in the ConfigMap that contains the
5451
CA bundle data.
@@ -88,7 +85,7 @@ spec:
8885
- name: IMAGE_URL
8986
value: $(params.IMAGE_URL)
9087
- name: upload-artifacts
91-
image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
88+
image: quay.io/konflux-ci/pnc-konflux-tooling:latest
9289
securityContext:
9390
runAsUser: 0
9491
computeResources:
@@ -122,7 +119,7 @@ spec:
122119
fi
123120
/opt/jboss/container/java/run/run-java.sh $@
124121
- name: upload-log
125-
image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
122+
image: quay.io/konflux-ci/pnc-konflux-tooling:latest
126123
securityContext:
127124
runAsUser: 0
128125
computeResources:

pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ type SystemConfigList struct {
4747

4848
const (
4949
KonfluxGitDefinition = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/git-clone/0.1/git-clone.yaml"
50-
KonfluxPreBuildDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build.yaml"
50+
KonfluxPreBuildDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/TOOLING/deploy/tasks/pre-build.yaml"
5151
KonfluxPreBuildGitDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build-git.yaml"
5252
KonfluxBuildDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/buildah-oci-ta.yaml"
53-
KonfluxDeployDefinitions = "https://raw.githubusercontent.com/ruhan1/jvm-build-service/main-uploadlog/deploy/tasks/push-results.yaml"
53+
KonfluxDeployDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/TOOLING/deploy/tasks/push-results.yaml"
5454
)

pkg/reconciler/dependencybuild/buildrecipeyaml.go

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ const (
3333
PostBuildTaskName = "post-build"
3434
UploadTaskName = "upload-artifacts"
3535

36-
DomainProxyImage = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/domain-proxy:latest"
37-
PNCKonfluxToolingImage = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/konflux-tooling:latest"
36+
DomainProxyImage = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/domain-proxy:latest"
3837
)
3938

4039
//go:embed scripts/maven-build.sh
@@ -428,13 +427,6 @@ func createPipelineSpec(log logr.Logger, tool string, commitTime int64, jbsConfi
428427
// StringVal: strings.Join(recipe.DisabledPlugins, ","),
429428
// },
430429
//},
431-
{
432-
Name: "PNC_KONFLUX_TOOLING_IMAGE",
433-
Value: tektonpipeline.ParamValue{
434-
Type: tektonpipeline.ParamTypeString,
435-
StringVal: PNCKonfluxToolingImage,
436-
},
437-
},
438430
},
439431
}}
440432
pipelinePreBuildGitTask := []tektonpipeline.PipelineTask{{
@@ -781,13 +773,6 @@ use-archive oci:$URL@$AARCHIVE=%s`, orasOptions, registryArgsWithDefaults(jbsCon
781773
StringVal: "jbs-server",
782774
},
783775
},
784-
{
785-
Name: "PNC_KONFLUX_TOOLING_IMAGE",
786-
Value: tektonpipeline.ParamValue{
787-
Type: tektonpipeline.ParamTypeString,
788-
StringVal: PNCKonfluxToolingImage,
789-
},
790-
},
791776
},
792777
}}, ps.Tasks...)
793778

0 commit comments

Comments
 (0)