From c12282cdaf5619403cbfee7c8f4528ba74fd9ec9 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Thu, 24 Sep 2020 11:07:21 -0400
Subject: [PATCH] manifest: switch to Fedora 33

This also includes updating the `fedora` repo URL to the development
location and enabling the `fedora-updates-testing` repo for now while
we are still in development. We also add back in the modular repos,
which were split out into a subpackage in Fedora 33.

Fixes https://github.com/coreos/fedora-coreos-tracker/issues/611
---
 fedora.repo                       | 4 ++--
 manifest.yaml                     | 3 ++-
 manifests/fedora-coreos-base.yaml | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fedora.repo b/fedora.repo
index 4a94919a7f..16a8cc282d 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -4,8 +4,8 @@
 [fedora]
 name=Fedora $releasever - $basearch
 failovermethod=priority
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
-        https://dl.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/
+baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/os/
+#       https://dl.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 enabled=1
 #metadata_expire=7d
diff --git a/manifest.yaml b/manifest.yaml
index 421f91f9ac..97033efa63 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -1,7 +1,7 @@
 ref: fedora/${basearch}/coreos/next-devel
 include: manifests/fedora-coreos.yaml
 
-releasever: "32"
+releasever: "33"
 
 rojig:
   license: MIT
@@ -14,6 +14,7 @@ repos:
   # still pinned
   - fedora
   - fedora-updates
+  - fedora-updates-testing
 
 # All Fedora CoreOS streams share the same pool for locked files.
 # This will be in fedora-coreos.yaml in the future so it can be more easily be
diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
index f61ff0bc42..5abf45864a 100644
--- a/manifests/fedora-coreos-base.yaml
+++ b/manifests/fedora-coreos-base.yaml
@@ -159,6 +159,9 @@ packages:
   - jq
   # nvme-cli for managing nvme disks
   - nvme-cli
+  # fedora-repos-modular was converted into its own subpackage in f33
+  # Continue to include it in case users want to use it.
+  - fedora-repos-modular
 
 # This thing is crying out to be pulled into systemd, but that hasn't happened
 # yet.  Also we may want to add to rpm-ostree something like arch negation;