Skip to content

Commit 3e40162

Browse files
committed
Build and test on Fedora 42 image
1 parent 43eeb94 commit 3e40162

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Jenkinsfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,11 @@ spec:
5858
steps {
5959
container('container') {
6060
withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING'),string(credentialsId: 'gpg-passphrase', variable: 'MAVEN_GPG_PASSPHRASE') ]) {
61-
wrap([$class: 'Xvnc', useXauthority: true]) {
61+
sh '''WAYLAND_DISPLAY=shell-test-1 dbus-run-session gnome-shell --wayland-display=shell-test-1 --nested --no-x11'''
6262
sh '''mvn -e -Psign -Dmaven.test.failure.ignore=true -ntp -Ddash.fail=true -Dtycho.pgp.signer.bc.secretKeys="${KEYRING}" clean verify'''
63-
}
6463
}}
6564
}
66-
post {
65+
post {
6766
always {
6867
junit '**/*.test*/target/surefire-reports/*.xml'
6968
archiveArtifacts artifacts: '**/*.log,**/*.html,**/screenshots/*.png,**/target/repository/*'

releng/container-build/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipsecbi/fedora-gtk3-mutter:41-gtk3.24
1+
FROM eclipsecbi/fedora-gtk3-mutter:42-gtk3.24
22

33
# Back to root for install
44
USER 0
@@ -9,13 +9,14 @@ RUN sed -i '/tsflags=nodocs/ d' /etc/dnf/dnf.conf
99
RUN dnf -y update && dnf -y install \
1010
webkit2gtk3 npm tigervnc-server java-21-openjdk-devel \
1111
gcc-c++ perf systemtap rpmdevtools valgrind \
12-
gtk3-devel-docs \
12+
gtk3-devel-docs gnome-shell \
1313
&& dnf clean all
1414

1515
RUN curl -L https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz | tar -xzv
1616

1717
ENV PATH=/apache-maven-3.9.9/bin:/usr/lib/jvm/java-21/bin:$PATH
1818
ENV JAVA_HOME=/usr/lib/jvm/java-21
19+
ENV NO_AT_BRIDGE=1
1920

2021
#Back to named user
2122
USER 10001

0 commit comments

Comments
 (0)