Merge pull request #2172 from rnc/SCRIPTS

Generate build script within preprocessor

Author: rnc

README.adoc

@@ -38,7 +38,6 @@ The following environment variables are configurable and may be set by the user
 | JBS_QUAY_IMAGE_TAG | The tag for the images (defaults to `dev`)
 | JBS_QUAY_ORG | JBS images are pulled by default from the `QUAY_USERNAME` organization. This may be overridden by changing this
 | JBS_BUILD_IMAGE_SECRET | Secret for accessing Quay.io (See below)
-| JBS_DISABLE_CACHE | Internal variable for disabling the cache
 | JBS_GIT_CREDENTIALS | Support for private repositories (See below)
 | JBS_MAX_MEMORY | Maximum additional memory allowed
 | JBS_RECIPE_DATABASE | Recipe database to use (defaults to `https://github.com/redhat-appstudio/jvm-build-data`)

deploy/tasks/pre-build.yaml

@@ -44,9 +44,13 @@ spec:
     - name: RECIPE_IMAGE
       description: The image from the build recipe to use
     - name: BUILD_TOOL
-      description: The build tool to use.
+      description: The build tool to use (ant, gradle, maven, sbt).
+    - name: BUILD_TOOL_VERSION
+      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: Comma separated list of build plugins that should be disabled.
+      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
@@ -77,8 +81,10 @@ spec:
           cpu: 10m
           memory: 512Mi
       script: |
-        $(params.BUILD_SCRIPT)
-        /opt/jboss/container/java/run/run-java.sh $(params.BUILD_TOOL)-prepare $(workspaces.source.path)/source --recipe-image=$(params.RECIPE_IMAGE) --request-processor-image=$(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE) --disabled-plugins=$(params.BUILD_PLUGINS)
+        /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
+      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)
@@ -111,6 +117,8 @@ spec:
         - --git-reuse-repository=$(params.GIT_REUSE_REPOSITORY)
     - name: create-pre-build-image
       image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:bc10298bff7805d8bc98211cd4534b9720f365f35ce0ef263dd65802de7ff036
+      # The build-trusted-artifacts container doesn't handle REGISTRY_TOKEN but the actual .docker/config.json.
+      # Setting ORAS_OPTIONS to ensure the archive is compatible with jib (for OCIRepositoryClient) (to be removed)
       script: |
         echo "Creating pre-build-image archive with ORAS_OPTIONS $ORAS_OPTIONS"
         export ORAS_OPTIONS="$ORAS_OPTIONS --image-spec=v1.0 --artifact-type application/vnd.oci.image.config.v1+json"