Merge remote-tracking branch 'origin/master' into devkit_job

adoptium · Mar 19, 2024 · 5d232b2 · 5d232b2
2 parents 79d0a91 + 4f9e1ea
commit 5d232b2
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/.github/workflows/code-freeze.yml b/.github/workflows/code-freeze.yml
@@ -3,7 +3,7 @@ name: Code Freeze Bot
 # Controls when the workflow will run
 on:
   pull_request_target:
-    branches: [ "master", "v[0-9]{4}.[0-9]{2}.[0-9]{2}" ]
+    branches: [ "v[0-9]+.[0-9]+.[0-9]+" ]
   issue_comment:
     types: [created]
 

diff --git a/pipelines/build/regeneration/release_pipeline_generator.groovy b/pipelines/build/regeneration/release_pipeline_generator.groovy
@@ -7,7 +7,7 @@ file used as jenkinsfile to generator official release pipeline
 */
 
 // ensure releaseVersions is updated before create releaseTag
-def releaseVersions = [8,11,17,21]
+def releaseVersions = [8,11,17,21,22]
 
 
 // Regenerate release-openjdkX-pipeline per each jdk version listed in releaseVersions

diff --git a/pipelines/jobs/configurations/jdk22.groovy b/pipelines/jobs/configurations/jdk22.groovy
@@ -29,6 +29,9 @@ targetConfigurations = [
         ],
         'aarch64Mac': [
                 'temurin'
+        ],
+        'riscv64Linux': [
+                'temurin'
         ]
 ]
 

diff --git a/pipelines/jobs/configurations/jdk22_release.groovy b/pipelines/jobs/configurations/jdk22_release.groovy
@@ -0,0 +1,37 @@
+targetConfigurations = [
+        'x64Mac'      : [
+                'temurin'
+        ],
+        'x64Linux'    : [
+                'temurin'
+        ],
+        'x64AlpineLinux' : [
+                'temurin'
+        ],
+        'aarch64AlpineLinux' : [
+                'temurin'
+        ],
+        'x64Windows'  : [
+                'temurin'
+        ],
+        'ppc64Aix'    : [
+                'temurin'
+        ],
+        'ppc64leLinux': [
+                'temurin'
+        ],
+        's390xLinux'  : [
+                'temurin'
+        ],
+        'aarch64Linux': [
+                'temurin'
+        ],
+        'aarch64Mac': [
+                'temurin'
+        ],
+        'riscv64Linux': [
+                'temurin'
+        ]
+]
+
+return this
diff --git a/tools/reproduce_comparison/Jenkinsfile b/tools/reproduce_comparison/Jenkinsfile
@@ -158,7 +158,7 @@ pipeline {
                         sh "find . -type f -name 'OpenJDK*-jdk*.tar.gz' -delete"
                     }
                     try {
-                        dir('temurin-build/tooling') {
+                        dir('temurin-build/tooling/reproducible') {
                             def rc = 0
                             if (COMPARED_JOB_NAME.contains('linux')) {
                                 rc = sh returnStatus: true, script: "./repro_compare.sh temurin ${WORKSPACE}/original temurin ${WORKSPACE}/reproduced Linux"