ReleaseEngineering/Merge Duty/Steps: Difference between revisions

Merge scripts ride trains
(Merge scripts ride trains)
(Merge scripts ride trains)
Line 132: Line 132:
  # checkout mozharness from the gecko tree using archiver
  # checkout mozharness from the gecko tree using archiver
  wget https://hg.mozilla.org/build/tools/raw-file/default/buildfarm/utils/archiver_client.py
  wget https://hg.mozilla.org/build/tools/raw-file/default/buildfarm/utils/archiver_client.py
  python archiver_client.py mozharness --repo mozilla-central --rev default --debug
  python archiver_client.py mozharness --destination mozharness-aurora --repo releases/mozilla-aurora --rev default --debug
  # run the script
  # run the script
  python mozharness/scripts/merge_day/gecko_migration.py -c mozharness/configs/merge_day/aurora_to_beta.py
  python mozharness-aurora/scripts/merge_day/gecko_migration.py -c merge_day/aurora_to_beta.py
* the script will tag mozilla-aurora
* the script will tag mozilla-aurora
* it will continue by pulling mozilla-aurora to mozilla-beta, merging the heads in a fast-forward manner (using <tt>hg debugsetparents</tt>), adjusting shipped-locales and changing some configs.
* it will continue by pulling mozilla-aurora to mozilla-beta, merging the heads in a fast-forward manner (using <tt>hg debugsetparents</tt>), adjusting shipped-locales and changing some configs.
* run an <tt>hg -R build/mozilla-beta diff</tt> to view the uncommitted changes.
* run an <tt>hg -R build/mozilla-beta diff</tt> to view the uncommitted changes.
* Push the final bits by
* Push the final bits by
  python mozharness/scripts/merge_day/gecko_migration.py \
  python mozharness-aurora/scripts/merge_day/gecko_migration.py \
   -c mozharness/configs/selfserve/production.py \
   -c selfserve/production.py -c merge_day/aurora_to_beta.py \
  -c mozharness/configs/merge_day/aurora_to_beta.py \
   --create-virtualenv --commit-changes --push --trigger-builders
   --create-virtualenv --commit-changes --push --trigger-builders
* The push should be available at https://treeherder.mozilla.org/#/jobs?repo=mozilla-beta
* The push should be available at https://treeherder.mozilla.org/#/jobs?repo=mozilla-beta
Line 157: Line 156:
  # checkout mozharness from the gecko tree using archiver
  # checkout mozharness from the gecko tree using archiver
  wget https://hg.mozilla.org/build/tools/raw-file/default/buildfarm/utils/archiver_client.py
  wget https://hg.mozilla.org/build/tools/raw-file/default/buildfarm/utils/archiver_client.py
  python archiver_client.py mozharness --repo mozilla-central --rev default --debug
  python archiver_client.py mozharness --destination mozharness-central --repo mozilla-central --rev default --debug
  # run the script
  # run the script
  python mozharness/scripts/merge_day/gecko_migration.py -c mozharness/configs/merge_day/central_to_aurora.py
  python mozharness/scripts/merge_day/gecko_migration.py -c mozharness/configs/merge_day/central_to_aurora.py
Line 165: Line 164:
* Push the final bits by
* Push the final bits by
  scp cltbld@buildbot-master81.bb.releng.scl3.mozilla.com:/builds/buildbot/build_scheduler/master/BuildSlaves.py oauth.txt
  scp cltbld@buildbot-master81.bb.releng.scl3.mozilla.com:/builds/buildbot/build_scheduler/master/BuildSlaves.py oauth.txt
  python mozharness/scripts/merge_day/gecko_migration.py \
  python mozharness-central/scripts/merge_day/gecko_migration.py \
   -c mozharness/configs/balrog/production.py \
   -c balrog/production.py -c selfserve/production.py \
  -c mozharness/configs/selfserve/production.py \
   -c merge_day/central_to_aurora.py \
   -c mozharness/configs/merge_day/central_to_aurora.py \
   --create-virtualenv --lock-update-paths --commit-changes \
   --create-virtualenv --lock-update-paths --commit-changes \
   --push --trigger-builders
   --push --trigger-builders
Confirmed users
3,104

edits