Skip to content

Commit 789091b

Browse files
committed
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.
1 parent b24555b commit 789091b

File tree

2 files changed

+7
-97
lines changed

2 files changed

+7
-97
lines changed

JenkinsJobs/SmokeTests/StartSmokeTests.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ pipeline {
99
stages {
1010
stage('Trigger tests'){
1111
parallel {
12-
stage('Ubuntu 22.04 Java17'){
12+
stage('Ubuntu 24.04 Java17'){
1313
steps {
14-
build job: 'SmokeTests/ep-smoke-test-ubuntu22', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java17x64}")]
14+
build job: 'SmokeTests/ep-smoke-test-ubuntu', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java17x64}")]
1515
}
1616
}
1717
stage('Opensuse Leap Java17'){
@@ -34,9 +34,9 @@ pipeline {
3434
build job: 'SmokeTests/ep-smoke-test-ppcle', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java17ppcle}")]
3535
}
3636
}
37-
stage('Ubuntu 22.04 Java21'){
37+
stage('Ubuntu 24.04 Java21'){
3838
steps {
39-
build job: 'SmokeTests/ep-smoke-test-ubuntu22', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java21x64}")]
39+
build job: 'SmokeTests/ep-smoke-test-ubuntu', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java21x64}")]
4040
}
4141
}
4242
stage('Opensuse Leap Java21'){
@@ -54,9 +54,9 @@ pipeline {
5454
build job: 'SmokeTests/ep-smoke-test-arm64', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java21arm64}")]
5555
}
5656
}
57-
stage('Ubuntu 22.04 Java22'){
57+
stage('Ubuntu 24.04 Java22'){
5858
steps {
59-
build job: 'SmokeTests/ep-smoke-test-ubuntu22', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java22x64}")]
59+
build job: 'SmokeTests/ep-smoke-test-ubuntu', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java22x64}")]
6060
}
6161
}
6262
stage('Opensuse Leap Java22'){

JenkinsJobs/SmokeTests/smoke_test_ubuntu22.groovy renamed to JenkinsJobs/SmokeTests/smoke_test_ubuntu.groovy

Lines changed: 1 addition & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -22,97 +22,7 @@ pipeline {
2222
buildDiscarder(logRotator(numToKeepStr:'5'))
2323
}
2424
agent {
25-
kubernetes {
26-
label 'ubuntu22-pod-' + env.BUILD_NUMBER
27-
defaultContainer 'custom'
28-
yaml """
29-
apiVersion: v1
30-
kind: Pod
31-
spec:
32-
containers:
33-
- name: "custom"
34-
image: "eclipse/platformreleng-ubuntu-gtk3-metacity:22.04"
35-
imagePullPolicy: "Always"
36-
resources:
37-
limits:
38-
memory: "2048Mi"
39-
cpu: "1000m"
40-
requests:
41-
memory: "512Mi"
42-
cpu: "1000m"
43-
securityContext:
44-
privileged: false
45-
tty: true
46-
command:
47-
- cat
48-
volumeMounts:
49-
- mountPath: "/home/jenkins/agent"
50-
name: "workspace-volume"
51-
readOnly: false
52-
- mountPath: "/home/jenkins/.m2/toolchains.xml"
53-
name: "toolchains-xml"
54-
readOnly: true
55-
subPath: "toolchains.xml"
56-
- mountPath: "/opt/tools"
57-
name: "volume-0"
58-
readOnly: false
59-
- mountPath: "/home/jenkins"
60-
name: "volume-2"
61-
readOnly: false
62-
- mountPath: "/home/jenkins/.m2/repository"
63-
name: "volume-3"
64-
readOnly: false
65-
- mountPath: "/home/jenkins/.m2/settings-security.xml"
66-
name: "settings-security-xml"
67-
readOnly: true
68-
subPath: "settings-security.xml"
69-
- mountPath: "/home/jenkins/.m2/settings.xml"
70-
name: "settings-xml"
71-
readOnly: true
72-
subPath: "settings.xml"
73-
- mountPath: "/home/jenkins/.ssh"
74-
name: "volume-1"
75-
readOnly: false
76-
workingDir: "/home/jenkins/agent"
77-
nodeSelector: {}
78-
restartPolicy: "Never"
79-
volumes:
80-
- name: "settings-security-xml"
81-
secret:
82-
items:
83-
- key: "settings-security.xml"
84-
path: "settings-security.xml"
85-
secretName: "m2-secret-dir"
86-
- name: "volume-0"
87-
persistentVolumeClaim:
88-
claimName: "tools-claim-jiro-releng"
89-
readOnly: true
90-
- configMap:
91-
items:
92-
- key: "toolchains.xml"
93-
path: "toolchains.xml"
94-
name: "m2-dir"
95-
name: "toolchains-xml"
96-
- emptyDir:
97-
medium: ""
98-
name: "volume-2"
99-
- configMap:
100-
name: "known-hosts"
101-
name: "volume-1"
102-
- name: "settings-xml"
103-
secret:
104-
items:
105-
- key: "settings.xml"
106-
path: "settings.xml"
107-
secretName: "m2-secret-dir"
108-
- emptyDir:
109-
medium: ""
110-
name: "workspace-volume"
111-
- emptyDir:
112-
medium: ""
113-
name: "volume-3"
114-
"""
115-
}
25+
label "ubuntu-latest"
11626
}
11727
11828
stages {

0 commit comments

Comments
 (0)