Skip to content

Commit 5f951b3

Browse files
Add Ubuntu 24.10 Oracular Oriole (#1075)
Co-authored-by: Scott Fryer <[email protected]>
1 parent a56ac00 commit 5f951b3

File tree

13 files changed

+32
-14
lines changed

13 files changed

+32
-14
lines changed

.github/workflows/cacert-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- name: Upload deb file to Artifactory
7272
if: steps.check-deb.outputs.file_exists == 'false'
7373
run: |
74-
DISTRO_LIST="trixie,bookworm,buster,noble,jammy,focal,bionic"
74+
DISTRO_LIST="trixie,bookworm,buster,oracular,noble,jammy,focal,bionic"
7575
FILE=$(ls ca-certificates/debian/build/ospackage/*.deb)
7676
# Upload cacerts deb file
7777
jf rt u "$FILE" "deb/pool/main/a/adoptium-ca-certificates/$(basename ${FILE})" --flat=true

docs/Guide_To_The_Linux_Installers.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Supported Linux Distros:
4545
Distribution Type| Supported Versions
4646
----------|---------
4747
Apk (Alpine)| All supported version.
48-
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)
48+
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)
4949
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
5050
RPM(SUSE) | Opensuse 15.3</br>Opensuse 15.4</br>Opensuse 15.5</br>SLES 12</br>SLES15
5151

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

448449
```
449-
debVersionList="trixie bookworm bullseye buster noble jammy focal bionic"
450+
debVersionList="trixie bookworm bullseye buster oracular noble jammy focal bionic"
450451
```
451452

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

504506
```
505507
def deb_versions = [
506-
"trixie", // Debian/13
508+
"trixie", // Debian/13
507509
"bookworm", // Debian/12
508510
"bullseye", // Debian/11
509511
"buster", // Debian/10
512+
"oracular" // Ubuntu/24.10 (STS)
510513
"noble", // Ubuntu/24.04 (LTS)
511514
"jammy", // Ubuntu/22.04 (LTS)
512515
"focal", // Ubuntu/20.04 (LTS)
513-
"bionic" // Ubuntu/18.04 (LTS)
516+
"bionic" // Ubuntu/18.04 (LTS)
514517
]
515518
```
516519

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

540-
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.
543+
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.
541544
```
542545
result = runShell(container, "apt-cache show adoptium-ca-certificates");
543546
assertThat(result.getExitCode()).isEqualTo(0);
544547
assertThat(result.getStdout())
545548
.contains("Package: adoptium-ca-certificates")
546-
.contains("Version: 1.0.3-1")
549+
.contains("Version: 1.0.4-1")
547550
.contains("Priority: optional")
548551
.contains("Architecture: all")
549552
.contains("Status: install ok installed");

linux/Jenkinsfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -523,19 +523,21 @@ def uploadDebArtifacts(String buildArch, String Version) {
523523
echo "Debian Architecture Upload List = ${debArchList}"
524524

525525
/*
526-
Debian/Ubuntu 10.0 11.0 16.04 20.04 22.04 22.10 24.04
526+
Debian 10.0 11.0 12.0
527+
Ubuntu 18.04 20.04 22.04 24.04 24.10
527528
add more into list when available for release
528529
also update linux/{jdk,jre}/debian/main/packing/build.sh
529530
*/
530531
def deb_versions = [
531-
"trixie", // Debian/13
532+
"trixie", // Debian/13
532533
"bookworm", // Debian/12
533534
"bullseye", // Debian/11
534535
"buster", // Debian/10
536+
"oracular", // Ubuntu/24.10 (STS)
535537
"noble", // Ubuntu/24.04 (LTS)
536538
"jammy", // Ubuntu/22.04 (LTS)
537539
"focal", // Ubuntu/20.04 (LTS)
538-
"bionic" // Ubuntu/18.04 (LTS)
540+
"bionic" // Ubuntu/18.04 (LTS)
539541
]
540542
def distro_list = ''
541543
deb_versions.each { deb_version ->

linux/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ Supported platform amd64, arm64, armhf, ppc64le, s390x (s390x is only available
202202
| debian/12 (bookworm/testing) | x86_64 | |
203203
| debian/11 (bullseye/stable) | x86_64 | |
204204
| debian/10 (buster/oldstable) | x86_64 | |
205+
| ubuntu/24.10 (oracular) | x86_64 | |
206+
| ubuntu/24.04 (noble) | x86_64 | |
205207
| ubuntu/22.04 (jammy) | x86_64 | |
206208
| ubuntu/20.04 (focal) | x86_64 | |
207209
| ubuntu/18.04 (bionic) | x86_64 | |

linux/ca-certificates/debian/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ def deb_versions = [
2929
"bookworm", // Debian/12
3030
"bullseye", // Debian/11
3131
"buster", // Debian/10
32+
"oracular", // Ubuntu/24.10 (STS)
3233
"noble", // Ubuntu/24.04 (LTS)
3334
"jammy", // Ubuntu/22.04 (LTS)
3435
"focal", // Ubuntu/20.04 (LTS)

linux/ca-certificates/debian/src/main/packaging/debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
adoptium-ca-certificates (1.0.4-1) STABLE; urgency=medium
2+
3+
* Add Ubuntu Oracular Oriole to the list of supported releases.
4+
5+
-- Eclipse Adoptium Package Maintainers <[email protected]> Thu, 16 December 2024 12:00:00 +0000
6+
17
adoptium-ca-certificates (1.0.3-1) STABLE; urgency=medium
28

39
* Add Debian Trixie & Ubuntu Noble to the list of supported releases.

linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void packageSuccessfullyInstalled(String distribution, String codename) {
6060
assertThat(result.getExitCode()).isEqualTo(0);
6161
assertThat(result.getStdout())
6262
.contains("Package: adoptium-ca-certificates")
63-
.contains("Version: 1.0.3-1")
63+
.contains("Version: 1.0.4-1")
6464
.contains("Priority: optional")
6565
.contains("Architecture: all")
6666
.contains("Status: install ok installed");

linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class ChangesVerificationTest {
3636
"bookworm", // Debian/12
3737
"bullseye", // Debian/11
3838
"buster", // Debian/10
39+
"oracular", // Ubuntu/24.10 (STS)
3940
"noble", // Ubuntu/24.04 (LTS)
4041
"jammy", // Ubuntu/22.04 (LTS)
4142
"focal", // Ubuntu/20.04 (LTS)

linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
4949
Arguments.of(containerRegistry + "debian", "bookworm"), // Debian/12 (testing)
5050
Arguments.of(containerRegistry + "debian", "bullseye"), // Debian/11 (stable)
5151
Arguments.of(containerRegistry + "debian", "buster"), // Debian/10 (oldstable)
52+
Arguments.of(containerRegistry + "ubuntu", "oracular"), // Ubuntu/24.10 (STS)
5253
Arguments.of(containerRegistry + "ubuntu", "noble"), // Ubuntu/24.04 (LTS)
5354
Arguments.of(containerRegistry + "ubuntu", "jammy"), // Ubuntu/22.04 (LTS)
5455
Arguments.of(containerRegistry + "ubuntu", "focal"), // Ubuntu/20.04 (LTS)

linux/jdk/debian/src/main/packaging/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if [ "$buildLocalFlag" == "true" ]; then
2727
fi
2828

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

3232
# the target package is only based on the host machine's ARCH
3333
# ${buildArch} is only used for debug purpose what really matter is the label on the jenkins agent

0 commit comments

Comments
 (0)