Skip to content

Commit 86be992

Browse files
committed
Improve smoketests setup
* Build and publish suse 16 * Run tests on Java 25 instead of 24 * Rename arm/ppc wrong centos8 labels - these are hosted machines that have been updated to CentOS 9 .
1 parent 19e771c commit 86be992

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

JenkinsJobs/AutomatedTests/smokeTests.jenkinsfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ pipeline {
2525
'opensuse_leap', \
2626
'linux_riscv', \
2727
'centos9', \
28-
'centos8_arm', \
29-
'centos8_ppc'
28+
'centos_arm', \
29+
'centos_ppc'
3030
}
3131
axis {
3232
name 'JAVA_VERSION'
33-
values '21', '24'
33+
values '21', '25'
3434
}
3535
}
3636
stages {
@@ -41,17 +41,17 @@ pipeline {
4141
def os, arch, executorAgent;
4242
if (agentId == 'opensuse_leap') {
4343
os = 'linux'; arch = 'x86_64'
44-
executorAgent = createKubernetesAgent('eclipse/platformreleng-opensuse-gtk3-metacity:15')
44+
executorAgent = createKubernetesAgent('eclipse/platformreleng-opensuse-gtk3-metacity:16')
4545
} else if (agentId == 'linux_riscv') {
4646
os = 'linux'; arch = 'riscv64'
4747
executorAgent = createLabeledAgent('riscv64')
4848
} else if (agentId == 'centos9') {
4949
os = 'linux'; arch = 'x86_64'
5050
executorAgent = createKubernetesAgent('eclipse/platformreleng-centos-gtk4-mutter:9')
51-
} else if (agentId == 'centos8_arm') {
51+
} else if (agentId == 'centos_arm') {
5252
os = 'linux'; arch = 'aarch64'
5353
executorAgent = createLabeledAgent('arm64')
54-
} else if (agentId == 'centos8_ppc') {
54+
} else if (agentId == 'centos_ppc') {
5555
os = 'linux'; arch = 'ppc64le'
5656
executorAgent = createLabeledAgent('ppctest')
5757
}

JenkinsJobs/Builds/dockerImages.jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pipeline {
3333
'debian-swtnative': { buildAndPushImage('debian/swtnativebuild', 'eclipse/platformreleng-debian-swtnativebuild:12') },
3434
'debian-swtgtk3native': { buildAndPushImage('debian/swtgtk3nativebuild', 'eclipse/platformreleng-debian-swtgtk3nativebuild:10') },
3535
'centos9-gtk4': { buildAndPushImage('centos-gtk4-mutter/9-gtk4', 'eclipse/platformreleng-centos-gtk4-mutter:9') },
36-
'opensuse-gtk3': { buildAndPushImage('opensuse-gtk3-metacity/15-gtk3', 'eclipse/platformreleng-opensuse-gtk3-metacity:15') },
36+
'opensuse-gtk3': { buildAndPushImage('opensuse-gtk3-metacity/16-gtk3', 'eclipse/platformreleng-opensuse-gtk3-metacity:16') },
3737
failFast: false)
3838
}
3939
dir('eclipse.jdt.core/org.eclipse.jdt.core/docker') {

cje-production/dockerfiles/opensuse-gtk3-metacity/15-gtk3/Dockerfile renamed to cje-production/dockerfiles/opensuse-gtk3-metacity/16-gtk3/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM opensuse/leap:15@sha256:444bb7ba9aedd5232c62cebb9bc104840f1c71f0d3284b17e939d0a7af8d2d1e
1+
FROM opensuse/leap:16.0@sha256:859560554b625c225fa767b76d61253d529b95d082c2d68579ad69168d5e3da7
22

33
### user name recognition at runtime w/ an arbitrary uid - for OpenShift deployments
44
COPY scripts/uid_entrypoint /usr/local/bin/uid_entrypoint
@@ -28,7 +28,7 @@ RUN zypper --non-interactive update && zypper --non-interactive install \
2828
gzip
2929

3030
ENV HOME=/home/vnc
31-
ENV DISPLAY :0
31+
ENV DISPLAY=:0
3232

3333
RUN mkdir -p ${HOME}/.vnc && chmod -R 775 ${HOME} \
3434
&& echo "123456" | vncpasswd -f > ${HOME}/.vnc/passwd \

0 commit comments

Comments
 (0)