From a8eb58bc62ac0b8ceecacaa65c41a672ce042953 Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Mon, 8 Nov 2021 16:01:59 +0100 Subject: [PATCH] distro/rhel90: disable edge-simplified-installer image type Critical dependency is not available yet --- .gitlab-ci.yml | 3 ++- internal/distro/rhel90/distro.go | 8 +++++--- internal/distro/rhel90/distro_test.go | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0020dc845..7104cdbaf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -209,7 +209,8 @@ OSTree simplified installer: - RUNNER: - openstack/rhel-8.6-nightly-x86_64-large - openstack/centos-stream-8-x86_64 - - openstack/rhel-9.0-nightly-x86_64 + # NOTE: coreos-installer not yet available in RHEL 9.0 + # - 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 1491733fc..75e99dd6f 100644 --- a/internal/distro/rhel90/distro.go +++ b/internal/distro/rhel90/distro.go @@ -618,7 +618,8 @@ func newDistro(distroName string) distro.Distro { exports: []string{"bootiso"}, } - edgeSimplifiedInstallerImgType := imageType{ + // edgeSimplifiedInstallerImgType := imageType{ + _ = imageType{ name: "edge-simplified-installer", nameAliases: []string{"rhel-edge-simplified-installer"}, filename: "simplified-installer.iso", @@ -871,8 +872,9 @@ func newDistro(distroName string) distro.Distro { exports: []string{"bootiso"}, } - 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) + // 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) 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 d0bb73ae3..d81f8872b 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", },