Skip to content

Commit

Permalink
Upgraded Windows VS2022 Redist configuration to use latest vs2022_red…
Browse files Browse the repository at this point in the history
…ist_14.40.33807_10.0.26100.1742

Signed-off-by: Andrew Leonard <[email protected]>
  • Loading branch information
andrew-m-leonard committed Dec 18, 2024
1 parent 207bcc8 commit 22f11dc
Showing 7 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ class Config11 {
'temurin' : '--disable-ccache'
],
buildArgs : [
'temurin' : '--jvm-variant client,server --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--jvm-variant client,server --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
],
test : 'default'
],
@@ -94,7 +94,7 @@ class Config11 {
'temurin' : '--disable-ccache'
],
buildArgs : [
'temurin' : '--jvm-variant client,server --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--jvm-variant client,server --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
],
test : 'default'
],
@@ -256,7 +256,7 @@ class Config11 {
'temurin' : '--disable-ccache'
],
buildArgs : [
'temurin' : '--jvm-variant client,server --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--jvm-variant client,server --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
]
]
6 changes: 3 additions & 3 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ class Config17 {
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
],

@@ -83,7 +83,7 @@ class Config17 {
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
buildArgs : [
'temurin' : '--jvm-variant client,server --create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--jvm-variant client,server --create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
],

@@ -183,7 +183,7 @@ class Config17 {
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
]
]
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ class Config21 {
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system']
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
],

@@ -169,7 +169,7 @@ class Config21 {
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
]
]
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk23u_pipeline_config.groovy
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ class Config23 {
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system']
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
],

@@ -170,7 +170,7 @@ class Config23 {
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
]
]
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk24_pipeline_config.groovy
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ class Config24 {
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system']
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
],

@@ -170,7 +170,7 @@ class Config24 {
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
]
]
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk25_pipeline_config.groovy
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ class Config25 {
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system']
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
],

@@ -170,7 +170,7 @@ class Config25 {
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
]
]
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ class Config8 {
'temurin' : '--disable-ccache'
],
buildArgs : [
'temurin' : '--create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
'temurin' : '--create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
]
],

@@ -88,7 +88,7 @@ class Config8 {
'temurin' : '--disable-ccache'
],
buildArgs : [
temurin : '--jvm-variant client,server --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
temurin : '--jvm-variant client,server --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.1742'
],
test : 'default'
],

0 comments on commit 22f11dc

Please sign in to comment.