2016626 - merge fx-main into infra-testing

Status: RESOLVED FIXED

(Conduit :: Lando, defect)

Description

[Olivier Mehani [:shtrom]]

infra-testing/autoland and /main are multiple thousands commits behing fx-main.

We need to merge + bump to have a fresher base to work on.

1. pull mozilla-firefox/firefox@main into infra-testing branch fx-main (long-lived, not synced to anything)

cd infra-testing; git checkout fx-main; git pull https://github.com/mozilla-firefox/firefox main; git push

2. use lando-cli to merge fx-main into autoland

cd infra-testing; git checkout autoland; git pull; git merge fx-main
lando push-merge --lando-repo infra-testing-autoland

2.1 if there are conflicts, don't resolve them, and abort the merge. Instead, fetch the conflicted files from fx-main and apply them ahead of time

git checkout fx-main <CONFLICTED-FILE>; git commit -m 'No bug: ...'
lando push-commits --lando-repo infra-testing-autoland 

then redo the merge
3. merge autoland into main, and push-merge
4. merge main back into autoland, and push-merge again

To avoid large commits hogging the git-hg-sync client, determining the next push id ahead of time from https://lando.moz.tools/admin/pushlog/push/?repo__id__exact=32, and dequeue it from the sync worker before it's getting processed. [This is less necessary now that sync workers have been split and important workloads are on dedicated instances.]

while ! git-hg-cli dequeue --repo https://github.com/mozilla-firefox/infra-testing.git -p $PUSH_ID; do sleep 1; done

Comment 1

[Olivier Mehani [:shtrom]]

Had to kill the git-hg-sync job that was holding up prod firefox work due to bug 1968519, and did it manually instead

Comment 2

[Olivier Mehani [:shtrom]]

After auth, https://mozilla-hub.atlassian.net/wiki/spaces/EW/pages/1592721421/Git-Hg-Sync+-+Setting+up+the+authenticated+environment+for+pushes

$ cd /clones/infra-testing; git fetch origin $REF
$ nohup git -t cinnabar.data=force push --dry-run hg::ssh://hg.mozilla.org/conduit-testing/infra-testing/ $REF:refs/heads/branches/default/tip &
$ disown

Comment 3

[Olivier Mehani [:shtrom]]

Manual sync, after having dequeued the job.

$ # Follow https://mozilla-hub.atlassian.net/wiki/spaces/EW/pages/1592721421/Git-Hg-Sync+-+Setting+up+the+authenticated+environment+for+pushes
$ cd /clones/infra-testing
$ git -c cinnabar.graft=true fetch --tags hg::ssh://hg.mozilla.org/conduit-testing/infra-testing/
$ REF=...
$ nohup git -c cinnabar.data=force push --dry-run hg::ssh://hg.mozilla.org/conduit-testing/infra-testing/ ${REF}:refs/heads/branches/default/tip &
$ nohup git push hg::ssh://hg.mozilla.org/conduit-testing/infra-testing/ ${REF}:refs/heads/branches/default/tip &

Comment 4

[Olivier Mehani [:shtrom]]

Recorded there for later reference https://mozilla-hub.atlassian.net/wiki/spaces/EW/pages/2368864272/Git-Hg-Sync+-+Manually+syncing+commits+to+HgMO; please update instructions there if needed.