diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39c51ce5f..9c53fba6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -252,8 +252,7 @@ OSTree simplified installer: - RUNNER: - openstack/rhel-8.6-nightly-x86_64-large - openstack/centos-stream-8-x86_64 - # NOTE: coreos-installer not yet available in RHEL 9.0 - # - openstack/rhel-9.0-nightly-x86_64 + - openstack/rhel-9.0-nightly-x86_64 OSTree raw image: stage: test diff --git a/internal/distro/rhel90/distro.go b/internal/distro/rhel90/distro.go index 5caec59e3..d1adde287 100644 --- a/internal/distro/rhel90/distro.go +++ b/internal/distro/rhel90/distro.go @@ -639,8 +639,7 @@ func newDistro(distroName string) distro.Distro { exports: []string{"bootiso"}, } - // edgeSimplifiedInstallerImgType := imageType{ - _ = imageType{ + edgeSimplifiedInstallerImgType := imageType{ name: "edge-simplified-installer", nameAliases: []string{"rhel-edge-simplified-installer"}, filename: "simplified-installer.iso", @@ -920,9 +919,8 @@ func newDistro(distroName string) distro.Distro { exports: []string{"bootiso"}, } - // NOTE: Edge simplified installer requires coreos-installer which isn't yet available in RHEL 9.0 - x86_64.addImageTypes(qcow2ImgType, vhdImgType, vmdkImgType, openstackImgType, amiImgTypeX86_64, tarImgType, tarInstallerImgTypeX86_64, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType) //, edgeSimplifiedInstallerImgType) - aarch64.addImageTypes(qcow2ImgType, openstackImgType, amiImgTypeAarch64, tarImgType, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType) // , edgeSimplifiedInstallerImgType) + x86_64.addImageTypes(qcow2ImgType, vhdImgType, vmdkImgType, openstackImgType, amiImgTypeX86_64, tarImgType, tarInstallerImgTypeX86_64, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType, edgeSimplifiedInstallerImgType) + aarch64.addImageTypes(qcow2ImgType, openstackImgType, amiImgTypeAarch64, tarImgType, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType, edgeSimplifiedInstallerImgType) ppc64le.addImageTypes(qcow2ImgType, tarImgType) s390x.addImageTypes(qcow2ImgType, tarImgType) diff --git a/internal/distro/rhel90/distro_test.go b/internal/distro/rhel90/distro_test.go index d81f8872b..d0bb73ae3 100644 --- a/internal/distro/rhel90/distro_test.go +++ b/internal/distro/rhel90/distro_test.go @@ -459,7 +459,7 @@ func TestArchitecture_ListImageTypes(t *testing.T) { "edge-container", "edge-installer", "edge-raw-image", - // "edge-simplified-installer", + "edge-simplified-installer", "tar", "image-installer", }, @@ -474,7 +474,7 @@ func TestArchitecture_ListImageTypes(t *testing.T) { "edge-commit", "edge-container", "edge-installer", - // "edge-simplified-installer", + "edge-simplified-installer", "edge-raw-image", "tar", },