So, for now (until https://github.com/fedora-infra/bodhi/pull/1986 gets finished and merged), it might happen that Bodhi stages a repo a second time (if it crashed while waiting for sync), which new-updates-sync doesn't notice, meaning releng needs to manually clean up the state file.
This patch should make new-updates-sync detect this case and force a resync.
Can I get +1s?
diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync
index fba2a3d27..df59cd421 100755
@@ -328,6 +328,28 @@ def sync_single_release(release):
with open(curstatefile, 'r') as f:
curstate = f.read().split()
+ # Resync if Bodhi failed out during the sync waiting, which leads
+ # to changed repomd.xml without an updated repo.
+ # (updateinfo is inserted again)
+ # Fix: https://github.com/fedora-infra/bodhi/pull/1986
+ if curstate and curstate == target:
+ curstatestat = os.stat(curstatefile)
+ repostat = os.stat(os.path.join(
+ target, 'compose', 'Everything',
+ 'os', 'repodata', 'repomd.xml'))
+ if curstatestat[stat.ST_MTIME] < repostat[stat.ST_MTIME]:
+ # If the curstate file has an earlier mtime than the repomd
+ # of the first architecture, this repo was re-generated
+ # after the first time it got staged. Resync.
+ 'Re-stage detected of %s %s. '
+ 'State mtime: %s, repo mtime: %s',
+ release, repo,
+ curstate = None
if curstate and curstate == target:
logger.info('This repo has already been synced')
It was noted recently that our current meeting time (thursdays at 18UTC)
is a bit late/poorly timed for several of our European colleagues.
Additionally, we sometimes have the go/no-go meeting at the same time
which can be inconvenient.
What would everyone think of moving the meeting to 16UTC?
Or is there a better time for anyone?
This weeks meeting we will keep the same, but we can discuss and see if
we want to move it starting next week.
Now that we got a gold compose, we would like to change bodhi configs to reflect F28 GA changes.
There are some duplicates which doesn't make sense and hence removing them.
diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index f53e3aa..f146d3f 100644
@@ -520,22 +520,15 @@ fedora_modular.mandatory_days_in_testing = 7
# critpath number of admin approvals, and the critpath minimum karma. For example, if we want to set
# Fedora 28 as a pre-beta, and we want it to have different rules in pre-beta and post-beta, we
# could do something like this:
-#f28.status = post_beta
-#f28.post_beta.mandatory_days_in_testing = 7
-#f28.post_beta.critpath.num_admin_approvals = 0
-#f28.post_beta.critpath.min_karma = 2
-#f28.post_beta.critpath.stable_after_days_without_negative_karma = 14
-#f28.pre_beta.mandatory_days_in_testing = 3
-#f28.pre_beta.critpath.num_admin_approvals = 0
-#f28.pre_beta.critpath.min_karma = 1
-f28.status = pre_beta
-f28.pre_beta.mandatory_days_in_testing = 3
-f28.pre_beta.critpath.num_admin_approvals = 0
-f28.pre_beta.critpath.min_karma = 1
+f28.status = post_beta
f28.post_beta.mandatory_days_in_testing = 7
-f28.post_beta.critpath.num_admin_approvals = 0
+f28.post_beta.critpath.num_admin_approvals = 1
f28.post_beta.critpath.min_karma = 2
f28.post_beta.critpath.stable_after_days_without_negative_karma = 14
+#f28.status = pre_beta
+#f28.pre_beta.mandatory_days_in_testing = 3
+#f28.pre_beta.critpath.num_admin_approvals = 0
+#f28.pre_beta.critpath.min_karma = 1