particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/rhel90: disable edge-simplified-installer image type

Browse source 
Critical dependency is not available yet
This commit is contained in:
Achilleas Koutsou 2021-11-08 16:01:59 +01:00 • committed by Ondřej Budai
parent 9f4c5b08e3
commit a8eb58bc62
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci.yml
View file

@ -209,7 +209,8 @@ OSTree simplified installer:
- RUNNER: - RUNNER:
- openstack/rhel-8.6-nightly-x86_64-large - openstack/rhel-8.6-nightly-x86_64-large
- openstack/centos-stream-8-x86_64 - 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: OSTree raw image:
stage: test stage: test

8
internal/distro/rhel90/distro.go
View file

@ -618,7 +618,8 @@ func newDistro(distroName string) distro.Distro {
exports: []string{"bootiso"}, exports: []string{"bootiso"},
} }
edgeSimplifiedInstallerImgType := imageType{ // edgeSimplifiedInstallerImgType := imageType{
_ = imageType{
name: "edge-simplified-installer", name: "edge-simplified-installer",
nameAliases: []string{"rhel-edge-simplified-installer"}, nameAliases: []string{"rhel-edge-simplified-installer"},
filename: "simplified-installer.iso", filename: "simplified-installer.iso",
@ -871,8 +872,9 @@ func newDistro(distroName string) distro.Distro {
exports: []string{"bootiso"}, exports: []string{"bootiso"},
} }
x86_64.addImageTypes(qcow2ImgType, vhdImgType, vmdkImgType, openstackImgType, amiImgTypeX86_64, tarImgType, tarInstallerImgTypeX86_64, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType, edgeSimplifiedInstallerImgType) // NOTE: Edge simplified installer requires coreos-installer which isn't yet available in RHEL 9.0
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) ppc64le.addImageTypes(qcow2ImgType, tarImgType)
s390x.addImageTypes(qcow2ImgType, tarImgType) s390x.addImageTypes(qcow2ImgType, tarImgType)

4
internal/distro/rhel90/distro_test.go
View file

@ -459,7 +459,7 @@ func TestArchitecture_ListImageTypes(t *testing.T) {
"edge-container", "edge-container",
"edge-installer", "edge-installer",
"edge-raw-image", "edge-raw-image",
"edge-simplified-installer", // "edge-simplified-installer",
"tar", "tar",
"image-installer", "image-installer",
}, },
@ -474,7 +474,7 @@ func TestArchitecture_ListImageTypes(t *testing.T) {
"edge-commit", "edge-commit",
"edge-container", "edge-container",
"edge-installer", "edge-installer",
"edge-simplified-installer", // "edge-simplified-installer",
"edge-raw-image", "edge-raw-image",
"tar", "tar",
}, },