From 15a4b6a60a4570f0ae9af5d66f4d24de51e70c4d Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@apache.org>
Date: Wed, 10 Jul 2024 19:31:16 +0800
Subject: [PATCH 1/2] HADOOP-19223. Continue running the pipeline even if
 stages fail

---
 dev-support/Jenkinsfile | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 672061ea09ad9..06e43e1e45253 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -121,12 +121,14 @@ pipeline {
             }
 
             steps {
-                withCredentials(getGithubCreds()) {
-                        sh '''#!/usr/bin/env bash
+                catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
+                    withCredentials(getGithubCreds()) {
+                            sh '''#!/usr/bin/env bash
 
-                        chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
-                        "${SOURCEDIR}/dev-support/jenkins.sh" run_ci
-                        '''
+                            chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
+                            "${SOURCEDIR}/dev-support/jenkins.sh" run_ci
+                            '''
+                    }
                 }
             }
 
@@ -167,12 +169,14 @@ pipeline {
             }
 
             steps {
-                withCredentials(getGithubCreds()) {
-                    sh '''#!/usr/bin/env bash
+                catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
+                    withCredentials(getGithubCreds()) {
+                        sh '''#!/usr/bin/env bash
 
-                    chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
-                    "${SOURCEDIR}/dev-support/jenkins.sh" run_ci
-                    '''
+                        chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
+                        "${SOURCEDIR}/dev-support/jenkins.sh" run_ci
+                        '''
+                    }
                 }
             }
 

From 48a391e62501e61083b2efc8d1ba6487ef7bb4a0 Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@apache.org>
Date: Mon, 1 Sep 2025 16:31:02 +0800
Subject: [PATCH 2/2] platform change

---
 dev-support/docker/pkg-resolver/packages.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-support/docker/pkg-resolver/packages.json b/dev-support/docker/pkg-resolver/packages.json
index 452ed015c329d..bdc86eef455ac 100644
--- a/dev-support/docker/pkg-resolver/packages.json
+++ b/dev-support/docker/pkg-resolver/packages.json
@@ -266,21 +266,21 @@
       "openjdk-17-jdk"
     ],
     "ubuntu:focal": [
-      "temurin-24-jdk",
       "openjdk-8-jdk",
       "openjdk-11-jdk",
-      "openjdk-17-jdk"
+      "openjdk-17-jdk",
+      "temurin-24-jdk"
     ],
     "ubuntu:noble": [
-      "temurin-24-jdk",
       "openjdk-11-jdk",
-      "openjdk-17-jdk"
+      "openjdk-17-jdk",
+      "temurin-24-jdk"
     ],
     "ubuntu:focal::arch64": [
-      "temurin-24-jdk",
       "openjdk-8-jdk",
       "openjdk-11-jdk",
-      "openjdk-17-jdk"
+      "openjdk-17-jdk",
+      "temurin-24-jdk"
     ]
   },
   "pinentry-curses": {