From e997299c52d058c8e53b74b82a074ddb5851ad78 Mon Sep 17 00:00:00 2001 From: Emily McMullan Date: Mon, 29 Jun 2026 07:10:32 -0400 Subject: [PATCH 1/3] Fix jdtls download (#224) * fix jdtls download Signed-off-by: Emily McMullan * Use milestone Signed-off-by: Juan Manuel Leflet Estrada --------- Signed-off-by: Emily McMullan Signed-off-by: Juan Manuel Leflet Estrada Co-authored-by: Juan Manuel Leflet Estrada Signed-off-by: Cherry Picker --- Dockerfile | 2 +- Dockerfile.test | 2 +- java-analyzer-bundle.tp/java-analyzer-bundle.target | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b7ebfa5..e080839 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi9/ubi AS jdtls-download WORKDIR /jdtls -RUN curl -s -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.51.0/jdt-language-server-1.51.0-202510022025.tar.gz &&\ +RUN curl -fsSL -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.60.0/jdt-language-server-1.60.0-202606262232.tar.gz &&\ tar -xvf jdtls.tar.gz --no-same-owner &&\ chmod 755 /jdtls/bin/jdtls &&\ rm -rf jdtls.tar.gz diff --git a/Dockerfile.test b/Dockerfile.test index e23d17a..169a357 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi9/ubi AS jdtls-download WORKDIR /jdtls -RUN curl -s -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.51.0/jdt-language-server-1.51.0-202510022025.tar.gz &&\ +RUN curl -fsSL -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.60.0/jdt-language-server-1.60.0-202606262232.tar.gz &&\ tar -xvf jdtls.tar.gz --no-same-owner --no-same-permissions &&\ chmod 755 /jdtls/bin/jdtls &&\ rm -rf jdtls.tar.gz diff --git a/java-analyzer-bundle.tp/java-analyzer-bundle.target b/java-analyzer-bundle.tp/java-analyzer-bundle.target index b20db48..a8b7fd3 100644 --- a/java-analyzer-bundle.tp/java-analyzer-bundle.target +++ b/java-analyzer-bundle.tp/java-analyzer-bundle.target @@ -2,12 +2,12 @@ - - + From efde1961212022c78283e00327e8e76d9f94584f Mon Sep 17 00:00:00 2001 From: Juan Manuel Leflet Estrada Date: Thu, 2 Jul 2026 13:17:24 +0200 Subject: [PATCH 2/3] Determine operator tag based on the base branch Signed-off-by: Juan Manuel Leflet Estrada --- .github/workflows/global-ci.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.github/workflows/global-ci.yaml b/.github/workflows/global-ci.yaml index bf32b7e..3229876 100644 --- a/.github/workflows/global-ci.yaml +++ b/.github/workflows/global-ci.yaml @@ -8,11 +8,14 @@ jobs: runs-on: ubuntu-24.04 outputs: api_tests_ref: ${{ steps.extract_info.outputs.API_TESTS_REF }} + operator_tag: ${{ steps.extract_info.outputs.OPERATOR_TAG }} strategy: fail-fast: false steps: - name: Extract pull request number from PR description id: extract_info + env: + GH_TOKEN: ${{ github.token }} run: | ANALYZER_PR=$(echo "${{ github.event.pull_request.body }}" | grep -oP '[A|a]nalyzer.?[P|p][R|r]: \K\d+' || true) if [ -z "$ANALYZER_PR" ]; then @@ -27,6 +30,29 @@ jobs: else echo "API_TESTS_REF=refs/pull/$API_TESTS_PR/merge" >> $GITHUB_OUTPUT fi + + # Set operator tag based on base branch - fetch latest release dynamically + case "${GITHUB_BASE_REF}" in + release-0.9) + OPERATOR_TAG=$(gh release list -R konveyor/operator --limit 100 | grep -E "^v0\.9\.[0-9]+\s" | head -1 | awk '{print $1}') + if [ -z "$OPERATOR_TAG" ]; then + echo "Warning: No v0.9.x stable release found, falling back to v0.9.2" + OPERATOR_TAG="v0.9.2" + fi + echo "OPERATOR_TAG=${OPERATOR_TAG}" >> $GITHUB_OUTPUT + ;; + release-0.8) + OPERATOR_TAG=$(gh release list -R konveyor/operator --limit 100 | grep -E "^v0\.8\.[0-9]+\s" | head -1 | awk '{print $1}') + if [ -z "$OPERATOR_TAG" ]; then + echo "Warning: No v0.8.x stable release found, falling back to v0.8.3" + OPERATOR_TAG="v0.8.3" + fi + echo "OPERATOR_TAG=${OPERATOR_TAG}" >> $GITHUB_OUTPUT + ;; + *) + echo "OPERATOR_TAG=latest" >> $GITHUB_OUTPUT + ;; + esac - name: checkout uses: actions/checkout@v3 @@ -68,3 +94,4 @@ jobs: with: component_name: java-provider api_tests_ref: "${{ needs.build-addon.outputs.api_tests_ref }}" + operator_tag: "${{ needs.build-addon.outputs.operator_tag }}" From 8ba1e984237594b716fb221be76b266cbba33f15 Mon Sep 17 00:00:00 2001 From: Juan Manuel Leflet Estrada Date: Thu, 2 Jul 2026 15:44:11 +0200 Subject: [PATCH 3/3] Pass also tag Signed-off-by: Juan Manuel Leflet Estrada --- .github/workflows/global-ci.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/global-ci.yaml b/.github/workflows/global-ci.yaml index 3229876..cc8d150 100644 --- a/.github/workflows/global-ci.yaml +++ b/.github/workflows/global-ci.yaml @@ -9,6 +9,7 @@ jobs: outputs: api_tests_ref: ${{ steps.extract_info.outputs.API_TESTS_REF }} operator_tag: ${{ steps.extract_info.outputs.OPERATOR_TAG }} + tag: ${{ steps.extract_info.outputs.TAG }} strategy: fail-fast: false steps: @@ -31,7 +32,7 @@ jobs: echo "API_TESTS_REF=refs/pull/$API_TESTS_PR/merge" >> $GITHUB_OUTPUT fi - # Set operator tag based on base branch - fetch latest release dynamically + # Set operator tag and image tag based on base branch - fetch latest release dynamically case "${GITHUB_BASE_REF}" in release-0.9) OPERATOR_TAG=$(gh release list -R konveyor/operator --limit 100 | grep -E "^v0\.9\.[0-9]+\s" | head -1 | awk '{print $1}') @@ -40,6 +41,7 @@ jobs: OPERATOR_TAG="v0.9.2" fi echo "OPERATOR_TAG=${OPERATOR_TAG}" >> $GITHUB_OUTPUT + echo "TAG=release-0.9" >> $GITHUB_OUTPUT ;; release-0.8) OPERATOR_TAG=$(gh release list -R konveyor/operator --limit 100 | grep -E "^v0\.8\.[0-9]+\s" | head -1 | awk '{print $1}') @@ -48,9 +50,11 @@ jobs: OPERATOR_TAG="v0.8.3" fi echo "OPERATOR_TAG=${OPERATOR_TAG}" >> $GITHUB_OUTPUT + echo "TAG=release-0.8" >> $GITHUB_OUTPUT ;; *) echo "OPERATOR_TAG=latest" >> $GITHUB_OUTPUT + echo "TAG=latest" >> $GITHUB_OUTPUT ;; esac @@ -93,5 +97,6 @@ jobs: uses: konveyor/ci/.github/workflows/global-ci.yml@main with: component_name: java-provider + tag: "${{ needs.build-addon.outputs.tag }}" api_tests_ref: "${{ needs.build-addon.outputs.api_tests_ref }}" operator_tag: "${{ needs.build-addon.outputs.operator_tag }}"