openstack/diskimage-builder
Code Issues Proposed changes

Merge "Replace OpenSUSE Leap 15.3 to OpenSUSE Leap 15.5"

Browse Source
This commit is contained in:
Zuul 2024-01-25 01:37:47 +00:00 committed by Gerrit Code Review
commit 9d03eeb558
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diskimage_builder/elements/bootloader/pkg-map
View File

@ -13,7 +13,8 @@
"dkms_package": "",
"extlinux": "syslinux",
"grub-pc": "grub2",
"grub-efi": "grub2"
"grub-efi": "grub2",
"grub-efi-amd64": "grub2-x86_64-efi"
},
"redhat": {
"extlinux": "syslinux-extlinux",

2
diskimage_builder/elements/opensuse/README.rst
View File

@ -14,7 +14,7 @@ Environment Variables
DIB_RELEASE
:Required: No
:Default: 15.3
:Default: 15.5
:Description: Set the desired openSUSE release.
DIB_CLOUD_IMAGES

4
diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash
View File

@ -1,10 +1,10 @@
export DISTRO_NAME=opensuse
export DIB_RELEASE=${DIB_RELEASE:-15.3}
export DIB_RELEASE=${DIB_RELEASE:-15.5}
export EFI_BOOT_DIR="EFI/opensuse"
export DIB_OPENSUSE_PATTERNS=patterns-openSUSE-base
export DIB_INIT_SYSTEM=systemd
case ${DIB_RELEASE} in
15.3) export OPENSUSE_REPO_DIR=openSUSE_Leap_${DIB_RELEASE} ;;
15.5) export OPENSUSE_REPO_DIR=openSUSE_Leap_${DIB_RELEASE} ;;
*) echo "Unsupported openSUSE release: ${DIB_RELEASE}"; exit 1 ;;
esac

2
diskimage_builder/elements/opensuse/package-installs.yaml
View File

@ -4,3 +4,5 @@ sudo:
kernel-devel:
# lsb-release is not included by default.
lsb-release:
# Compatibility for zypper element scripts using deprecated mkinitrd
dracut-mkinitrd-deprecated:

2
diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/README.rst
View File

@ -1 +1 @@
Verify we can build an openSUSE Leap 15.3 image.
Verify we can build an openSUSE Leap 15.5 image.

2
diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash
View File

@ -1 +1 @@
export DIB_RELEASE=15.3
export DIB_RELEASE=15.5

2
doc/source/user_guide/supported_distros.rst
View File

@ -104,7 +104,7 @@ versions:
* ``openeuler-minimal``: 22.03-LTS
* ``centos`` : (image-based build) 8-stream and 9-stream
* ``fedora`` : (image-based build) latest
* ``opensuse`` : 15.3
* ``opensuse`` : 15.5
* ``ubuntu`` : Bionic and Focal
For ARM64, we also run functional tests on