From 789091b8b6c95be2b00482aa46741ca4ec9f1bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Thu, 12 Sep 2024 12:40:44 +0300
Subject: [PATCH] Use EF Ubuntu 24.04 image for smoke tests

Platform releng one is still on 22.04 and now that foundation provides
24.04 as a default one we better rely on it.
---
 JenkinsJobs/SmokeTests/StartSmokeTests.groovy | 12 +--
 ...untu22.groovy => smoke_test_ubuntu.groovy} | 92 +------------------
 2 files changed, 7 insertions(+), 97 deletions(-)
 rename JenkinsJobs/SmokeTests/{smoke_test_ubuntu22.groovy => smoke_test_ubuntu.groovy} (71%)

diff --git a/JenkinsJobs/SmokeTests/StartSmokeTests.groovy b/JenkinsJobs/SmokeTests/StartSmokeTests.groovy
index b99d6f122a1..8f0dbad8e8b 100644
--- a/JenkinsJobs/SmokeTests/StartSmokeTests.groovy
+++ b/JenkinsJobs/SmokeTests/StartSmokeTests.groovy
@@ -9,9 +9,9 @@ pipeline {
   stages {
 	  stage('Trigger tests'){
           parallel {
-              stage('Ubuntu 22.04 Java17'){
+              stage('Ubuntu 24.04 Java17'){
                   steps {
-                        build job: 'SmokeTests/ep-smoke-test-ubuntu22', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java17x64}")]
+                        build job: 'SmokeTests/ep-smoke-test-ubuntu', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java17x64}")]
                   }
               }
               stage('Opensuse Leap Java17'){
@@ -34,9 +34,9 @@ pipeline {
                         build job: 'SmokeTests/ep-smoke-test-ppcle', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java17ppcle}")]
                   }
               }
-          	  stage('Ubuntu 22.04 Java21'){
+          	  stage('Ubuntu 24.04 Java21'){
 				  steps {
-						build job: 'SmokeTests/ep-smoke-test-ubuntu22', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java21x64}")]
+						build job: 'SmokeTests/ep-smoke-test-ubuntu', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java21x64}")]
 				  }
 			  }
 			  stage('Opensuse Leap Java21'){
@@ -54,9 +54,9 @@ pipeline {
 						build job: 'SmokeTests/ep-smoke-test-arm64', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java21arm64}")]
 				  }
 			  }
-			  stage('Ubuntu 22.04 Java22'){
+			  stage('Ubuntu 24.04 Java22'){
 				  steps {
-						build job: 'SmokeTests/ep-smoke-test-ubuntu22', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java22x64}")]
+						build job: 'SmokeTests/ep-smoke-test-ubuntu', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java22x64}")]
 				  }
 			  }
 			  stage('Opensuse Leap Java22'){
diff --git a/JenkinsJobs/SmokeTests/smoke_test_ubuntu22.groovy b/JenkinsJobs/SmokeTests/smoke_test_ubuntu.groovy
similarity index 71%
rename from JenkinsJobs/SmokeTests/smoke_test_ubuntu22.groovy
rename to JenkinsJobs/SmokeTests/smoke_test_ubuntu.groovy
index 70202757ed6..c80b7e4f98f 100644
--- a/JenkinsJobs/SmokeTests/smoke_test_ubuntu22.groovy
+++ b/JenkinsJobs/SmokeTests/smoke_test_ubuntu.groovy
@@ -22,97 +22,7 @@ pipeline {
 		buildDiscarder(logRotator(numToKeepStr:'5'))
 	}
   agent {
-    kubernetes {
-      label 'ubuntu22-pod-' + env.BUILD_NUMBER
-      defaultContainer 'custom'
-      yaml """
-apiVersion: v1
-kind: Pod
-spec:
-  containers:
-  - name: "custom"
-    image: "eclipse/platformreleng-ubuntu-gtk3-metacity:22.04"
-    imagePullPolicy: "Always"
-    resources:
-      limits:
-        memory: "2048Mi"
-        cpu: "1000m"
-      requests:
-        memory: "512Mi"
-        cpu: "1000m"
-    securityContext:
-      privileged: false
-    tty: true
-    command:
-    - cat
-    volumeMounts:
-    - mountPath: "/home/jenkins/agent"
-      name: "workspace-volume"
-      readOnly: false
-    - mountPath: "/home/jenkins/.m2/toolchains.xml"
-      name: "toolchains-xml"
-      readOnly: true
-      subPath: "toolchains.xml"
-    - mountPath: "/opt/tools"
-      name: "volume-0"
-      readOnly: false
-    - mountPath: "/home/jenkins"
-      name: "volume-2"
-      readOnly: false
-    - mountPath: "/home/jenkins/.m2/repository"
-      name: "volume-3"
-      readOnly: false
-    - mountPath: "/home/jenkins/.m2/settings-security.xml"
-      name: "settings-security-xml"
-      readOnly: true
-      subPath: "settings-security.xml"
-    - mountPath: "/home/jenkins/.m2/settings.xml"
-      name: "settings-xml"
-      readOnly: true
-      subPath: "settings.xml"
-    - mountPath: "/home/jenkins/.ssh"
-      name: "volume-1"
-      readOnly: false
-    workingDir: "/home/jenkins/agent"
-  nodeSelector: {}
-  restartPolicy: "Never"
-  volumes:
-  - name: "settings-security-xml"
-    secret:
-      items:
-      - key: "settings-security.xml"
-        path: "settings-security.xml"
-      secretName: "m2-secret-dir"
-  - name: "volume-0"
-    persistentVolumeClaim:
-      claimName: "tools-claim-jiro-releng"
-      readOnly: true
-  - configMap:
-      items:
-      - key: "toolchains.xml"
-        path: "toolchains.xml"
-      name: "m2-dir"
-    name: "toolchains-xml"
-  - emptyDir:
-      medium: ""
-    name: "volume-2"
-  - configMap:
-      name: "known-hosts"
-    name: "volume-1"
-  - name: "settings-xml"
-    secret:
-      items:
-      - key: "settings.xml"
-        path: "settings.xml"
-      secretName: "m2-secret-dir"
-  - emptyDir:
-      medium: ""
-    name: "workspace-volume"
-  - emptyDir:
-      medium: ""
-    name: "volume-3"
-"""
-    }
+	label "ubuntu-latest"
   }
 
   stages {