[FLINK-22939][azure] Generalize JDK switch

Author: zentol

azure-pipelines.yml

@@ -74,7 +74,7 @@ stages:
           environment: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.11"
           run_end_to_end: false
           container: flink-build-container
-          jdk: jdk8
+          jdk: 8
   # CI / Special stage for release, e.g. building PyFlink wheel packages, etc:
   - stage: ci_release
     displayName: "CI build (release)"

tools/azure-pipelines/build-apache-repo.yml

@@ -67,7 +67,7 @@ stages:
           environment: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.11"
           run_end_to_end: false
           container: flink-build-container
-          jdk: jdk8
+          jdk: 8
   # Special stage for nightly builds:
   - stage: cron_build
     displayName: "Cron build"
@@ -89,7 +89,7 @@ stages:
           environment: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.11"
           run_end_to_end: true
           container: flink-build-container
-          jdk: jdk8
+          jdk: 8
       - template: jobs-template.yml
         parameters:
           stage_name: cron_hadoop241
@@ -100,7 +100,7 @@ stages:
           environment: PROFILE="-Dhadoop.version=2.4.1 -Pskip-hive-tests"
           run_end_to_end: true
           container: flink-build-container
-          jdk: jdk8
+          jdk: 8
       - template: jobs-template.yml
         parameters:
           stage_name: cron_hadoop313
@@ -111,7 +111,7 @@ stages:
           environment: PROFILE="-Dinclude_hadoop_aws -Dhadoop.version=3.1.3 -Phadoop3-tests"
           run_end_to_end: true
           container: flink-build-container
-          jdk: jdk8
+          jdk: 8
       - template: jobs-template.yml
         parameters:
           stage_name: cron_scala212
@@ -122,7 +122,7 @@ stages:
           environment: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1"
           run_end_to_end: true
           container: flink-build-container
-          jdk: jdk8
+          jdk: 8
       - template: jobs-template.yml
         parameters:
           stage_name: cron_jdk11
@@ -133,7 +133,7 @@ stages:
           environment: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.11 -Djdk11"
           run_end_to_end: true
           container: flink-build-container
-          jdk: jdk11
+          jdk: 11
       - job: docs_404_check # run on a MSFT provided machine
         pool:
           vmImage: 'ubuntu-20.04'

tools/azure-pipelines/jobs-template.yml

@@ -60,10 +60,9 @@ jobs:
     condition: not(eq('${{parameters.test_pool_definition.name}}', 'Default'))
     displayName: Cache Maven local repo
   - script: |
-      echo "##vso[task.setvariable variable=JAVA_HOME]$JAVA_HOME_8_X64"
-      echo "##vso[task.setvariable variable=PATH]$JAVA_HOME_8_X64/bin:$PATH"
-    displayName: "Set to jdk8"
-    condition: eq('${{parameters.jdk}}', 'jdk8')
+      echo "##vso[task.setvariable variable=JAVA_HOME]$JAVA_HOME_${{parameters.jdk}}_X64"
+      echo "##vso[task.setvariable variable=PATH]$JAVA_HOME_${{parameters.jdk}}_X64/bin:$PATH"
+    displayName: "Set JDK"
   # Compile
   - script: |
       ${{parameters.environment}} ./tools/ci/compile.sh || exit $?
@@ -129,10 +128,9 @@ jobs:
     displayName: Cache Maven local repo
 
   - script: |
-      echo "##vso[task.setvariable variable=JAVA_HOME]$JAVA_HOME_8_X64"
-      echo "##vso[task.setvariable variable=PATH]$JAVA_HOME_8_X64/bin:$PATH"
-    displayName: "Set to jdk8"
-    condition: eq('${{parameters.jdk}}', 'jdk8')
+      echo "##vso[task.setvariable variable=JAVA_HOME]$JAVA_HOME_${{parameters.jdk}}_X64"
+      echo "##vso[task.setvariable variable=PATH]$JAVA_HOME_${{parameters.jdk}}_X64/bin:$PATH"
+    displayName: "Set JDK"
 
   - script: sudo sysctl -w kernel.core_pattern=core.%p
     displayName: Set coredump pattern
@@ -203,10 +201,9 @@ jobs:
       continueOnError: true
       condition: not(eq(variables['SKIP'], '1'))
     - script: |
-        echo "##vso[task.setvariable variable=JAVA_HOME]$JAVA_HOME_8_X64"
-        echo "##vso[task.setvariable variable=PATH]$JAVA_HOME_8_X64/bin:$PATH"
-      displayName: "Set to jdk8"
-      condition: eq('${{parameters.jdk}}', 'jdk8')
+        echo "##vso[task.setvariable variable=JAVA_HOME]$JAVA_HOME_${{parameters.jdk}}_X64"
+        echo "##vso[task.setvariable variable=PATH]$JAVA_HOME_${{parameters.jdk}}_X64/bin:$PATH"
+      displayName: "Set JDK"
     - script: |
         echo "Setting up Maven"
         source ./tools/ci/maven-utils.sh