(flink) branch master updated: [FLINK-33664][ci] Setup cron build for java 21

[snuyanzin]

This is an automated email from the ASF dual-hosted git repository.

snuyanzin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 76f75483329 [FLINK-33664][ci] Setup cron build for java 21
76f75483329 is described below

commit 76f754833298beb3e7589d521e75325adf283bf3
Author: Sergey Nuyanzin <snuyan...@gmail.com>
AuthorDate: Tue Nov 28 15:23:37 2023 +0100

    [FLINK-33664][ci] Setup cron build for java 21
---
 flink-end-to-end-tests/test-scripts/common_docker.sh |  3 +++
 tools/azure-pipelines/build-apache-repo.yml          | 11 +++++++++++
 tools/ci/compile.sh                                  |  4 ++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/flink-end-to-end-tests/test-scripts/common_docker.sh 
b/flink-end-to-end-tests/test-scripts/common_docker.sh
index e38f20359ba..2ce590cd424 100644
--- a/flink-end-to-end-tests/test-scripts/common_docker.sh
+++ b/flink-end-to-end-tests/test-scripts/common_docker.sh
@@ -57,6 +57,9 @@ function build_image() {
     if [[ ${PROFILE} == *"jdk17"* ]]; then
         java_version=17
     fi
+    if [[ ${PROFILE} == *"jdk21"* ]]; then
+        java_version=21
+    fi
 
     cd flink-docker
     ./add-custom.sh -u ${file_server_address}:9999/flink.tgz -n ${image_name} 
-j ${java_version}
diff --git a/tools/azure-pipelines/build-apache-repo.yml 
b/tools/azure-pipelines/build-apache-repo.yml
index 56892394757..a229ee0029a 100644
--- a/tools/azure-pipelines/build-apache-repo.yml
+++ b/tools/azure-pipelines/build-apache-repo.yml
@@ -150,6 +150,17 @@ stages:
           run_end_to_end: true
           container: flink-build-container
           jdk: 17
+      - template: jobs-template.yml
+        parameters:
+          stage_name: cron_jdk21
+          test_pool_definition:
+            name: Default
+          e2e_pool_definition:
+            vmImage: 'ubuntu-20.04'
+          environment: PROFILE="-Dflink.hadoop.version=2.10.2 -Djdk11 -Djdk17 
-Djdk21 -Pjava21-target"
+          run_end_to_end: true
+          container: flink-build-container
+          jdk: 21
       - template: jobs-template.yml
         parameters:
           stage_name: cron_adaptive_scheduler
diff --git a/tools/ci/compile.sh b/tools/ci/compile.sh
index 0603e7b7e48..19fd34ab3ae 100755
--- a/tools/ci/compile.sh
+++ b/tools/ci/compile.sh
@@ -126,8 +126,8 @@ EXIT_CODE=$(($EXIT_CODE+$?))
 echo "============ Run license check ============"
 
 find $MVN_VALIDATION_DIR
-# We use a different Scala version with Java 17
-if [[ ${PROFILE} != *"jdk17"* ]]; then
+# We use a different Scala version with Java 17 and 21
+if [[ ${PROFILE} != *"jdk17"* ]] && [[ ${PROFILE} != *"jdk21"* ]]; then
   MVN=$MVN ${CI_DIR}/license_check.sh $MVN_CLEAN_COMPILE_OUT 
$MVN_VALIDATION_DIR || exit $?
 fi