Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove support for Fedora 38 #728

Merged
merged 4 commits into from
Jun 5, 2024
Merged

Remove support for Fedora 38 #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3a5a71
test/data/repositories: rm fedora-38.json
achilleas-k Jun 4, 2024
52b6df5
gitlab: remove Fedora 38 build configs
achilleas-k Jun 4, 2024
55ca7f8
test: remove Fedora 38 from config-map
achilleas-k Jun 4, 2024
ab223d3
distro: remove Fedora 38 conditions from image definitions
achilleas-k Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 0 additions & 164 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,44 +181,6 @@ generate-build-config-centos-9-x86_64:
- .cache/osbuild-images


generate-build-config-fedora-38-aarch64:
stage: gen
extends: .terraform
variables:
RUNNER: aws/fedora-39-aarch64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-build-config --distro fedora-38 --arch aarch64 build-config.yml
artifacts:
paths:
- build-config.yml
cache:
key: testcache
paths:
- .cache/osbuild-images


generate-build-config-fedora-38-x86_64:
stage: gen
extends: .terraform
variables:
RUNNER: aws/fedora-39-x86_64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-build-config --distro fedora-38 --arch x86_64 build-config.yml
artifacts:
paths:
- build-config.yml
cache:
key: testcache
paths:
- .cache/osbuild-images


generate-build-config-fedora-39-aarch64:
stage: gen
extends: .terraform
Expand Down Expand Up @@ -873,28 +835,6 @@ image-build-trigger-centos-9-x86_64:
- generate-build-config-centos-9-x86_64


image-build-trigger-fedora-38-aarch64:
stage: build
trigger:
include:
- artifact: build-config.yml
job: generate-build-config-fedora-38-aarch64
strategy: depend
needs:
- generate-build-config-fedora-38-aarch64


image-build-trigger-fedora-38-x86_64:
stage: build
trigger:
include:
- artifact: build-config.yml
job: generate-build-config-fedora-38-x86_64
strategy: depend
needs:
- generate-build-config-fedora-38-x86_64


image-build-trigger-fedora-39-aarch64:
stage: build
trigger:
Expand Down Expand Up @@ -1367,50 +1307,6 @@ generate-ostree-build-config-centos-9-x86_64:
- .cache/osbuild-images


generate-ostree-build-config-fedora-38-aarch64:
stage: ostree-gen
extends: .terraform
variables:
RUNNER: aws/fedora-39-aarch64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-ostree-build-config --distro fedora-38 --arch aarch64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- image-build-trigger-fedora-38-aarch64
cache:
key: testcache
paths:
- .cache/osbuild-images


generate-ostree-build-config-fedora-38-x86_64:
stage: ostree-gen
extends: .terraform
variables:
RUNNER: aws/fedora-39-x86_64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-ostree-build-config --distro fedora-38 --arch x86_64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- image-build-trigger-fedora-38-x86_64
cache:
key: testcache
paths:
- .cache/osbuild-images


generate-ostree-build-config-fedora-39-aarch64:
stage: ostree-gen
extends: .terraform
Expand Down Expand Up @@ -2158,28 +2054,6 @@ image-build-ostree-trigger-centos-9-x86_64:
- generate-ostree-build-config-centos-9-x86_64


image-build-ostree-trigger-fedora-38-aarch64:
stage: ostree-build
trigger:
include:
- artifact: build-config.yml
job: generate-ostree-build-config-fedora-38-aarch64
strategy: depend
needs:
- generate-ostree-build-config-fedora-38-aarch64


image-build-ostree-trigger-fedora-38-x86_64:
stage: ostree-build
trigger:
include:
- artifact: build-config.yml
job: generate-ostree-build-config-fedora-38-x86_64
strategy: depend
needs:
- generate-ostree-build-config-fedora-38-x86_64


image-build-ostree-trigger-fedora-39-aarch64:
stage: ostree-build
trigger:
Expand Down Expand Up @@ -2615,44 +2489,6 @@ generate-manifests-centos-9-s390x:
done


generate-manifests-fedora-38-ppc64le:
stage: gen
extends: .terraform
variables:
RUNNER: aws/fedora-39-x86_64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- go run ./cmd/gen-manifests --arches ppc64le --distros fedora-38 --workers 10 --metadata=false --output ./manifests
- for manifest in ./manifests/*; do
if osbuild --inspect $manifest > output; then
echo "$manifest OK";
else
cat output;
fi;
done


generate-manifests-fedora-38-s390x:
stage: gen
extends: .terraform
variables:
RUNNER: aws/fedora-39-x86_64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- go run ./cmd/gen-manifests --arches s390x --distros fedora-38 --workers 10 --metadata=false --output ./manifests
- for manifest in ./manifests/*; do
if osbuild --inspect $manifest > output; then
echo "$manifest OK";
else
cat output;
fi;
done


generate-manifests-fedora-39-ppc64le:
stage: gen
extends: .terraform
Expand Down
98 changes: 47 additions & 51 deletions pkg/distro/fedora/distro.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,6 @@ func newDistro(version int) distro.Distro {
minimalrawImgType,
)

// iot simplified installer was introduced in F38
x86_64.addImageTypes(
&platform.X86{
BasePlatform: platform.BasePlatform{
Expand Down Expand Up @@ -921,62 +920,59 @@ func newDistro(version int) distro.Distro {
iotSimplifiedInstallerImgType,
)

if common.VersionGreaterThanOrEqual(rd.Releasever(), "39") {
// bootc was introduced in F39
x86_64.addImageTypes(
&platform.X86{
BasePlatform: platform.BasePlatform{
FirmwarePackages: []string{
"biosdevname",
"iwlwifi-dvm-firmware",
"iwlwifi-mvm-firmware",
"microcode_ctl",
},
x86_64.addImageTypes(
&platform.X86{
BasePlatform: platform.BasePlatform{
FirmwarePackages: []string{
"biosdevname",
"iwlwifi-dvm-firmware",
"iwlwifi-mvm-firmware",
"microcode_ctl",
},
BIOS: true,
UEFIVendor: "fedora",
},
iotBootableContainer,
)
aarch64.addImageTypes(
&platform.Aarch64{
BasePlatform: platform.BasePlatform{
FirmwarePackages: []string{
"arm-image-installer",
"bcm283x-firmware",
"brcmfmac-firmware",
"iwlwifi-mvm-firmware",
"realtek-firmware",
"uboot-images-armv8",
},
BIOS: true,
UEFIVendor: "fedora",
},
iotBootableContainer,
)
aarch64.addImageTypes(
&platform.Aarch64{
BasePlatform: platform.BasePlatform{
FirmwarePackages: []string{
"arm-image-installer",
"bcm283x-firmware",
"brcmfmac-firmware",
"iwlwifi-mvm-firmware",
"realtek-firmware",
"uboot-images-armv8",
},
UEFIVendor: "fedora",
},
iotBootableContainer,
)

ppc64le.addImageTypes(
&platform.PPC64LE{
BIOS: true,
BasePlatform: platform.BasePlatform{
ImageFormat: platform.FORMAT_QCOW2,
QCOW2Compat: "1.1",
},
UEFIVendor: "fedora",
},
iotBootableContainer,
)

ppc64le.addImageTypes(
&platform.PPC64LE{
BIOS: true,
BasePlatform: platform.BasePlatform{
ImageFormat: platform.FORMAT_QCOW2,
QCOW2Compat: "1.1",
},
iotBootableContainer,
)

s390x.addImageTypes(
&platform.S390X{
Zipl: true,
BasePlatform: platform.BasePlatform{
ImageFormat: platform.FORMAT_QCOW2,
QCOW2Compat: "1.1",
},
},
iotBootableContainer,
)

s390x.addImageTypes(
&platform.S390X{
Zipl: true,
BasePlatform: platform.BasePlatform{
ImageFormat: platform.FORMAT_QCOW2,
QCOW2Compat: "1.1",
},
iotBootableContainer,
)
}
},
iotBootableContainer,
)

ppc64le.addImageTypes(
&platform.PPC64LE{
Expand Down
4 changes: 0 additions & 4 deletions pkg/distro/fedora/distro_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ type fedoraFamilyDistro struct {
}

var fedoraFamilyDistros = []fedoraFamilyDistro{
{
name: "fedora-38",
distro: fedora.DistroFactory("fedora-38"),
},
{
name: "fedora-39",
distro: fedora.DistroFactory("fedora-39"),
Expand Down
19 changes: 2 additions & 17 deletions pkg/distro/fedora/package_sets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,14 +474,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
},
})

if common.VersionLessThan(t.arch.distro.osVersion, "39") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"lklug-fonts", // orphaned, unavailable in F39
},
})
}

switch t.Arch().Name() {
case arch.ARCH_X86_64.String():
ps = ps.Append(rpmmd.PackageSet{
Expand Down Expand Up @@ -627,14 +619,6 @@ func containerPackageSet(t *imageType) rpmmd.PackageSet {
},
}

if common.VersionLessThan(t.arch.distro.osVersion, "39") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"fedora-repos-modular",
},
})
}

return ps
}

Expand Down Expand Up @@ -705,7 +689,8 @@ func iotSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet {
"shadow-utils", // includes passwd
},
})
} else if common.VersionLessThan(t.arch.distro.osVersion, "40") {
} else {
// F39 only
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"passwd",
Expand Down
1 change: 0 additions & 1 deletion test/config-map.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"distros": [
"centos-8",
"centos-9",
"fedora-38",
"fedora-39",
"fedora-40",
"rhel-8.10",
Expand Down
Loading
Loading