From 83d5d9efb3f1f7980c7937a62071fe1c144642bb Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Jul 27 2020 06:02:07 +0000
Subject: Setup for F33 rebuild


Signed-off-by: Tomas Hrcka <thrcka@redhat.com>

---

diff --git a/scripts/find_failures.py b/scripts/find_failures.py
index 084af77..f04daab 100755
--- a/scripts/find_failures.py
+++ b/scripts/find_failures.py
@@ -24,9 +24,9 @@ from requests.packages.urllib3.util.retry import Retry
 
 # Set some variables
 # Some of these could arguably be passed in as args.
-buildtag = 'f32-rebuild' # tag to check
-desttag = 'f32' # Tag where fixed builds go
-epoch = '2020-01-28 03:30:00.000000' # Date to check for failures from
+buildtag = 'f33-rebuild' # tag to check
+desttag = 'f33' # Tag where fixed builds go
+epoch = '2020-07-27 10:00:00.000000' # Date to check for failures from
 failures = {} # dict of owners to lists of packages that failed.
 failed = [] # raw list of failed packages
 ownerdataurl = 'https://src.fedoraproject.org/extras/pagure_owner_alias.json'
diff --git a/scripts/mass-rebuild.py b/scripts/mass-rebuild.py
index 0cb222c..7b698aa 100755
--- a/scripts/mass-rebuild.py
+++ b/scripts/mass-rebuild.py
@@ -22,7 +22,7 @@ from massrebuildsinfo import MASSREBUILDS
 
 # Set some variables
 # Some of these could arguably be passed in as args.
-rebuildid = 'f32'
+rebuildid = 'f33'
 massrebuild = MASSREBUILDS[rebuildid]
 user = 'Fedora Release Engineering <releng@fedoraproject.org>'
 comment = '- Rebuilt for ' + massrebuild['wikipage']
diff --git a/scripts/massrebuildsinfo.py b/scripts/massrebuildsinfo.py
index 7b6f729..4ba53ed 100644
--- a/scripts/massrebuildsinfo.py
+++ b/scripts/massrebuildsinfo.py
@@ -23,7 +23,30 @@ PKG_SKIP_LIST = [
 
 # keep this sorted new -> old
 MASSREBUILDS = {
-    #f33 ftbfs bug tracker: 1803234
+    #f34 ftbfs bug tracker: TBA
+    "f33":
+        {
+            "buildtag": 'f33-rebuild',  # tag to build from
+            "epoch": '2020-07-27 10:00:00.000000',  # rebuild anything not built after this date
+            "module_mass_rebuild_epoch": '2020-07-27T03:30:00Z',
+            # rebuild anything not built after this date for modules
+            "module_mass_branching_epoch": '2020-02-11T23:30:00Z',
+            # rebuild anything not built after this date for modules
+            "module_mass_rebuild_platform": "f33",
+            # rebuild all modules that has build time dependency on this platform, this is used during mass rebuild time
+            "module_mass_branching_platform": "f34",
+            # rebuild all modules that has run time dependency on this platform, this is used during mass branching time
+            "targets": ['f33-candidate', 'rawhide', 'f33'],
+            # build targets to check for existing builds to skip rebuild
+            "target": 'f33-rebuild',  # target to build into
+            "desttag": 'f33',  # Tag where fixed builds go
+            "product": "Fedora",  # for BZ product field
+            "version": "rawhide",  # for BZ version field, rawhide before branching or xx after branching
+            "rawhide_version": "33",  # for next version calculation and other comments
+            "tracking_bug": "1803234",  # Tracking bug for mass build failures
+            "wikipage": "https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild",
+            "pkg_skip_list": PKG_SKIP_LIST,  # packages to skip in rebuild
+        },
     "f32":
     {
         "buildtag": 'f32-rebuild',  # tag to build from
diff --git a/scripts/need-rebuild.py b/scripts/need-rebuild.py
index e943d78..58d530b 100755
--- a/scripts/need-rebuild.py
+++ b/scripts/need-rebuild.py
@@ -19,11 +19,11 @@ import sys
 
 # Set some variables
 # Some of these could arguably be passed in as args.
-buildtag = 'f32-rebuild' # tag(s) to check
-target = 'f32'
-updates = 'f32-candidate'
+buildtag = 'f33-rebuild' # tag(s) to check
+target = 'f33'
+updates = 'f33-candidate'
 rawhide = 'rawhide' # Change to dist-f13 after we branch
-epoch = '2020-01-28 03:30:00.000000' # rebuild anything not built after this date
+epoch = '2020-07-27 10:00:00.000000' # rebuild anything not built after this date
 tobuild = {} # dict of owners to lists of packages needing to be built
 unbuilt = [] # raw list of unbuilt packages
 newbuilds = {}