From 21e25a3c3ae3e3f4a4bd02b1e76f6051c31729c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Galder=20Zamarren=CC=83o?= Date: Mon, 25 Apr 2022 13:57:35 +0200 Subject: [PATCH] Add capability to build multi-arch images * Duplicate modules to support multi-arch. * Extract platform archictecture from the version * Validate version without architecture parameter * Add buildx and qemu for platform emulation. * Do cekit build dry-run and then call docker build * Add --load to set the default docker container driver in order to load into docker. * Add GraalVM 22.0 and 22.1 java11 and java17 arm64 images. * Add Mandrel 22.0 and 22.1 java11 and java17 arm64 images. * Move tooling images to use 22.0.0-java11-amd64 image * Only test native with x86 images. --- .github/build-mandrel-images.sh | 38 ++++++++++++++----- .github/build-native-images.sh | 37 +++++++++++++----- .github/build-s2i-native-images.sh | 16 +++++++- .github/mandrel-images.yaml | 32 ++++++++++++---- .github/native-images.yaml | 38 ++++++++++++------- .github/s2i-native-images.yaml | 36 ++++++++++++------ .github/tooling-images.yaml | 12 +++--- .github/workflows/build-images.yml | 16 +++++++- .../configure | 0 .../module.yaml | 2 +- .../configure | 0 .../graalvm/22.0.0-java11-arm64/module.yaml | 34 +++++++++++++++++ .../configure | 0 .../module.yaml | 2 +- .../configure | 0 .../graalvm/22.0.0-java17-arm64/module.yaml | 34 +++++++++++++++++ modules/graalvm/22.1.0-java11-amd64/configure | 12 ++++++ .../module.yaml | 2 +- modules/graalvm/22.1.0-java11-arm64/configure | 12 ++++++ .../graalvm/22.1.0-java11-arm64/module.yaml | 34 +++++++++++++++++ modules/graalvm/22.1.0-java17-amd64/configure | 12 ++++++ .../module.yaml | 2 +- modules/graalvm/22.1.0-java17-arm64/configure | 12 ++++++ .../graalvm/22.1.0-java17-arm64/module.yaml | 34 +++++++++++++++++ .../configure | 0 .../module.yaml | 2 +- .../configure | 0 .../22.0.0.2-Final-java11-arm64/module.yaml | 30 +++++++++++++++ .../configure | 0 .../module.yaml | 2 +- .../configure | 0 .../22.0.0.2-Final-java17-arm64/module.yaml | 30 +++++++++++++++ .../22.1.0.0-Final-java11-amd64/configure | 8 ++++ .../module.yaml | 2 +- .../22.1.0.0-Final-java11-arm64/configure | 8 ++++ .../22.1.0.0-Final-java11-arm64/module.yaml | 30 +++++++++++++++ .../22.1.0.0-Final-java17-amd64/configure | 8 ++++ .../module.yaml | 2 +- .../22.1.0.0-Final-java17-arm64/configure | 8 ++++ .../22.1.0.0-Final-java17-arm64/module.yaml | 30 +++++++++++++++ 40 files changed, 509 insertions(+), 68 deletions(-) rename modules/graalvm/{22.0.0-java11 => 22.0.0-java11-amd64}/configure (100%) rename modules/graalvm/{22.0.0-java11 => 22.0.0-java11-amd64}/module.yaml (95%) rename modules/graalvm/{22.0.0-java17 => 22.0.0-java11-arm64}/configure (100%) create mode 100644 modules/graalvm/22.0.0-java11-arm64/module.yaml rename modules/graalvm/{22.1.0-java11 => 22.0.0-java17-amd64}/configure (100%) rename modules/graalvm/{22.0.0-java17 => 22.0.0-java17-amd64}/module.yaml (95%) rename modules/graalvm/{22.1.0-java17 => 22.0.0-java17-arm64}/configure (100%) create mode 100644 modules/graalvm/22.0.0-java17-arm64/module.yaml create mode 100644 modules/graalvm/22.1.0-java11-amd64/configure rename modules/graalvm/{22.1.0-java11 => 22.1.0-java11-amd64}/module.yaml (95%) create mode 100644 modules/graalvm/22.1.0-java11-arm64/configure create mode 100644 modules/graalvm/22.1.0-java11-arm64/module.yaml create mode 100644 modules/graalvm/22.1.0-java17-amd64/configure rename modules/graalvm/{22.1.0-java17 => 22.1.0-java17-amd64}/module.yaml (95%) create mode 100644 modules/graalvm/22.1.0-java17-arm64/configure create mode 100644 modules/graalvm/22.1.0-java17-arm64/module.yaml rename modules/mandrel/{22.0.0.2-Final-java11 => 22.0.0.2-Final-java11-amd64}/configure (100%) rename modules/mandrel/{22.0.0.2-Final-java11 => 22.0.0.2-Final-java11-amd64}/module.yaml (93%) rename modules/mandrel/{22.0.0.2-Final-java17 => 22.0.0.2-Final-java11-arm64}/configure (100%) create mode 100644 modules/mandrel/22.0.0.2-Final-java11-arm64/module.yaml rename modules/mandrel/{22.1.0.0-Final-java11 => 22.0.0.2-Final-java17-amd64}/configure (100%) rename modules/mandrel/{22.0.0.2-Final-java17 => 22.0.0.2-Final-java17-amd64}/module.yaml (93%) rename modules/mandrel/{22.1.0.0-Final-java17 => 22.0.0.2-Final-java17-arm64}/configure (100%) create mode 100644 modules/mandrel/22.0.0.2-Final-java17-arm64/module.yaml create mode 100644 modules/mandrel/22.1.0.0-Final-java11-amd64/configure rename modules/mandrel/{22.1.0.0-Final-java11 => 22.1.0.0-Final-java11-amd64}/module.yaml (93%) create mode 100644 modules/mandrel/22.1.0.0-Final-java11-arm64/configure create mode 100644 modules/mandrel/22.1.0.0-Final-java11-arm64/module.yaml create mode 100644 modules/mandrel/22.1.0.0-Final-java17-amd64/configure rename modules/mandrel/{22.1.0.0-Final-java17 => 22.1.0.0-Final-java17-amd64}/module.yaml (93%) create mode 100644 modules/mandrel/22.1.0.0-Final-java17-arm64/configure create mode 100644 modules/mandrel/22.1.0.0-Final-java17-arm64/module.yaml diff --git a/.github/build-mandrel-images.sh b/.github/build-mandrel-images.sh index 9c889572..75f4be5d 100755 --- a/.github/build-mandrel-images.sh +++ b/.github/build-mandrel-images.sh @@ -22,17 +22,35 @@ export PATH=$PATH:$PWD/s2i echo "Path is $PATH" s2i version -echo "Generating ${PREFIX_NAME}:${VERSION}" +ARCH=$(echo "${VERSION}" | cut -d "-" -f 4) +if [ -z "$ARCH" ] +then + ARCH="amd64" +fi + +PLATFORM="linux/${ARCH}" +echo "Generating ${PREFIX_NAME}:${VERSION} for platform ${PLATFORM}" cekit --descriptor ${IMAGE} build \ --overrides "${OVERRIDES}" \ + --dry-run \ ${BUILD_ENGINE} --tag="${PREFIX_NAME}:${VERSION}" -echo "Verifying ${PREFIX_NAME}:${VERSION}" -export CTF_WAIT_TIME=120 -cekit test \ - --image ${PREFIX_NAME}:${VERSION} \ - --overrides-file ${IMAGE} \ - --overrides "${OVERRIDES}" \ - behave \ - --steps-url https://github.com/cescoffier/behave-test-steps - +docker build \ + --platform "${PLATFORM}" \ + --tag "${PREFIX_NAME}:${VERSION}" \ + --load \ + target/image + +# Testing only possible for amd64 images +if [ "$ARCH" = "amd64" ]; then + echo "Verifying ${PREFIX_NAME}:${VERSION}" + export CTF_WAIT_TIME=120 + cekit test \ + --image ${PREFIX_NAME}:${VERSION} \ + --overrides-file ${IMAGE} \ + --overrides "${OVERRIDES}" \ + behave \ + --steps-url https://github.com/cescoffier/behave-test-steps +else + echo "Verification skipped because architectures $ARCH is not amd64" +fi diff --git a/.github/build-native-images.sh b/.github/build-native-images.sh index 9cb52901..93316437 100755 --- a/.github/build-native-images.sh +++ b/.github/build-native-images.sh @@ -23,16 +23,35 @@ s2i version virtualenv --python=python3 .cekit source .cekit/bin/activate -echo "Generating ${PREFIX_NAME}:${VERSION}" +ARCH=$(echo "${VERSION}" | cut -d "-" -f 3) +if [ -z "$ARCH" ] +then + ARCH="amd64" +fi + +PLATFORM="linux/${ARCH}" +echo "Generating ${PREFIX_NAME}:${VERSION} for platform ${PLATFORM}" cekit --descriptor ${IMAGE} build \ --overrides "${OVERRIDES}" \ + --dry-run \ ${BUILD_ENGINE} --tag="${PREFIX_NAME}:${VERSION}" -echo "Verifying ${PREFIX_NAME}:${VERSION}" -export CTF_WAIT_TIME=120 -cekit test \ - --image ${PREFIX_NAME}:${VERSION} \ - --overrides-file ${IMAGE} \ - --overrides "${OVERRIDES}" \ - behave \ - --steps-url https://github.com/cescoffier/behave-test-steps +docker build \ + --platform "${PLATFORM}" \ + --tag "${PREFIX_NAME}:${VERSION}" \ + --load \ + target/image + +# Testing only possible for amd64 images +if [ "$ARCH" = "amd64" ]; then + echo "Verifying ${PREFIX_NAME}:${VERSION}" + export CTF_WAIT_TIME=120 + cekit test \ + --image ${PREFIX_NAME}:${VERSION} \ + --overrides-file ${IMAGE} \ + --overrides "${OVERRIDES}" \ + behave \ + --steps-url https://github.com/cescoffier/behave-test-steps +else + echo "Verification skipped because architectures $ARCH is not amd64" +fi diff --git a/.github/build-s2i-native-images.sh b/.github/build-s2i-native-images.sh index d69c4cbd..f03eca23 100755 --- a/.github/build-s2i-native-images.sh +++ b/.github/build-s2i-native-images.sh @@ -15,11 +15,25 @@ export PATH=$PATH:$PWD/s2i echo "Path is $PATH" s2i version -echo "Generating ${PREFIX_NAME}:${VERSION}" +ARCH=$(echo "${VERSION}" | cut -d "-" -f 3) +if [ -z "$ARCH" ] +then + ARCH="amd64" +fi + +PLATFORM="linux/${ARCH}" +echo "Generating ${PREFIX_NAME}:${VERSION} for platform ${PLATFORM}" cekit --descriptor ${IMAGE} build \ --overrides "${OVERRIDES}" \ + --dry-run \ ${BUILD_ENGINE} --tag="${PREFIX_NAME}:${VERSION}" +docker build \ + --platform "${PLATFORM}" \ + --tag "${PREFIX_NAME}:${VERSION}" \ + --load \ + target/image + # echo "Verifying ${PREFIX_NAME}:${VERSION}" # export CTF_WAIT_TIME=120 # cekit test \ diff --git a/.github/mandrel-images.yaml b/.github/mandrel-images.yaml index 8a6215d4..7c519af1 100644 --- a/.github/mandrel-images.yaml +++ b/.github/mandrel-images.yaml @@ -7,15 +7,19 @@ versions: - 21.3.0.0-Final-java11 - 21.3.0.0-Final-java17 - 21.3.1.0-Final-java11 - - 22.0.0.2-Final-java11 - 21.3.1.0-Final-java17 - - 22.0.0.2-Final-java17 - 21.3.1.1-Final-java17 - 21.3.1.1-Final-java11 - 21.3.2.0-Final-java11 - 21.3.2.0-Final-java17 - - 22.1.0.0-Final-java11 - - 22.1.0.0-Final-java17 + - 22.0.0.2-Final-java11-amd64 + - 22.0.0.2-Final-java11-arm64 + - 22.0.0.2-Final-java17-amd64 + - 22.0.0.2-Final-java17-arm64 + - 22.1.0.0-Final-java11-amd64 + - 22.1.0.0-Final-java11-arm64 + - 22.1.0.0-Final-java17-amd64 + - 22.1.0.0-Final-java17-arm64 tags: - id: 20.3-java11 @@ -24,8 +28,20 @@ tags: target: 21.3.2.0-Final-java11 - id: 21.3-java17 target: 21.3.2.0-Final-java17 - - id: 22.1-java11 - target: 22.1.0.0-Final-java11 - - id: 22.1-java17 - target: 22.1.0.0-Final-java17 + - id: 22.0-java11-amd64 + target: 22.0.0.2-Final-java11-amd64 + - id: 22.0-java11-arm64 + target: 22.0.0.2-Final-java11-arm64 + - id: 22.0-java17-amd64 + target: 22.0.0.2-Final-java17-amd64 + - id: 22.0-java17-arm64 + target: 22.0.0.2-Final-java17-arm64 + - id: 22.1-java11-amd64 + target: 22.1.0.0-Final-java11-amd64 + - id: 22.1-java11-arm64 + target: 22.1.0.0-Final-java11-arm64 + - id: 22.1-java17-amd64 + target: 22.1.0.0-Final-java17-amd64 + - id: 22.1-java17-arm64 + target: 22.1.0.0-Final-java17-arm64 versionCheck: true diff --git a/.github/native-images.yaml b/.github/native-images.yaml index d8ddf21b..6a328635 100644 --- a/.github/native-images.yaml +++ b/.github/native-images.yaml @@ -4,21 +4,33 @@ buildScript: .github/build-native-images.sh versions: - 21.3.2-java11 - 21.3.2-java17 - - 22.0.0-java11 - - 22.0.0-java17 - - 22.1.0-java11 - - 22.1.0-java17 -tags: + - 22.0.0-java11-amd64 + - 22.0.0-java11-arm64 + - 22.0.0-java17-amd64 + - 22.0.0-java17-arm64 + - 22.1.0-java11-amd64 + - 22.1.0-java11-arm64 + - 22.1.0-java17-amd64 + - 22.1.0-java17-arm64 +tags: - id: 21.3-java11 target: 21.3.2-java11 - id: 21.3-java17 target: 21.3.2-java17 - - id: 22.0-java11 - target: 22.0.0-java11 - - id: 22.0-java17 - target: 22.0.0-java17 - - id: 22.1-java11 - target: 22.1.0-java11 - - id: 22.1-java17 - target: 22.1.0-java17 + - id: 22.0-java11-amd64 + target: 22.0.0-java11-amd64 + - id: 22.0-java11-arm64 + target: 22.0.0-java11-arm64 + - id: 22.0-java17-amd64 + target: 22.0.0-java17-amd64 + - id: 22.0-java17-arm64 + target: 22.0.0-java17-arm64 + - id: 22.1-java11-amd64 + target: 22.1.0-java11-amd64 + - id: 22.1-java11-arm64 + target: 22.1.0-java11-arm64 + - id: 22.1-java17-amd64 + target: 22.1.0-java17-amd64 + - id: 22.1-java17-arm64 + target: 22.1.0-java17-arm64 versionCheck: true diff --git a/.github/s2i-native-images.yaml b/.github/s2i-native-images.yaml index 49ff0b3a..eaf6d36a 100644 --- a/.github/s2i-native-images.yaml +++ b/.github/s2i-native-images.yaml @@ -4,21 +4,33 @@ buildScript: .github/build-s2i-native-images.sh versions: - 21.3.2-java11 - 21.3.2-java17 - - 22.0.0-java11 - - 22.0.0-java17 - - 22.1.0-java11 - - 22.1.0-java17 + - 22.0.0-java11-amd64 + - 22.0.0-java11-arm64 + - 22.0.0-java17-amd64 + - 22.0.0-java17-arm64 + - 22.1.0-java11-amd64 + - 22.1.0-java11-arm64 + - 22.1.0-java17-amd64 + - 22.1.0-java17-arm64 tags: - id: 21.3-java11 target: 21.3.2-java11 - id: 21.3-java17 target: 21.3.2-java17 - - id: 22.0-java11 - target: 22.0.0-java11 - - id: 22.0-java17 - target: 22.0.0-java17 - - id: 22.1-java11 - target: 22.1.0-java11 - - id: 22.1-java17 - target: 22.1.0-java17 + - id: 22.0-java11-amd64 + target: 22.0.0-java11-amd64 + - id: 22.0-java11-arm64 + target: 22.0.0-java11-arm64 + - id: 22.0-java17-amd64 + target: 22.0.0-java17-amd64 + - id: 22.0-java17-arm64 + target: 22.0.0-java17-arm64 + - id: 22.1-java11-amd64 + target: 22.1.0-java11-amd64 + - id: 22.1-java11-arm64 + target: 22.1.0-java11-arm64 + - id: 22.1-java17-amd64 + target: 22.1.0-java17-amd64 + - id: 22.1-java17-arm64 + target: 22.1.0-java17-arm64 versionCheck: false diff --git a/.github/tooling-images.yaml b/.github/tooling-images.yaml index 6d1d3333..d37c7fb3 100644 --- a/.github/tooling-images.yaml +++ b/.github/tooling-images.yaml @@ -3,13 +3,13 @@ imageName: quay.io/quarkus/centos-quarkus-maven buildScript: .github/build-tooling-images.sh versions: - 21.3.2-java11 - - 22.0.0-java11 - - 22.1.0-java11 + - 22.0.0-java11-amd64 + - 22.1.0-java11-amd64 tags: - id: 21.3-java11 target: 21.3.2-java11 - - id: 22.0-java11 - target: 22.0.0-java11 - - id: 22.1-java11 - target: 22.1.0-java11 + - id: 22.0-java11-amd64 + target: 22.0.0-java11-amd64 + - id: 22.1-java11-amd64 + target: 22.1.0-java11-amd64 versionCheck: false diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 94b5b448..d28f66e5 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -23,7 +23,21 @@ jobs: - .github/s2i-native-images.yaml - .github/tooling-images.yaml steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v1 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + with: + install: true + - name: Inspect builder + run: | + echo "Name: ${{ steps.buildx.outputs.name }}" + echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}" + echo "Status: ${{ steps.buildx.outputs.status }}" + echo "Flags: ${{ steps.buildx.outputs.flags }}" + echo "Platforms: ${{ steps.buildx.outputs.platforms }}" - name: Prerequisites run: .github/ci-prerequisites.sh - name: Build images diff --git a/modules/graalvm/22.0.0-java11/configure b/modules/graalvm/22.0.0-java11-amd64/configure similarity index 100% rename from modules/graalvm/22.0.0-java11/configure rename to modules/graalvm/22.0.0-java11-amd64/configure diff --git a/modules/graalvm/22.0.0-java11/module.yaml b/modules/graalvm/22.0.0-java11-amd64/module.yaml similarity index 95% rename from modules/graalvm/22.0.0-java11/module.yaml rename to modules/graalvm/22.0.0-java11-amd64/module.yaml index 1f8bdb82..898bed64 100644 --- a/modules/graalvm/22.0.0-java11/module.yaml +++ b/modules/graalvm/22.0.0-java11-amd64/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: graalvm -version: &version "22.0.0-java11" +version: &version "22.0.0-java11-amd64" labels: - name: graalvm-archive-filename diff --git a/modules/graalvm/22.0.0-java17/configure b/modules/graalvm/22.0.0-java11-arm64/configure similarity index 100% rename from modules/graalvm/22.0.0-java17/configure rename to modules/graalvm/22.0.0-java11-arm64/configure diff --git a/modules/graalvm/22.0.0-java11-arm64/module.yaml b/modules/graalvm/22.0.0-java11-arm64/module.yaml new file mode 100644 index 00000000..cb034f8c --- /dev/null +++ b/modules/graalvm/22.0.0-java11-arm64/module.yaml @@ -0,0 +1,34 @@ +schema_version: 1 +name: graalvm +version: &version "22.0.0-java11-arm64" + +labels: + - name: graalvm-archive-filename + value: &filename graalvm-ce-linux-aarch64-22.0.0.2-java11.tar.gz + - name: graalvm-archive-url + value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java11-linux-aarch64-22.0.0.2.tar.gz + - name: graalvm-version + value: &suffix java11-22.0.0 + +envs: + - name: "JAVA_HOME" + value: "/opt/graalvm" + - name: "GRAALVM_HOME" + value: "/opt/graalvm" + - name: "GRAALVM_VERSION" + value: *suffix + - name: "FILENAME" + value: *filename + +artifacts: +- name: *filename + url: *url + sha256: 1cc0263d95f642dada4e290dca7f49c0456cefa7b690b67e3e5c159b537b2c58 + +packages: + install: + - fontconfig + - freetype-devel + +execute: +- script: configure diff --git a/modules/graalvm/22.1.0-java11/configure b/modules/graalvm/22.0.0-java17-amd64/configure similarity index 100% rename from modules/graalvm/22.1.0-java11/configure rename to modules/graalvm/22.0.0-java17-amd64/configure diff --git a/modules/graalvm/22.0.0-java17/module.yaml b/modules/graalvm/22.0.0-java17-amd64/module.yaml similarity index 95% rename from modules/graalvm/22.0.0-java17/module.yaml rename to modules/graalvm/22.0.0-java17-amd64/module.yaml index 9238f989..0e394058 100644 --- a/modules/graalvm/22.0.0-java17/module.yaml +++ b/modules/graalvm/22.0.0-java17-amd64/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: graalvm -version: &version "22.0.0-java17" +version: &version "22.0.0-java17-amd64" labels: - name: graalvm-archive-filename diff --git a/modules/graalvm/22.1.0-java17/configure b/modules/graalvm/22.0.0-java17-arm64/configure similarity index 100% rename from modules/graalvm/22.1.0-java17/configure rename to modules/graalvm/22.0.0-java17-arm64/configure diff --git a/modules/graalvm/22.0.0-java17-arm64/module.yaml b/modules/graalvm/22.0.0-java17-arm64/module.yaml new file mode 100644 index 00000000..b3fcafaf --- /dev/null +++ b/modules/graalvm/22.0.0-java17-arm64/module.yaml @@ -0,0 +1,34 @@ +schema_version: 1 +name: graalvm +version: &version "22.0.0-java17-arm64" + +labels: + - name: graalvm-archive-filename + value: &filename graalvm-ce-linux-aarch64-22.0.0.2-java17.tar.gz + - name: graalvm-archive-url + value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java17-linux-aarch64-22.0.0.2.tar.gz + - name: graalvm-version + value: &suffix java17-22.0.0 + +envs: + - name: "JAVA_HOME" + value: "/opt/graalvm" + - name: "GRAALVM_HOME" + value: "/opt/graalvm" + - name: "GRAALVM_VERSION" + value: *suffix + - name: "FILENAME" + value: *filename + +artifacts: +- name: *filename + url: *url + sha256: c7d78387d2a144944f26773697c1b61d3478a081a1c5e7fc20f47f1f5f3c82c7 + +packages: + install: + - fontconfig + - freetype-devel + +execute: +- script: configure diff --git a/modules/graalvm/22.1.0-java11-amd64/configure b/modules/graalvm/22.1.0-java11-amd64/configure new file mode 100644 index 00000000..32b75246 --- /dev/null +++ b/modules/graalvm/22.1.0-java11-amd64/configure @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +SOURCES_DIR=/tmp/artifacts + +ls -l ${SOURCES_DIR} +tar xzf ${SOURCES_DIR}/${FILENAME} -C /opt +ls -l /opt +mv /opt/graalvm-ce-${GRAALVM_VERSION}* /opt/graalvm + +echo "Installing native-image" +/opt/graalvm/bin/gu --auto-yes install native-image \ No newline at end of file diff --git a/modules/graalvm/22.1.0-java11/module.yaml b/modules/graalvm/22.1.0-java11-amd64/module.yaml similarity index 95% rename from modules/graalvm/22.1.0-java11/module.yaml rename to modules/graalvm/22.1.0-java11-amd64/module.yaml index de81589a..bc8fb14a 100644 --- a/modules/graalvm/22.1.0-java11/module.yaml +++ b/modules/graalvm/22.1.0-java11-amd64/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: graalvm -version: &version "22.1.0-java11" +version: &version "22.1.0-java11-amd64" labels: - name: graalvm-archive-filename diff --git a/modules/graalvm/22.1.0-java11-arm64/configure b/modules/graalvm/22.1.0-java11-arm64/configure new file mode 100644 index 00000000..32b75246 --- /dev/null +++ b/modules/graalvm/22.1.0-java11-arm64/configure @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +SOURCES_DIR=/tmp/artifacts + +ls -l ${SOURCES_DIR} +tar xzf ${SOURCES_DIR}/${FILENAME} -C /opt +ls -l /opt +mv /opt/graalvm-ce-${GRAALVM_VERSION}* /opt/graalvm + +echo "Installing native-image" +/opt/graalvm/bin/gu --auto-yes install native-image \ No newline at end of file diff --git a/modules/graalvm/22.1.0-java11-arm64/module.yaml b/modules/graalvm/22.1.0-java11-arm64/module.yaml new file mode 100644 index 00000000..ebd38179 --- /dev/null +++ b/modules/graalvm/22.1.0-java11-arm64/module.yaml @@ -0,0 +1,34 @@ +schema_version: 1 +name: graalvm +version: &version "22.1.0-java11-arm64" + +labels: + - name: graalvm-archive-filename + value: &filename graalvm-ce-linux-aarch64-22.1.0-java11.tar.gz + - name: graalvm-archive-url + value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-linux-aarch64-22.1.0.tar.gz + - name: graalvm-version + value: &suffix java11-22.1.0 + +envs: + - name: "JAVA_HOME" + value: "/opt/graalvm" + - name: "GRAALVM_HOME" + value: "/opt/graalvm" + - name: "GRAALVM_VERSION" + value: *suffix + - name: "FILENAME" + value: *filename + +artifacts: +- name: *filename + url: *url + sha256: 050a4d471247d91935f7f485e92d678f0163e1d6209e26e8fe75d7c924f73e71 + +packages: + install: + - fontconfig + - freetype-devel + +execute: +- script: configure diff --git a/modules/graalvm/22.1.0-java17-amd64/configure b/modules/graalvm/22.1.0-java17-amd64/configure new file mode 100644 index 00000000..32b75246 --- /dev/null +++ b/modules/graalvm/22.1.0-java17-amd64/configure @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +SOURCES_DIR=/tmp/artifacts + +ls -l ${SOURCES_DIR} +tar xzf ${SOURCES_DIR}/${FILENAME} -C /opt +ls -l /opt +mv /opt/graalvm-ce-${GRAALVM_VERSION}* /opt/graalvm + +echo "Installing native-image" +/opt/graalvm/bin/gu --auto-yes install native-image \ No newline at end of file diff --git a/modules/graalvm/22.1.0-java17/module.yaml b/modules/graalvm/22.1.0-java17-amd64/module.yaml similarity index 95% rename from modules/graalvm/22.1.0-java17/module.yaml rename to modules/graalvm/22.1.0-java17-amd64/module.yaml index 2e0f0edb..e6041cd9 100644 --- a/modules/graalvm/22.1.0-java17/module.yaml +++ b/modules/graalvm/22.1.0-java17-amd64/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: graalvm -version: &version "22.1.0-java17" +version: &version "22.1.0-java17-amd64" labels: - name: graalvm-archive-filename diff --git a/modules/graalvm/22.1.0-java17-arm64/configure b/modules/graalvm/22.1.0-java17-arm64/configure new file mode 100644 index 00000000..32b75246 --- /dev/null +++ b/modules/graalvm/22.1.0-java17-arm64/configure @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +SOURCES_DIR=/tmp/artifacts + +ls -l ${SOURCES_DIR} +tar xzf ${SOURCES_DIR}/${FILENAME} -C /opt +ls -l /opt +mv /opt/graalvm-ce-${GRAALVM_VERSION}* /opt/graalvm + +echo "Installing native-image" +/opt/graalvm/bin/gu --auto-yes install native-image \ No newline at end of file diff --git a/modules/graalvm/22.1.0-java17-arm64/module.yaml b/modules/graalvm/22.1.0-java17-arm64/module.yaml new file mode 100644 index 00000000..6772c140 --- /dev/null +++ b/modules/graalvm/22.1.0-java17-arm64/module.yaml @@ -0,0 +1,34 @@ +schema_version: 1 +name: graalvm +version: &version "22.1.0-java17-arm64" + +labels: + - name: graalvm-archive-filename + value: &filename graalvm-ce-linux-aarch64-22.1.0-java17.tar.gz + - name: graalvm-archive-url + value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-linux-aarch64-22.1.0.tar.gz + - name: graalvm-version + value: &suffix java17-22.1.0 + +envs: + - name: "JAVA_HOME" + value: "/opt/graalvm" + - name: "GRAALVM_HOME" + value: "/opt/graalvm" + - name: "GRAALVM_VERSION" + value: *suffix + - name: "FILENAME" + value: *filename + +artifacts: +- name: *filename + url: *url + sha256: 05128e361ed44beebc89495faaa504b0b975bf93aa5e512e217b3cf5e42dfada + +packages: + install: + - fontconfig + - freetype-devel + +execute: +- script: configure diff --git a/modules/mandrel/22.0.0.2-Final-java11/configure b/modules/mandrel/22.0.0.2-Final-java11-amd64/configure similarity index 100% rename from modules/mandrel/22.0.0.2-Final-java11/configure rename to modules/mandrel/22.0.0.2-Final-java11-amd64/configure diff --git a/modules/mandrel/22.0.0.2-Final-java11/module.yaml b/modules/mandrel/22.0.0.2-Final-java11-amd64/module.yaml similarity index 93% rename from modules/mandrel/22.0.0.2-Final-java11/module.yaml rename to modules/mandrel/22.0.0.2-Final-java11-amd64/module.yaml index c61f4c37..80b5780c 100644 --- a/modules/mandrel/22.0.0.2-Final-java11/module.yaml +++ b/modules/mandrel/22.0.0.2-Final-java11-amd64/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: mandrel -version: &version "22.0.0.2-Final-java11" +version: &version "22.0.0.2-Final-java11-amd64" labels: - name: mandrel-archive-filename diff --git a/modules/mandrel/22.0.0.2-Final-java17/configure b/modules/mandrel/22.0.0.2-Final-java11-arm64/configure similarity index 100% rename from modules/mandrel/22.0.0.2-Final-java17/configure rename to modules/mandrel/22.0.0.2-Final-java11-arm64/configure diff --git a/modules/mandrel/22.0.0.2-Final-java11-arm64/module.yaml b/modules/mandrel/22.0.0.2-Final-java11-arm64/module.yaml new file mode 100644 index 00000000..b13f4b75 --- /dev/null +++ b/modules/mandrel/22.0.0.2-Final-java11-arm64/module.yaml @@ -0,0 +1,30 @@ +schema_version: 1 +name: mandrel +version: &version "22.0.0.2-Final-java11-arm64" + +labels: + - name: mandrel-archive-filename + value: &filename mandrel-java11-linux-aarch64-22.0.0.2-Final.tar.gz + - name: mandrel-archive-url + value: &url https://github.com/graalvm/mandrel/releases/download/mandrel-22.0.0.2-Final/mandrel-java11-linux-aarch64-22.0.0.2-Final.tar.gz + +envs: + - name: "JAVA_HOME" + value: "/opt/mandrel" + - name: "GRAALVM_HOME" + value: "/opt/mandrel" + - name: "FILENAME" + value: *filename + +artifacts: +- name: *filename + url: *url + sha256: 8a382563f85282193a47b6d873d3b647c82098150f88c26a934144d2465a5f81 + +packages: + install: + - fontconfig + - freetype-devel + +execute: +- script: configure diff --git a/modules/mandrel/22.1.0.0-Final-java11/configure b/modules/mandrel/22.0.0.2-Final-java17-amd64/configure similarity index 100% rename from modules/mandrel/22.1.0.0-Final-java11/configure rename to modules/mandrel/22.0.0.2-Final-java17-amd64/configure diff --git a/modules/mandrel/22.0.0.2-Final-java17/module.yaml b/modules/mandrel/22.0.0.2-Final-java17-amd64/module.yaml similarity index 93% rename from modules/mandrel/22.0.0.2-Final-java17/module.yaml rename to modules/mandrel/22.0.0.2-Final-java17-amd64/module.yaml index 76c765c5..537ca64c 100644 --- a/modules/mandrel/22.0.0.2-Final-java17/module.yaml +++ b/modules/mandrel/22.0.0.2-Final-java17-amd64/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: mandrel -version: &version "22.0.0.2-Final-java17" +version: &version "22.0.0.2-Final-java17-amd64" labels: - name: mandrel-archive-filename diff --git a/modules/mandrel/22.1.0.0-Final-java17/configure b/modules/mandrel/22.0.0.2-Final-java17-arm64/configure similarity index 100% rename from modules/mandrel/22.1.0.0-Final-java17/configure rename to modules/mandrel/22.0.0.2-Final-java17-arm64/configure diff --git a/modules/mandrel/22.0.0.2-Final-java17-arm64/module.yaml b/modules/mandrel/22.0.0.2-Final-java17-arm64/module.yaml new file mode 100644 index 00000000..f973e649 --- /dev/null +++ b/modules/mandrel/22.0.0.2-Final-java17-arm64/module.yaml @@ -0,0 +1,30 @@ +schema_version: 1 +name: mandrel +version: &version "22.0.0.2-Final-java17-arm64" + +labels: + - name: mandrel-archive-filename + value: &filename mandrel-java17-linux-aarch64-22.0.0.2-Final.tar.gz + - name: mandrel-archive-url + value: &url https://github.com/graalvm/mandrel/releases/download/mandrel-22.0.0.2-Final/mandrel-java17-linux-aarch64-22.0.0.2-Final.tar.gz + +envs: + - name: "JAVA_HOME" + value: "/opt/mandrel" + - name: "GRAALVM_HOME" + value: "/opt/mandrel" + - name: "FILENAME" + value: *filename + +artifacts: +- name: *filename + url: *url + sha256: 40b67cacbd11dbc25f21d832ba0df0d75ef1cb68b9d028455b4b64792a1edba9 + +packages: + install: + - fontconfig + - freetype-devel + +execute: +- script: configure diff --git a/modules/mandrel/22.1.0.0-Final-java11-amd64/configure b/modules/mandrel/22.1.0.0-Final-java11-amd64/configure new file mode 100644 index 00000000..d5a1cc25 --- /dev/null +++ b/modules/mandrel/22.1.0.0-Final-java11-amd64/configure @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +SOURCES_DIR=/tmp/artifacts + +ls -l ${SOURCES_DIR} +mkdir -p ${GRAALVM_HOME} +tar xzf ${SOURCES_DIR}/${FILENAME} -C ${GRAALVM_HOME} --strip-components=1 diff --git a/modules/mandrel/22.1.0.0-Final-java11/module.yaml b/modules/mandrel/22.1.0.0-Final-java11-amd64/module.yaml similarity index 93% rename from modules/mandrel/22.1.0.0-Final-java11/module.yaml rename to modules/mandrel/22.1.0.0-Final-java11-amd64/module.yaml index 0c55101e..b9a52cd8 100644 --- a/modules/mandrel/22.1.0.0-Final-java11/module.yaml +++ b/modules/mandrel/22.1.0.0-Final-java11-amd64/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: mandrel -version: &version "22.1.0.0-Final-java11" +version: &version "22.1.0.0-Final-java11-amd64" labels: - name: mandrel-archive-filename diff --git a/modules/mandrel/22.1.0.0-Final-java11-arm64/configure b/modules/mandrel/22.1.0.0-Final-java11-arm64/configure new file mode 100644 index 00000000..d5a1cc25 --- /dev/null +++ b/modules/mandrel/22.1.0.0-Final-java11-arm64/configure @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +SOURCES_DIR=/tmp/artifacts + +ls -l ${SOURCES_DIR} +mkdir -p ${GRAALVM_HOME} +tar xzf ${SOURCES_DIR}/${FILENAME} -C ${GRAALVM_HOME} --strip-components=1 diff --git a/modules/mandrel/22.1.0.0-Final-java11-arm64/module.yaml b/modules/mandrel/22.1.0.0-Final-java11-arm64/module.yaml new file mode 100644 index 00000000..9af482e4 --- /dev/null +++ b/modules/mandrel/22.1.0.0-Final-java11-arm64/module.yaml @@ -0,0 +1,30 @@ +schema_version: 1 +name: mandrel +version: &version "22.1.0.0-Final-java11-arm64" + +labels: + - name: mandrel-archive-filename + value: &filename mandrel-java11-linux-aarch64-22.1.0.0-Final.tar.gz + - name: mandrel-archive-url + value: &url https://github.com/graalvm/mandrel/releases/download/mandrel-22.1.0.0-Final/mandrel-java11-linux-aarch64-22.1.0.0-Final.tar.gz + +envs: + - name: "JAVA_HOME" + value: "/opt/mandrel" + - name: "GRAALVM_HOME" + value: "/opt/mandrel" + - name: "FILENAME" + value: *filename + +artifacts: +- name: *filename + url: *url + sha256: 932e167e0571c7eda37f20b3c2605563666e0fed79de2dcac2ad6f48cdf91d7b + +packages: + install: + - fontconfig + - freetype-devel + +execute: +- script: configure diff --git a/modules/mandrel/22.1.0.0-Final-java17-amd64/configure b/modules/mandrel/22.1.0.0-Final-java17-amd64/configure new file mode 100644 index 00000000..d5a1cc25 --- /dev/null +++ b/modules/mandrel/22.1.0.0-Final-java17-amd64/configure @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +SOURCES_DIR=/tmp/artifacts + +ls -l ${SOURCES_DIR} +mkdir -p ${GRAALVM_HOME} +tar xzf ${SOURCES_DIR}/${FILENAME} -C ${GRAALVM_HOME} --strip-components=1 diff --git a/modules/mandrel/22.1.0.0-Final-java17/module.yaml b/modules/mandrel/22.1.0.0-Final-java17-amd64/module.yaml similarity index 93% rename from modules/mandrel/22.1.0.0-Final-java17/module.yaml rename to modules/mandrel/22.1.0.0-Final-java17-amd64/module.yaml index 2e7f659c..1123bdf8 100644 --- a/modules/mandrel/22.1.0.0-Final-java17/module.yaml +++ b/modules/mandrel/22.1.0.0-Final-java17-amd64/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: mandrel -version: &version "22.1.0.0-Final-java17" +version: &version "22.1.0.0-Final-java17-amd64" labels: - name: mandrel-archive-filename diff --git a/modules/mandrel/22.1.0.0-Final-java17-arm64/configure b/modules/mandrel/22.1.0.0-Final-java17-arm64/configure new file mode 100644 index 00000000..d5a1cc25 --- /dev/null +++ b/modules/mandrel/22.1.0.0-Final-java17-arm64/configure @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +SOURCES_DIR=/tmp/artifacts + +ls -l ${SOURCES_DIR} +mkdir -p ${GRAALVM_HOME} +tar xzf ${SOURCES_DIR}/${FILENAME} -C ${GRAALVM_HOME} --strip-components=1 diff --git a/modules/mandrel/22.1.0.0-Final-java17-arm64/module.yaml b/modules/mandrel/22.1.0.0-Final-java17-arm64/module.yaml new file mode 100644 index 00000000..f32d99c7 --- /dev/null +++ b/modules/mandrel/22.1.0.0-Final-java17-arm64/module.yaml @@ -0,0 +1,30 @@ +schema_version: 1 +name: mandrel +version: &version "22.1.0.0-Final-java17-arm64" + +labels: + - name: mandrel-archive-filename + value: &filename mandrel-java17-linux-aarch64-22.1.0.0-Final.tar.gz + - name: mandrel-archive-url + value: &url https://github.com/graalvm/mandrel/releases/download/mandrel-22.1.0.0-Final/mandrel-java17-linux-aarch64-22.1.0.0-Final.tar.gz + +envs: + - name: "JAVA_HOME" + value: "/opt/mandrel" + - name: "GRAALVM_HOME" + value: "/opt/mandrel" + - name: "FILENAME" + value: *filename + +artifacts: +- name: *filename + url: *url + sha256: d6c7304b3ad6a3ca17664be092a5420905b2190407b45b40ef4312f723b38208 + +packages: + install: + - fontconfig + - freetype-devel + +execute: +- script: configure