Skip to content

Commit

Permalink
Use separate konflux-tooling
Browse files Browse the repository at this point in the history
  • Loading branch information
rnc committed Dec 23, 2024
1 parent ec02b3f commit 7393d04
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 59 deletions.
2 changes: 1 addition & 1 deletion deploy/pipeline/mw-pipeline-v0.1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ spec:
resolver: http
params:
- name: url
value: https://raw.githubusercontent.com/rnc/jvm-build-service/refs/heads/BR3/deploy/tasks/pre-build.yaml
value: https://raw.githubusercontent.com/rnc/jvm-build-service/refs/heads/BR1/deploy/tasks/pre-build.yaml
workspaces:
- name: source
workspace: source
Expand Down
59 changes: 1 addition & 58 deletions deploy/tasks/pre-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,6 @@ spec:
- name: NAME
description: Name of the pipeline run (i.e. unique dependency build name)
type: string
- name: GIT_IDENTITY
description: Git username. If empty, deploy-pre-build-source step will be skipped.
type: string
default: ""
- name: GIT_URL
description: String to determine whether we're using gitlab or github
type: string
default: "github"
- name: GIT_SSL_VERIFICATION
description: Whether to disable ssl verification
type: string
default: "false"
- name: GIT_REUSE_REPOSITORY
description: Whether to reuse existing git repository or create new one
type: string
default: "false"
- name: SCM_URL
description: Reference to the git repository
type: string
- name: SCM_HASH
description: Git hash
type: string
- name: RECIPE_IMAGE
description: The image from the build recipe to use
- name: BUILD_TOOL
Expand All @@ -49,9 +27,6 @@ spec:
description: The build tool version to use (e.g. 3.9.5)
- name: JAVA_VERSION
description: Java version to use (7, 8, 9, 11, 17, 21, 22, 23)
- name: BUILD_PLUGINS
description: Optional comma separated list of build plugins that should be disabled.
default: ""
- name: BUILD_SCRIPT
description: The build script to embed with the Containerfile
- name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
Expand All @@ -62,8 +37,6 @@ spec:
results:
- name: PRE_BUILD_IMAGE_DIGEST
description: Digest of the image just built
- name: GIT_ARCHIVE
description: Git archive information
workspaces:
- description: The git repo will be cloned onto the volume backing this Workspace.
name: source
Expand All @@ -81,40 +54,10 @@ spec:
cpu: 10m
memory: 512Mi
script: |
/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
/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
env:
- name: BUILD_SCRIPT
value: $(params.BUILD_SCRIPT)
# TODO: Look at making this optional until we know whether we need to store source
- name: create-pre-build-source
image: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
securityContext:
runAsUser: 0
computeResources:
limits:
cpu: 300m
memory: 512Mi
requests:
cpu: 10m
memory: 512Mi
env:
- name: GIT_DEPLOY_TOKEN
valueFrom:
secretKeyRef:
optional: true
name: jvm-build-git-repo-secrets
key: gitdeploytoken
args:
- deploy-pre-build-source
- --source-path=$(workspaces.source.path)/source
- --task-run-name=$(context.taskRun.name)
- --scm-uri=$(params.SCM_URL)
- --scm-commit=$(params.SCM_HASH)
- --image-id=$(params.NAME)
- --git-identity=$(params.GIT_IDENTITY)
- --git-url=$(params.GIT_URL)
- --git-disable-ssl-verification=$(params.GIT_SSL_VERIFICATION)
- --git-reuse-repository=$(params.GIT_REUSE_REPOSITORY)
- name: create-pre-build-image
image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:52f1391e6f1c472fd10bb838f64fae2ed3320c636f536014978a5ddbdfc6b3af
script: |
Expand Down

0 comments on commit 7393d04

Please sign in to comment.