Skip to content

Commit 13f5159

Browse files
committed
[I-Build-Tests] Run Linux tests on default 'centos-8' agent
Save the complexity of a customized kubernetes pod configuration which doesn't seem to be necessary.
1 parent cd58890 commit 13f5159

File tree

1 file changed

+2
-58
lines changed

1 file changed

+2
-58
lines changed

JenkinsJobs/AutomatedTests/I_unit_linux.groovy

Lines changed: 2 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -24,61 +24,7 @@ pipeline {
2424
buildDiscarder(logRotator(numToKeepStr:'5'))
2525
}
2626
agent {
27-
kubernetes {
28-
label 'centos-unitpod''' + JAVA_VERSION + ''''
29-
defaultContainer 'custom'
30-
yaml """
31-
apiVersion: v1
32-
kind: Pod
33-
spec:
34-
containers:
35-
- name: "jnlp"
36-
resources:
37-
limits:
38-
memory: "2048Mi"
39-
cpu: "2000m"
40-
requests:
41-
memory: "512Mi"
42-
cpu: "1000m"
43-
- name: "custom"
44-
image: "eclipse/platformreleng-centos-gtk3-metacity:8"
45-
imagePullPolicy: "Always"
46-
resources:
47-
limits:
48-
memory: "4096Mi"
49-
cpu: "1000m"
50-
requests:
51-
# memory needs to be at least 1024Mi, see https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/2478
52-
memory: "1024Mi"
53-
cpu: "1000m"
54-
securityContext:
55-
privileged: false
56-
tty: true
57-
command:
58-
- cat
59-
volumeMounts:
60-
- mountPath: "/opt/tools"
61-
name: "volume-0"
62-
readOnly: false
63-
workingDir: "/home/jenkins/agent"
64-
nodeSelector: {}
65-
restartPolicy: "Never"
66-
volumes:
67-
- name: "volume-0"
68-
persistentVolumeClaim:
69-
claimName: "tools-claim-jiro-releng"
70-
readOnly: true
71-
- configMap:
72-
name: "known-hosts"
73-
name: "volume-1"
74-
- emptyDir:
75-
medium: ""
76-
name: "workspace-volume"
77-
- emptyDir:
78-
medium: ""
79-
name: "volume-3"
80-
"""
81-
}
27+
label 'centos-8'
8228
}
8329
8430
stages {
@@ -91,8 +37,7 @@ spec:
9137
ANT_OPTS = "-Djava.io.tmpdir=${WORKSPACE}/tmp -Djava.security.manager=allow"
9238
}
9339
steps {
94-
container ('custom'){
95-
xvnc(useXauthority: true) {
40+
xvnc(useXauthority: true) {
9641
sh \'\'\'#!/bin/bash -x
9742
9843
buildId=$(echo $buildId|tr -d ' ')
@@ -129,7 +74,6 @@ spec:
12974
-DtestSuite=all
13075
# For smaller test-suites see: https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/be721e33c916b03c342e7b6f334220c6124946f8/production/testScripts/configuration/sdk.tests/testScripts/test.xml#L1893-L1903
13176
\'\'\'
132-
}
13377
}
13478
archiveArtifacts '**/eclipse-testing/results/**, **/eclipse-testing/directorLogs/**, *.properties, *.txt'
13579
junit keepLongStdio: true, testResults: '**/eclipse-testing/results/xml/*.xml'

0 commit comments

Comments
 (0)