Skip to content

Commit 0817449

Browse files
authored
Merge pull request #1814 from pli01/feat/osc-ubuntu-2404
feat(outscale): add OS ubuntu-24.04
2 parents 98d6501 + 744ebf3 commit 0817449

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The table below shows the currently provided operating systems for each provider
3939
| Rocky Linux 9 |||||||||||| 💙 |||||||
4040
| Ubuntu 20.04 || 💙 |||||||||| 💙 |||||||
4141
| Ubuntu 22.04 || 💙 || 💙 |||||||| 💙 |||||||
42-
| Ubuntu 24.04 || 💙 || 💙 ||||||| | 💙 |||||||
42+
| Ubuntu 24.04 || 💙 || 💙 ||||||| | 💙 |||||||
4343
| Windows 2019 || 💙 |||||||||||||||||
4444
| Windows 2022 || 💙 |||||||||||||||||
4545
| Windows 2025 || 💙 |||||||||||||||||

docs/book/src/capi/providers/3dsoutscale.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ the different operating systems.
2727
| File | Description |
2828
|------|-------------|
2929
| `ubuntu-2004.json` | The settings for the Ubuntu 20.04 image |
30+
| `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
31+
| `ubuntu-2404.json` | The settings for the Ubuntu 24.04 image |
3032

3133
You must have your [Access Keys](https://docs.outscale.com/en/userguide/About-Access-Keys.html).
3234
You must have your [Account Id](https://docs.outscale.com/en/userguide/Getting-Information-About-Your-Account-and-Quotas.html).
33-
Please set the following enviroement variables before building image:
35+
Please set the following environment variables before building image:
3436
```
3537
OSC_SECRET_KEY: Outscale Secret Key
3638
OSC_REGION: Outscale Region

images/capi/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ DO_BUILD_NAMES ?= do-ubuntu-2004 do-ubuntu-2204 do-ubuntu-2404
388388

389389
OPENSTACK_BUILD_NAMES ?= openstack-ubuntu-2004 openstack-ubuntu-2204 openstack-ubuntu-2404 openstack-flatcar openstack-rockylinux-9
390390

391-
OSC_BUILD_NAMES ?= osc-ubuntu-2004 osc-ubuntu-2204
391+
OSC_BUILD_NAMES ?= osc-ubuntu-2004 osc-ubuntu-2204 osc-ubuntu-2404
392392

393393
QEMU_BUILD_NAMES ?= qemu-ubuntu-2004 qemu-ubuntu-2204 qemu-ubuntu-2204-cloudimg qemu-ubuntu-2404 qemu-ubuntu-2404-efi qemu-ubuntu-2204-efi qemu-centos-9 qemu-ubuntu-2004-efi qemu-rhel-8 qemu-rhel-9 qemu-rockylinux-8 qemu-rockylinux-8-cloudimg qemu-rockylinux-9 qemu-rockylinux-9-cloudimg qemu-flatcar
394394

@@ -876,6 +876,7 @@ build-oci-all: $(OCI_BUILD_TARGETS) ## Builds all OCI image
876876

877877
build-osc-ubuntu-2004: ## Builds Ubuntu 20.04 Outscale Snapshot
878878
build-osc-ubuntu-2204: ## Builds Ubuntu 22.04 Outscale Snapshot
879+
build-osc-ubuntu-2404: ## Builds Ubuntu 24.04 Outscale Snapshot
879880
build-osc-all: $(OSC_BUILD_TARGETS) ## Builds all Outscale Snapshot
880881

881882
build-nutanix-ubuntu-2004: ## Builds the Nutanix ubuntu-2004 image
@@ -1043,7 +1044,8 @@ validate-oci-windows-2022: ## Validates the OCI Windows 2022 image packer config
10431044
validate-oci-all: $(OCI_VALIDATE_TARGETS) ## Validates all OCI image packer config
10441045

10451046
validate-osc-ubuntu-2004: ## Validates Ubuntu 20.04 Outscale Snapshot Packer config
1046-
validate-osc-ubuntu-2204: ## Validates Ubuntu 20.04 Outscale Snapshot Packer config
1047+
validate-osc-ubuntu-2204: ## Validates Ubuntu 22.04 Outscale Snapshot Packer config
1048+
validate-osc-ubuntu-2404: ## Validates Ubuntu 24.04 Outscale Snapshot Packer config
10471049
validate-osc-all: $(OSC_VALIDATE_TARGETS) ## Validates all Outscale Snapshot Packer config
10481050

10491051
validate-powervs-centos-8: ## Validates the PowerVS CentOS 8 image packer config
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"build_name": "ubuntu-2404",
3+
"distribution": "ubuntu",
4+
"distribution_release": "ubuntu",
5+
"distribution_version": "2404",
6+
"image_name": "Ubuntu-24.04-2025-07-07"
7+
}

0 commit comments

Comments
 (0)