From 714344cf953e8b57b15f61775a19355b86440def Mon Sep 17 00:00:00 2001 From: Nick Cross Date: Fri, 17 Jan 2025 15:03:19 +0000 Subject: [PATCH] Remove tooling image parameter --- task/pnc-prebuild-git-clone-oci-ta/0.1/README.md | 3 +-- task/pnc-prebuild-git-clone-oci-ta/0.1/patch.yaml | 13 ++++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/task/pnc-prebuild-git-clone-oci-ta/0.1/README.md b/task/pnc-prebuild-git-clone-oci-ta/0.1/README.md index 816f90ec62..632b8b7797 100644 --- a/task/pnc-prebuild-git-clone-oci-ta/0.1/README.md +++ b/task/pnc-prebuild-git-clone-oci-ta/0.1/README.md @@ -1,6 +1,6 @@ # pnc-prebuild-git-clone-oci-ta task -The pnc-prebuild-git-clone-oci-ta Task will clone a repo from the provided url, apply PNC prebuild modifications and store it as a trusted artifact in the provided OCI repository. +The pnc-prebuild-git-clone-oci-ta Task will clone a repo from the provided url, apply PNC prebuild modifications from https://github.com/project-ncl/konflux-tooling and store it as a trusted artifact in the provided OCI repository. ## Parameters |name|description|default value|required| @@ -28,7 +28,6 @@ The pnc-prebuild-git-clone-oci-ta Task will clone a repo from the provided url, |BUILD_TOOL|The build tool to use (ant, gradle, maven, sbt).||true| |BUILD_TOOL_VERSION|The build tool version to use (e.g. 3.9.5)||true| |JAVA_VERSION|Java version to use (7, 8, 9, 11, 17, 21, 22, 23)||true| -|PNC_KONFLUX_TOOLING_IMAGE|Name of the tooling image.||true| |RECIPE_IMAGE|The image from the build recipe to use||true| ## Results diff --git a/task/pnc-prebuild-git-clone-oci-ta/0.1/patch.yaml b/task/pnc-prebuild-git-clone-oci-ta/0.1/patch.yaml index fb5db42e4a..2d1e411a6d 100644 --- a/task/pnc-prebuild-git-clone-oci-ta/0.1/patch.yaml +++ b/task/pnc-prebuild-git-clone-oci-ta/0.1/patch.yaml @@ -7,7 +7,8 @@ - op: replace path: /spec/description value: The pnc-prebuild-git-clone-oci-ta Task will clone a repo from the provided url, apply - PNC prebuild modifications and store it as a trusted artifact in the provided OCI repository. + PNC prebuild modifications from https://github.com/project-ncl/konflux-tooling and store + it as a trusted artifact in the provided OCI repository. - op: add path: /spec/params/- @@ -33,12 +34,6 @@ name: JAVA_VERSION description: Java version to use (7, 8, 9, 11, 17, 21, 22, 23) type: string -- op: add - path: /spec/params/- - value: - name: PNC_KONFLUX_TOOLING_IMAGE - description: Name of the tooling image. - type: string - op: add path: /spec/params/- value: @@ -50,7 +45,7 @@ path: /spec/steps/2 value: name: preprocessor - image: $(params.PNC_KONFLUX_TOOLING_IMAGE) + image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/konflux-tooling:latest securityContext: runAsUser: 0 computeResources: @@ -65,7 +60,7 @@ - --build-tool-version=$(params.BUILD_TOOL_VERSION) - --java-version=$(params.JAVA_VERSION) - --recipe-image=$(params.RECIPE_IMAGE) - - --tooling-image=$(params.PNC_KONFLUX_TOOLING_IMAGE) + - --tooling-image=quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/konflux-tooling:latest - --type=$(params.BUILD_TOOL) - /var/workdir/source volumeMounts: