Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ubuntu 24.10: port missing slices from 24.04 #392

Merged
merged 22 commits into from
Dec 13, 2024
Merged

Ubuntu 24.10: port missing slices from 24.04 #392

merged 22 commits into from
Dec 13, 2024

Conversation

cjdcordeiro
Copy link
Collaborator

Proposed changes

There were some standing 24.04 PRs at the time of opening 24.10 that weren't forward-ported. This PR ports them from 24.04.

Related issues/PRs

Closes #391

Checklist

Additional Context

@cjdcordeiro cjdcordeiro requested a review from a team November 19, 2024 14:57
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 19, 2024 •
edited
Loading

Diff of dependencies:

slices/fontconfig-config.yaml 
@@ -1,8 +1 @@
-fonts-croscore
 fonts-dejavu-core
-fonts-freefont-otf
-fonts-freefont-ttf
-fonts-liberation
-fonts-noto-core
-fonts-texgyre
-fonts-urw-base35
slices/fonts-urw-base35.yaml 
@@ -1 +0,0 @@
-xfonts-utils
slices/gpg.yaml 
@@ -1,4 +1,3 @@
-gpgconf
 libassuan0
 libbz2-1.0
 libc6
slices/libzvbi0t64.yaml 
@@ -1,3 +1,2 @@
 libc6
 libpng16-16t64
-libzvbi-common
slices/openjdk-11-jre-headless.yaml 
@@ -1,11 +1,6 @@
-ca-certificates-java
-java-common
 libc6
 libgcc-s1
-libjpeg8
-liblcms2-2
 libnss3
 libpcsclite1
 libstdc++6
-util-linux
 zlib1g
slices/openjdk-17-jre-headless.yaml 
@@ -1,11 +1,6 @@
-ca-certificates-java
-java-common
 libc6
 libgcc-s1
-libjpeg8
-liblcms2-2
 libnss3
 libpcsclite1
 libstdc++6
-util-linux
 zlib1g
slices/openjdk-8-jre-headless.yaml 
@@ -1,20 +1,10 @@
-ca-certificates-java
-java-common
 libc6
-libcups2t64
 libfontconfig1
 libfreetype6
 libgcc-s1
 libjpeg-turbo8
-libjpeg8
 liblcms2-2
 libnss3
 libpcsclite1
 libstdc++6
-libx11-6
-libxext6
-libxi6
-libxrender1
-libxtst6
-util-linux
 zlib1g
slices/xfonts-encodings.yaml 
@@ -1 +0,0 @@
-x11-common
slices/xfonts-utils.yaml 
@@ -1,6 +1,5 @@
 libc6
 libfontenc1
 libfreetype6
-x11-common
 xfonts-encodings
 zlib1g

@cjdcordeiro
Copy link
Collaborator Author

@vpa1977 could you please help understand the java errors in these tests: https://github.com/canonical/chisel-releases/actions/runs/11915704026/job/33206594753?pr=392

I can't reproduce them locally. I just copied them from 24.04.

@vpa1977
Copy link

vpa1977 commented Nov 20, 2024

@vpa1977 could you please help understand the java errors in these tests: https://github.com/canonical/chisel-releases/actions/runs/11915704026/job/33206594753?pr=392

I can't reproduce them locally. I just copied them from 24.04.

It looks like spread is reusing the vms?

VM Started: + chroot . usr/lib/jvm/java-11-openjdk-amd64/bin/jcmd MonitoringTest VM.version

[1045](https://github.com/canonical/chisel-releases/actions/runs/11915704026/job/33206594753?pr=392#step:9:1046)10636:

[1046](https://github.com/canonical/chisel-releases/actions/runs/11915704026/job/33206594753?pr=392#step:9:1047)OpenJDK 64-Bit Server VM version 17.0.13+11-Ubuntu-2ubuntu124.10

We should not have java 17 process, but yet it is present. The tests expect the same/lower version Java to be installed.

@cjdcordeiro
Copy link
Collaborator Author

@vpa1977 indeed since this PR is running many tests in parallel, multiple versions of java get installed at the same time and may clash.

I've adjusted the java tests in order to reduce the changes of such clashes by:

  • cleaning up after the task execution
  • enforcing the use of the right java alternative at test time

@vpa1977
Copy link

vpa1977 commented Nov 21, 2024 •
edited
Loading

@vpa1977 indeed since this PR is running many tests in parallel, multiple versions of java get installed at the same time and may clash.

I've adjusted the java tests in order to reduce the changes of such clashes by:

There is a typo/not critical thing in Java 17 tests - it uses Java 11 on the host, hence the test failure.
We can either bump host to 17 or use 11 update-alternatives.

@cjdcordeiro
Copy link
Collaborator Author

thanks for pointing that out @vpa1977

rebornplusplus
rebornplusplus requested changes Nov 22, 2024
View reviewed changes
Copy link
Member

@rebornplusplus rebornplusplus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quick review of the java spread fixes.

tests/spread/integration/openjdk-11-jre-headless/task.yaml Outdated Show resolved Hide resolved
tests/spread/integration/openjdk-17-jre-headless/task.yaml Show resolved Hide resolved
@cjdcordeiro cjdcordeiro requested review from rebornplusplus and a team November 22, 2024 11:10
rebornplusplus added a commit to rebornplusplus/chisel-releases that referenced this pull request Nov 22, 2024
@rebornplusplus @cjdcordeiro
test: import java test fixes from canonical#392
ce0d43c 
The 24.10 forward-port PR canonical#392 contains fixes for the openjdk-* spread
tests. This commit imports those fixes for jdk-11, jre-11, jdk-17 and
jre-17.

There should be a follow-up commit for duplicating the changes for jdk
and jre 8 and 21.

Co-authored-by: Cristovao Cordeiro <[email protected]>
rebornplusplus added a commit to rebornplusplus/chisel-releases that referenced this pull request Nov 22, 2024
@rebornplusplus
test: fix openjdk-21-* spread tests
0626dee 
Similar to ce0d43c, this commit adds the relevant fixes introduced in
the forward-port PR canonical#392, for jdk-21 and jre-21.
@cjdcordeiro cjdcordeiro requested a review from vpa1977 November 25, 2024 16:17
vpa1977
vpa1977 approved these changes Nov 25, 2024
View reviewed changes
Copy link

@vpa1977 vpa1977 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Scope of review: Java slices and tests.

@cjdcordeiro cjdcordeiro mentioned this pull request Nov 28, 2024
Open
@cjdcordeiro cjdcordeiro requested a review from clay-lake December 4, 2024 09:46
@cjdcordeiro cjdcordeiro added the Priority Look at me first label Dec 10, 2024
@norrisjeremy
Copy link

When will this be merged?

@clay-lake
Copy link

Hi @norrisjeremy, I'm currently reviewing this. We should have an update soon.

clay-lake
clay-lake approved these changes Dec 12, 2024
View reviewed changes
Copy link

@clay-lake clay-lake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be good to go. I looked at differences between releases and dependencies I could not spot anything that stood out. @cjdcordeiro

@rebornplusplus Do you want to update your status here?

rebornplusplus
rebornplusplus approved these changes Dec 12, 2024
View reviewed changes
Copy link
Member

@rebornplusplus rebornplusplus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks OK to me on a brief look.

@cjdcordeiro cjdcordeiro merged commit 5687e72 into canonical:ubuntu-24.10 Dec 13, 2024
14 checks passed
@cjdcordeiro cjdcordeiro deleted the ubuntu-24.10-port-missing-slices branch December 13, 2024 07:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clay-lake clay-lake clay-lake approved these changes

@rebornplusplus rebornplusplus rebornplusplus approved these changes

@vpa1977 vpa1977 vpa1977 approved these changes

Assignees
No one assigned
Labels
Priority Look at me first
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@cjdcordeiro @vpa1977 @norrisjeremy @clay-lake @rebornplusplus