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

Add Ubuntu 24.10 Oracular Oriole #1075

Merged
merged 3 commits into from
Dec 19, 2024
Merged

Add Ubuntu 24.10 Oracular Oriole #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13c2d6a
Add Ubuntu 24.10 Oracular Oriole
Mailaender Dec 16, 2024
d6677f4
Merge branch 'master' into oracular
steelhead31 Dec 18, 2024
5f59b5e
Merge branch 'master' into oracular
steelhead31 Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cacert-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Upload deb file to Artifactory
if: steps.check-deb.outputs.file_exists == 'false'
run: |
DISTRO_LIST="trixie,bookworm,buster,noble,jammy,focal,bionic"
DISTRO_LIST="trixie,bookworm,buster,oracular,noble,jammy,focal,bionic"
FILE=$(ls ca-certificates/debian/build/ospackage/*.deb)
# Upload cacerts deb file
jf rt u "$FILE" "deb/pool/main/a/adoptium-ca-certificates/$(basename ${FILE})" --flat=true
Expand Down
17 changes: 10 additions & 7 deletions docs/Guide_To_The_Linux_Installers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Supported Linux Distros:
Distribution Type| Supported Versions
----------|---------
Apk (Alpine)| All supported version.
Deb (Debian)| Trixie (Debian 13)<br>Bookworm (Debian 12)</br>Bullseye (Debian 11)<br>Buster (Debian 10)</br> Noble (Ubuntu 24.04)</br>Jammy (Ubuntu 24.04)</br>Focal (Ubuntu 20.04)</br>Bionic (Ubuntu 18.04)
Deb (Debian)| Trixie (Debian 13)<br>Bookworm (Debian 12)</br>Bullseye (Debian 11)<br>Buster (Debian 10)</br> Oracular (Ubuntu 24.10)</br>Noble (Ubuntu 24.04)</br>Jammy (Ubuntu 22.04)</br>Focal (Ubuntu 20.04)</br>Bionic (Ubuntu 18.04)
RPM (RHEL)| centos 7</br> rocky 8</br>RHEL7 , RHEL8 & RHEL9</br> Fedora 35, 36, 37, 38 ,39 , 40</br>Oracle Linux 7 & 8</br>Amazon Linux 2
RPM(SUSE) | Opensuse 15.3</br>Opensuse 15.4</br>Opensuse 15.5</br>SLES 12</br>SLES15

Expand Down Expand Up @@ -429,6 +429,7 @@ For Debian based distributions a similar process is required, firstly add the di
"bookworm", // Debian/12
"bullseye", // Debian/11
"buster", // Debian/10
"oracular", // Ubuntu/24.10 (STS)
"noble", // Ubuntu/24.04 (LTS)
"jammy", // Ubuntu/22.04 (LTS)
"focal", // Ubuntu/20.04 (LTS)
Expand All @@ -446,7 +447,7 @@ In addition to the updates detailed above, it is also important to change the fo
the following line should be changed :

```
debVersionList="trixie bookworm bullseye buster noble jammy focal bionic"
debVersionList="trixie bookworm bullseye buster oracular noble jammy focal bionic"
```

And similarly in the following two files
Expand All @@ -463,6 +464,7 @@ The array needs to be updated to add or remove distributions as necessary as sho
Arguments.of("debian", "bookworm"), // Debian/12 (testing)
Arguments.of("debian", "bullseye"), // Debian/11 (stable)
Arguments.of("debian", "buster"), // Debian/10 (oldstable)
Arguments.of("ubuntu", "oracular"), // Ubuntu/24.10 (STS)
Arguments.of("ubuntu", "noble"), // Ubuntu/24.04 (LTS)
Arguments.of("ubuntu", "jammy"), // Ubuntu/22.04 (LTS)
Arguments.of("ubuntu", "focal"), // Ubuntu/20.04 (LTS)
Expand All @@ -486,7 +488,7 @@ Simply add or remove the supported distributions to the <b>debVersionList</b> li
- name: Upload deb file to Artifactory
if: steps.check-deb.outputs.file_exists == 'false'
run: |
debVersionList=("bookworm" "bullseye" "buster" "jammy" "focal" "bionic")
debVersionList=("bookworm" "bullseye" "buster" "oracular" "jammy" "focal" "bionic")
for debVersion in "${debVersionList[@]}"; do
distroList+="deb.distribution=${debVersion};"
done
Expand All @@ -503,14 +505,15 @@ Again, new distributions should be added or removed in the array.

```
def deb_versions = [
"trixie", // Debian/13
"trixie", // Debian/13
"bookworm", // Debian/12
"bullseye", // Debian/11
"buster", // Debian/10
"oracular" // Ubuntu/24.10 (STS)
"noble", // Ubuntu/24.04 (LTS)
"jammy", // Ubuntu/22.04 (LTS)
"focal", // Ubuntu/20.04 (LTS)
"bionic" // Ubuntu/18.04 (LTS)
"bionic" // Ubuntu/18.04 (LTS)
]
```

Expand All @@ -537,13 +540,13 @@ In addition to the previous changes, the automated test source code also needs u
linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java
```

This file requires that the <b>.contains("Version: 1.0.3-1")</b> line be updated to reflect the new version number added to the <i>changelog</i> above.
This file requires that the <b>.contains("Version: 1.0.4-1")</b> line be updated to reflect the new version number added to the <i>changelog</i> above.
```
result = runShell(container, "apt-cache show adoptium-ca-certificates");
assertThat(result.getExitCode()).isEqualTo(0);
assertThat(result.getStdout())
.contains("Package: adoptium-ca-certificates")
.contains("Version: 1.0.3-1")
.contains("Version: 1.0.4-1")
.contains("Priority: optional")
.contains("Architecture: all")
.contains("Status: install ok installed");
Expand Down
8 changes: 5 additions & 3 deletions linux/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,19 +523,21 @@ def uploadDebArtifacts(String buildArch, String Version) {
echo "Debian Architecture Upload List = ${debArchList}"

/*
Debian/Ubuntu 10.0 11.0 16.04 20.04 22.04 22.10 24.04
Debian 10.0 11.0 12.0
Ubuntu 18.04 20.04 22.04 24.04 24.10
add more into list when available for release
also update linux/{jdk,jre}/debian/main/packing/build.sh
*/
def deb_versions = [
"trixie", // Debian/13
"trixie", // Debian/13
"bookworm", // Debian/12
"bullseye", // Debian/11
"buster", // Debian/10
"oracular", // Ubuntu/24.10 (STS)
"noble", // Ubuntu/24.04 (LTS)
"jammy", // Ubuntu/22.04 (LTS)
"focal", // Ubuntu/20.04 (LTS)
"bionic" // Ubuntu/18.04 (LTS)
"bionic" // Ubuntu/18.04 (LTS)
]
def distro_list = ''
deb_versions.each { deb_version ->
Expand Down
2 changes: 2 additions & 0 deletions linux/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ Supported platform amd64, arm64, armhf, ppc64le, s390x (s390x is only available
| debian/12 (bookworm/testing) | x86_64 | |
| debian/11 (bullseye/stable) | x86_64 | |
| debian/10 (buster/oldstable) | x86_64 | |
| ubuntu/24.10 (oracular) | x86_64 | |
| ubuntu/24.04 (noble) | x86_64 | |
| ubuntu/22.04 (jammy) | x86_64 | |
| ubuntu/20.04 (focal) | x86_64 | |
| ubuntu/18.04 (bionic) | x86_64 | |
Expand Down
1 change: 1 addition & 0 deletions linux/ca-certificates/debian/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def deb_versions = [
"bookworm", // Debian/12
"bullseye", // Debian/11
"buster", // Debian/10
"oracular", // Ubuntu/24.10 (STS)
"noble", // Ubuntu/24.04 (LTS)
"jammy", // Ubuntu/22.04 (LTS)
"focal", // Ubuntu/20.04 (LTS)
Expand Down
6 changes: 6 additions & 0 deletions linux/ca-certificates/debian/src/main/packaging/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
adoptium-ca-certificates (1.0.4-1) STABLE; urgency=medium

* Add Ubuntu Oracular Oriole to the list of supported releases.

-- Eclipse Adoptium Package Maintainers <[email protected]> Thu, 16 December 2024 12:00:00 +0000

adoptium-ca-certificates (1.0.3-1) STABLE; urgency=medium

* Add Debian Trixie & Ubuntu Noble to the list of supported releases.
Expand Down
2 changes: 1 addition & 1 deletion ...rtificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void packageSuccessfullyInstalled(String distribution, String codename) {
assertThat(result.getExitCode()).isEqualTo(0);
assertThat(result.getStdout())
.contains("Package: adoptium-ca-certificates")
.contains("Version: 1.0.3-1")
.contains("Version: 1.0.4-1")
.contains("Priority: optional")
.contains("Architecture: all")
.contains("Status: install ok installed");
Expand Down
1 change: 1 addition & 0 deletions ...ates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class ChangesVerificationTest {
"bookworm", // Debian/12
"bullseye", // Debian/11
"buster", // Debian/10
"oracular", // Ubuntu/24.10 (STS)
"noble", // Ubuntu/24.04 (LTS)
"jammy", // Ubuntu/22.04 (LTS)
"focal", // Ubuntu/20.04 (LTS)
Expand Down
1 change: 1 addition & 0 deletions ...-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
Arguments.of(containerRegistry + "debian", "bookworm"), // Debian/12 (testing)
Arguments.of(containerRegistry + "debian", "bullseye"), // Debian/11 (stable)
Arguments.of(containerRegistry + "debian", "buster"), // Debian/10 (oldstable)
Arguments.of(containerRegistry + "ubuntu", "oracular"), // Ubuntu/24.10 (STS)
Arguments.of(containerRegistry + "ubuntu", "noble"), // Ubuntu/24.04 (LTS)
Arguments.of(containerRegistry + "ubuntu", "jammy"), // Ubuntu/22.04 (LTS)
Arguments.of(containerRegistry + "ubuntu", "focal"), // Ubuntu/20.04 (LTS)
Expand Down
2 changes: 1 addition & 1 deletion linux/jdk/debian/src/main/packaging/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if [ "$buildLocalFlag" == "true" ]; then
fi

# $ and $ARCH are env variables passing in from "docker run"
debVersionList="trixie bookworm bullseye buster noble jammy focal bionic"
debVersionList="trixie bookworm bullseye buster oracular noble jammy focal bionic"

# the target package is only based on the host machine's ARCH
# ${buildArch} is only used for debug purpose what really matter is the label on the jenkins agent
Expand Down
1 change: 1 addition & 0 deletions linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
Arguments.of(containerRegistry + "debian", "bookworm"), // Debian/12 (testing)
Arguments.of(containerRegistry + "debian", "bullseye"), // Debian/11 (stable)
Arguments.of(containerRegistry + "debian", "buster"), // Debian/10 (oldstable)
Arguments.of(containerRegistry + "ubuntu", "oracular"), // Ubuntu/24.10 (STS)
Arguments.of(containerRegistry + "ubuntu", "noble"), // Ubuntu/24.04 (LTS)
Arguments.of(containerRegistry + "ubuntu", "jammy"), // Ubuntu/22.04 (LTS)
Arguments.of(containerRegistry + "ubuntu", "focal"), // Ubuntu/20.04 (LTS)
Expand Down
2 changes: 1 addition & 1 deletion linux/jre/debian/src/main/packaging/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if [ "$buildLocalFlag" == "true" ]; then
fi

# $ and $ARCH are env variables passing in from "docker run"
debVersionList="trixie bookworm bullseye buster noble jammy focal bionic"
debVersionList="trixie bookworm bullseye buster oracular noble jammy focal bionic"

# the target package is only based on the host machine's ARCH
# ${buildArch} is only used for debug purpose what really matter is the label on the jenkins agent
Expand Down
1 change: 1 addition & 0 deletions linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
Arguments.of(containerRegistry + "debian", "bookworm"), // Debian/12 (testing)
Arguments.of(containerRegistry + "debian", "bullseye"), // Debian/11 (stable)
Arguments.of(containerRegistry + "debian", "buster"), // Debian/10 (oldstable)
Arguments.of(containerRegistry + "ubuntu", "oracular"), // Ubuntu/24.10 (STS)
Arguments.of(containerRegistry + "ubuntu", "noble"), // Ubuntu/24.04 (LTS)
Arguments.of(containerRegistry + "ubuntu", "jammy"), // Ubuntu/22.04 (LTS)
Arguments.of(containerRegistry + "ubuntu", "focal"), // Ubuntu/20.04 (LTS)
Expand Down
Loading