From f870a77a258830ee1a84a004973f19d4f2197f16 Mon Sep 17 00:00:00 2001 From: Liora Milbaum Date: Tue, 28 May 2024 19:43:02 +0300 Subject: [PATCH] Only rawhide --- Containerfile | 3 +- fedora-bootc-config.json | 2 +- fedora-bootc-rawhide.yaml | 14 - fedora-bootc.yaml | 5 +- fedora-eln-bootc.yaml | 15 - fedora-eln.repo | 408 ------------------ fedora-tier-0-40.yaml | 15 - fedora-tier-0-eln.yaml | 11 - ...-tier-0-rawhide.yaml => fedora-tier-0.yaml | 0 9 files changed, 4 insertions(+), 469 deletions(-) delete mode 100644 fedora-bootc-rawhide.yaml delete mode 100644 fedora-eln-bootc.yaml delete mode 100644 fedora-eln.repo delete mode 100644 fedora-tier-0-40.yaml delete mode 100644 fedora-tier-0-eln.yaml rename fedora-tier-0-rawhide.yaml => fedora-tier-0.yaml (100%) diff --git a/Containerfile b/Containerfile index 8179432..87a31ed 100644 --- a/Containerfile +++ b/Containerfile @@ -23,8 +23,7 @@ # Because it's generating a base image and uses containerbuildcontextization features itself. # In the future some of this can be lifted. -# renovate: datasource=endoflife-date depName=fedora versioning=docker -FROM quay.io/fedora/fedora:40 as repos +FROM quay.io/fedora/fedora:rawhide as repos FROM quay.io/centos-bootc/bootc-image-builder:latest as builder ARG MANIFEST=fedora-bootc.yaml diff --git a/fedora-bootc-config.json b/fedora-bootc-config.json index 6437ea1..3a53fe1 100644 --- a/fedora-bootc-config.json +++ b/fedora-bootc-config.json @@ -3,7 +3,7 @@ "containers.bootc": "1", "bootc.diskimage-builder": "quay.io/centos-bootc/bootc-image-builder", "redhat.id": "fedora", - "redhat.version-id": "40" + "redhat.version-id": "rawhide" }, "StopSignal": "SIGRTMIN+3", "Env": [ diff --git a/fedora-bootc-rawhide.yaml b/fedora-bootc-rawhide.yaml deleted file mode 100644 index 9c91d95..0000000 --- a/fedora-bootc-rawhide.yaml +++ /dev/null @@ -1,14 +0,0 @@ -releasever: rawhide -variables: - distro: "fedora" - -repos: - - rawhide - -metadata: - name: fedora-boot-tier1 - summary: Fedora Bootable Tier 1 - -include: - - tier-1/manifest.yaml - - tier-1/kernel.yaml diff --git a/fedora-bootc.yaml b/fedora-bootc.yaml index bef362d..9c91d95 100644 --- a/fedora-bootc.yaml +++ b/fedora-bootc.yaml @@ -1,10 +1,9 @@ -releasever: 40 +releasever: rawhide variables: distro: "fedora" repos: - - fedora - - updates + - rawhide metadata: name: fedora-boot-tier1 diff --git a/fedora-eln-bootc.yaml b/fedora-eln-bootc.yaml deleted file mode 100644 index c3a89fa..0000000 --- a/fedora-eln-bootc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -releasever: 39 -variables: - distro: "eln" - -repos: - - eln-baseos - - eln-appstream - -metadata: - name: fedora-boot-tier1 - summary: Fedora Bootable Tier 1 - -include: - - tier-1/manifest.yaml - - tier-1/kernel.yaml diff --git a/fedora-eln.repo b/fedora-eln.repo deleted file mode 100644 index c2dcb6c..0000000 --- a/fedora-eln.repo +++ /dev/null @@ -1,408 +0,0 @@ -# These packages are untested and still under development. This -# repository is used for development of new releases. -# -# This repository can see significant daily turnover and major -# functionality changes which cause unexpected problems with other -# development packages. Please use these packages if you want to work -# with the Fedora developers by testing these new development packages. -# -# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription -# Required) is available as a discussion forum for -# testing and troubleshooting for development packages in conjunction -# with new test releases. -# -# More information is available at http://fedoraproject.org/wiki/Testing -# -# Reproducible and reportable issues should be filed at -# http://bugzilla.redhat.com/. -# -# Product: Fedora -# Version: eln - -[eln-baseos] -name=Fedora - ELN BaseOS - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/BaseOS/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=1 -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-baseos-debuginfo] -name=Fedora - ELN BaseOS - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/BaseOS/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-baseos-source] -name=Fedora - ELN BaseOS - Source -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/BaseOS/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - - - -[eln-appstream] -name=Fedora - ELN AppStream - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/AppStream/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=1 -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-appstream-debuginfo] -name=Fedora - ELN AppStream - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/AppStream/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-appstream-source] -name=Fedora - ELN AppStream - Source -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/AppStream/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - - - -[eln-crb] -name=Fedora - ELN CRB - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/CRB/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=1 -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-crb-debuginfo] -name=Fedora - ELN CRB - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/CRB/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-crb-source] -name=Fedora - ELN CRB - Source -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/CRB/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - - - -[eln-extras] -name=Fedora - ELN Extras - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/Extras/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=1 -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-extras-debuginfo] -name=Fedora - ELN Extras - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/Extras/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-extras-source] -name=Fedora - ELN Extras - Source -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/Extras/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - - - -[eln-ha] -name=Fedora - ELN HighAvailability - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/HighAvailability/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=0 -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-ha-debuginfo] -name=Fedora - ELN HighAvailability - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/HighAvailability/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-ha-source] -name=Fedora - ELN HighAvailability - Source -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/HighAvailability/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - - - -[eln-rs] -name=Fedora - ELN ResilientStorage - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/ResilientStorage/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=0 -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-rs-debuginfo] -name=Fedora - ELN ResilientStorage - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/ResilientStorage/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-rs-source] -name=Fedora - ELN ResilientStorage - Source -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/ResilientStorage/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - - - -[eln-rt] -name=Fedora - ELN RT - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/RT/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=0 -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-rt-debuginfo] -name=Fedora - ELN RT - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/RT/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-rt-source] -name=Fedora - ELN RT - Source -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/RT/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - - - -[eln-nfv] -name=Fedora - ELN NFV - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/NFV/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=0 -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-nfv-debuginfo] -name=Fedora - ELN NFV - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/NFV/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-nfv-source] -name=Fedora - ELN NFV - Source -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/NFV/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - - - -[eln-sap] -name=Fedora - ELN SAP - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/SAP/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=0 -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-sap-debuginfo] -name=Fedora - ELN SAP - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/SAP/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-sap-source] -name=Fedora - ELN SAP - Source -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/SAP/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - - - -[eln-saphana] -name=Fedora - ELN SAPHANA - Developmental packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/SAPHANA/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=0 -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-saphana-debuginfo] -name=Fedora - ELN SAPHANA - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/SAPHANA/$basearch/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False - -[eln-saphana-source] -name=Fedora - ELN SAPHANA - Source -baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/SAPHANA/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch -enabled=0 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary -skip_if_unavailable=False diff --git a/fedora-tier-0-40.yaml b/fedora-tier-0-40.yaml deleted file mode 100644 index 7840d56..0000000 --- a/fedora-tier-0-40.yaml +++ /dev/null @@ -1,15 +0,0 @@ -releasever: 40 -variables: - distro: "fedora" - -repos: - - fedora-devel - - fedora-updates - -metadata: - name: fedora-boot-tier0 - summary: Fedora Bootable Tier 0 - -include: - - tier-0/manifest.yaml - - tier-0/kernel.yaml diff --git a/fedora-tier-0-eln.yaml b/fedora-tier-0-eln.yaml deleted file mode 100644 index e51d49d..0000000 --- a/fedora-tier-0-eln.yaml +++ /dev/null @@ -1,11 +0,0 @@ -releasever: 39 -variables: - distro: "eln" - -repos: - - eln-baseos - - eln-appstream - -include: - - tier-0/manifest.yaml - - tier-0/kernel.yaml diff --git a/fedora-tier-0-rawhide.yaml b/fedora-tier-0.yaml similarity index 100% rename from fedora-tier-0-rawhide.yaml rename to fedora-tier-0.yaml