Update all ubuntu2004 to ubuntu2404 images

peterzhuamazon · peterzhuamazon · commit 3845299ff028 · 2025-03-13T08:07:52.000-04:00
Signed-off-by: Peter Zhu &lt;zhujiaxi@amazon.com&gt;
diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -22,7 +22,7 @@ pipeline {
         AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host'
         AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host'
         IMAGE_LINUX_RPM = 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1' // required for rpm to create digest sha256 correctly with rpm 4.12+, still define here for 1.x version as 2.x+ moved to rockylinux8, later almalinux8, already
-        IMAGE_LINUX_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2' // required for deb to create pkg using debmake/debuild/debhelper
+        IMAGE_LINUX_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2404-opensearch-build-v1' // required for deb to create pkg using debmake/debuild/debhelper
         IMAGE_WINDOWS_ZIP = 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1' // required for windows to build zip distribution
         JOB_NAME_OPENSEARCH = 'distribution-build-opensearch'
     }
diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
@@ -15,7 +15,7 @@ lib = library(identifier: 'jenkins@8.3.2', retriever: modernSCM([
 def docker_images = [
     "tar": "opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-dashboards-integtest-v1",
     "rpm": "opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1",
-    "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v3",
+    "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2404-systemd-base-integtest-v1",
     "zip": "opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1",
 ]
 
diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -22,7 +22,7 @@ pipeline {
         AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host'
         AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host'
         IMAGE_LINUX_RPM = 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1' // required for rpm to create digest sha256 correctly with rpm 4.12+, still define here for 1.x version as 2.x+ moved to rockylinux8, later almalinux8, already
-        IMAGE_LINUX_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2' // required for deb to create pkg using debmake/debuild/debhelper
+        IMAGE_LINUX_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2404-opensearch-build-v1' // required for deb to create pkg using debmake/debuild/debhelper
         IMAGE_WINDOWS_ZIP = 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1' // required for windows to build zip distribution
     }
     parameters {
diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -15,7 +15,7 @@ lib = library(identifier: 'jenkins@8.3.2', retriever: modernSCM([
 def docker_images = [
     'tar': 'opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1',
     'rpm': 'opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1',
-    'deb': 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v3',
+    'deb': 'opensearchstaging/ci-runner:ci-runner-ubuntu2404-systemd-base-integtest-v1',
     'zip': 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1',
 ]
 
diff --git a/jenkins/opensearch/smoke-test.jenkinsfile b/jenkins/opensearch/smoke-test.jenkinsfile
@@ -15,7 +15,7 @@ lib = library(identifier: 'jenkins@8.1.1', retriever: modernSCM([
 def docker_images = [
     'tar': 'opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1',
     'rpm': 'opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1',
-    'deb': 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v3',
+    'deb': 'opensearchstaging/ci-runner:ci-runner-ubuntu2404-systemd-base-integtest-v1',
     'zip': 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1',
 ]
 
diff --git a/jenkins/release-workflows/promote-repos.jenkinsfile b/jenkins/release-workflows/promote-repos.jenkinsfile
@@ -14,7 +14,7 @@ lib = library(identifier: 'jenkins@6.4.7', retriever: modernSCM([
 
 def docker_images = [
     "yum": "opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1",
-    "apt": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2",
+    "apt": "opensearchstaging/ci-runner:ci-runner-ubuntu2404-opensearch-build-v1",
 ]
 
 pipeline {
diff --git a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile
@@ -17,7 +17,7 @@ def docker_images = [
     "rpm": "opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1",
     "yum": "opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1",
     "zip": "opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1",
-    "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v3"
+    "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2404-systemd-base-integtest-v1"
 ]
 
 def docker_args = [

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ pipeline {`
`22`	`22`	`AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host'`
`23`	`23`	`AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host'`
`24`	`24`	`IMAGE_LINUX_RPM = 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1' // required for rpm to create digest sha256 correctly with rpm 4.12+, still define here for 1.x version as 2.x+ moved to rockylinux8, later almalinux8, already`
`25`		`- IMAGE_LINUX_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2' // required for deb to create pkg using debmake/debuild/debhelper`
	`25`	`+ IMAGE_LINUX_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2404-opensearch-build-v1' // required for deb to create pkg using debmake/debuild/debhelper`
`26`	`26`	`IMAGE_WINDOWS_ZIP = 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1' // required for windows to build zip distribution`
`27`	`27`	`JOB_NAME_OPENSEARCH = 'distribution-build-opensearch'`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ lib = library(identifier: 'jenkins@8.3.2', retriever: modernSCM([`
`15`	`15`	`def docker_images = [`
`16`	`16`	`"tar": "opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-dashboards-integtest-v1",`
`17`	`17`	`"rpm": "opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1",`
`18`		`- "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v3",`
	`18`	`+ "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2404-systemd-base-integtest-v1",`
`19`	`19`	`"zip": "opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1",`
`20`	`20`	`]`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ lib = library(identifier: 'jenkins@6.4.7', retriever: modernSCM([`
`14`	`14`
`15`	`15`	`def docker_images = [`
`16`	`16`	`"yum": "opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1",`
`17`		`- "apt": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2",`
	`17`	`+ "apt": "opensearchstaging/ci-runner:ci-runner-ubuntu2404-opensearch-build-v1",`
`18`	`18`	`]`
`19`	`19`
`20`	`20`	`pipeline {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ def docker_images = [`
`17`	`17`	`"rpm": "opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1",`
`18`	`18`	`"yum": "opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1",`
`19`	`19`	`"zip": "opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1",`
`20`		`- "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v3"`
	`20`	`+ "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2404-systemd-base-integtest-v1"`
`21`	`21`	`]`
`22`	`22`
`23`	`23`	`def docker_args = [`