Skip to content

Commit a212daa

Browse files
committed
Use separate konflux-tooling
1 parent 5a95d39 commit a212daa

File tree

2 files changed

+2
-59
lines changed

2 files changed

+2
-59
lines changed

deploy/pipeline/mw-pipeline-v0.1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ spec:
129129
resolver: http
130130
params:
131131
- name: url
132-
value: https://raw.githubusercontent.com/rnc/jvm-build-service/refs/heads/BR3/deploy/tasks/pre-build.yaml
132+
value: https://raw.githubusercontent.com/rnc/jvm-build-service/refs/heads/BR1/deploy/tasks/pre-build.yaml
133133
workspaces:
134134
- name: source
135135
workspace: source

deploy/tasks/pre-build.yaml

Lines changed: 1 addition & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,6 @@ spec:
1919
- name: NAME
2020
description: Name of the pipeline run (i.e. unique dependency build name)
2121
type: string
22-
- name: GIT_IDENTITY
23-
description: Git username. If empty, deploy-pre-build-source step will be skipped.
24-
type: string
25-
default: ""
26-
- name: GIT_URL
27-
description: String to determine whether we're using gitlab or github
28-
type: string
29-
default: "github"
30-
- name: GIT_SSL_VERIFICATION
31-
description: Whether to disable ssl verification
32-
type: string
33-
default: "false"
34-
- name: GIT_REUSE_REPOSITORY
35-
description: Whether to reuse existing git repository or create new one
36-
type: string
37-
default: "false"
38-
- name: SCM_URL
39-
description: Reference to the git repository
40-
type: string
41-
- name: SCM_HASH
42-
description: Git hash
43-
type: string
4422
- name: RECIPE_IMAGE
4523
description: The image from the build recipe to use
4624
- name: BUILD_TOOL
@@ -49,9 +27,6 @@ spec:
4927
description: The build tool version to use (e.g. 3.9.5)
5028
- name: JAVA_VERSION
5129
description: Java version to use (7, 8, 9, 11, 17, 21, 22, 23)
52-
- name: BUILD_PLUGINS
53-
description: Optional comma separated list of build plugins that should be disabled.
54-
default: ""
5530
- name: BUILD_SCRIPT
5631
description: The build script to embed with the Containerfile
5732
- name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
@@ -62,8 +37,6 @@ spec:
6237
results:
6338
- name: PRE_BUILD_IMAGE_DIGEST
6439
description: Digest of the image just built
65-
- name: GIT_ARCHIVE
66-
description: Git archive information
6740
workspaces:
6841
- description: The git repo will be cloned onto the volume backing this Workspace.
6942
name: source
@@ -81,40 +54,10 @@ spec:
8154
cpu: 10m
8255
memory: 512Mi
8356
script: |
84-
/opt/jboss/container/java/run/run-java.sh $(params.BUILD_TOOL)-prepare --java-version=$(params.JAVA_VERSION) --build-tool-version=$(params.BUILD_TOOL_VERSION) --recipe-image=$(params.RECIPE_IMAGE) --request-processor-image=$(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE) --disabled-plugins=$(params.BUILD_PLUGINS) $(workspaces.source.path)/source
57+
/opt/jboss/container/java/run/run-java.sh prepare --type=$(params.BUILD_TOOL) --java-version=$(params.JAVA_VERSION) --build-tool-version=$(params.BUILD_TOOL_VERSION) --recipe-image=$(params.RECIPE_IMAGE) --request-processor-image=$(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE) $(workspaces.source.path)/source
8558
env:
8659
- name: BUILD_SCRIPT
8760
value: $(params.BUILD_SCRIPT)
88-
# TODO: Look at making this optional until we know whether we need to store source
89-
- name: create-pre-build-source
90-
image: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
91-
securityContext:
92-
runAsUser: 0
93-
computeResources:
94-
limits:
95-
cpu: 300m
96-
memory: 512Mi
97-
requests:
98-
cpu: 10m
99-
memory: 512Mi
100-
env:
101-
- name: GIT_DEPLOY_TOKEN
102-
valueFrom:
103-
secretKeyRef:
104-
optional: true
105-
name: jvm-build-git-repo-secrets
106-
key: gitdeploytoken
107-
args:
108-
- deploy-pre-build-source
109-
- --source-path=$(workspaces.source.path)/source
110-
- --task-run-name=$(context.taskRun.name)
111-
- --scm-uri=$(params.SCM_URL)
112-
- --scm-commit=$(params.SCM_HASH)
113-
- --image-id=$(params.NAME)
114-
- --git-identity=$(params.GIT_IDENTITY)
115-
- --git-url=$(params.GIT_URL)
116-
- --git-disable-ssl-verification=$(params.GIT_SSL_VERIFICATION)
117-
- --git-reuse-repository=$(params.GIT_REUSE_REPOSITORY)
11861
- name: create-pre-build-image
11962
image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:52f1391e6f1c472fd10bb838f64fae2ed3320c636f536014978a5ddbdfc6b3af
12063
script: |

0 commit comments

Comments
 (0)