PR#10221: F35 Mass Rebuild changes - releng

releng

#10221 F35 Mass Rebuild changes

Merged 2 years ago by humaton. Opened 2 years ago by humaton.

humaton/releng F35_mass_rebuild into main

Change fedpkg to git command

Tomas Hrcka • 2 years ago

11160f7

F35 Mass Rebuild

Tomas Hrcka • 2 years ago

21b474f

scripts/find_failures.py

file modified

+3 -3

		`@@ -24,9 +24,9 @@`

		`# Set some variables`
		`# Some of these could arguably be passed in as args.`
		`- buildtag = 'f34-rebuild' # tag to check`
		`- desttag = 'f34' # Tag where fixed builds go`
		`- epoch = '2021-01-25 21:00:00.000000' # Date to check for failures from`
		`+ buildtag = 'f35-rebuild' # tag to check`
		`+ desttag = 'f35' # Tag where fixed builds go`
		`+ epoch = '2021-07-21 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'`

scripts/mass-rebuild.py

file modified

+9 -2

		`@@ -22,7 +22,7 @@`

		`# Set some variables`
		`# Some of these could arguably be passed in as args.`
		`- rebuildid = 'f34'`
		`+ rebuildid = 'f35'`
		`massrebuild = MASSREBUILDS[rebuildid]`
		`user = 'Fedora Release Engineering <releng@fedoraproject.org>'`
		`comment = '- Rebuilt for ' + massrebuild['wikipage']`
		`@@ -177,11 +177,18 @@`
		`continue`

		`# git commit`
		`- commit = ['fedpkg', 'commit', '-s', '-p', '-m', comment]`
		`+ commit = ['git', 'commit', '-s', '-m', comment, '--allow-empty']`
		`print('Committing changes for %s' % name)`
		`if runme(commit, 'commit', name, enviro,`
		`cwd=os.path.join(workdir, name)):`
		`continue`
		`+ # git push`
		`+ push = ['git', 'push']`
		`+ print('Pushing changes for %s' % name)`
		`+ if runme(push, 'push', name, enviro,`
		`+ cwd=os.path.join(workdir, name)):`
		`+ continue`
		`+`

		`# get git url`
		`urlcmd = ['fedpkg', 'giturl']`

scripts/massrebuildsinfo.py

file modified

+21

		`@@ -18,14 +18,35 @@`
		`'shim-signed',`
		`'shim-unsigned-aarch64',`
		`'shim-unsigned-x64',`
		`+ 'ghc', #remove after mass rebuild`
		`]`


		`# keep this sorted new -> old`
		`MASSREBUILDS = {`
		`+ #f36 ftbfs bug tracker: TBA`
		`"f35":`
		`{`
		`+ "buildtag": 'f35-rebuild', # tag to build from`
		`+ "epoch": '2021-07-21 10:00:00.000000', # rebuild anything not built after this date`
		`+ "module_mass_rebuild_epoch": '2021-07-21T10:00:00Z',`
		`+ # rebuild anything not built after this date for modules`
		`+ "module_mass_branching_epoch": '2022-08-10T22:30:00Z',`
		`+ # rebuild anything not built after this date for modules`
		`+ "module_mass_rebuild_platform": "f35",`
		`+ # rebuild all modules that has build time dependency on this platform, this is used during mass rebuild time`
		`+ "module_mass_branching_platform": "f36",`
		`+ # rebuild all modules that has run time dependency on this platform, this is used during mass branching time`
		`+ "targets": ['f35-candidate', 'rawhide', 'f35'],`
		`+ # build targets to check for existing builds to skip rebuild`
		`+ "target": 'f35-rebuild', # target to build into`
		`+ "desttag": 'f35', # 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": "35", # for next version calculation and other comments`
		`"tracking_bug": "1927309", # Tracking bug for mass build failures`
		`+ "wikipage": "https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild",`
		`+ "pkg_skip_list": PKG_SKIP_LIST, # packages to skip in rebuild`
		`},`
		`"f34":`
		`{`

scripts/need-rebuild.py

file modified

+4 -4

		`@@ -19,11 +19,11 @@`

		`# Set some variables`
		`# Some of these could arguably be passed in as args.`
		`- buildtag = 'f34-rebuild' # tag(s) to check`
		`- target = 'f34'`
		`- updates = 'f34-candidate'`
		`+ buildtag = 'f35-rebuild' # tag(s) to check`
		`+ target = 'f35'`
		`+ updates = 'f35-candidate'`
		`rawhide = 'rawhide' # Change to dist-f13 after we branch`
		`- epoch = '2021-01-25 21:00:00.000000' # rebuild anything not built after this date`
		`+ epoch = '2021-07-21 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 = {}`