Update b2g_branch_repos.py script and config to handle b2g 2.5 branching

RESOLVED FIXED

Status

RESOLVED FIXED
3 years ago
3 years ago

People

(Reporter: rail, Assigned: rail)

Tracking

unspecified

Firefox Tracking Flags

(firefox44 fixed)

Details

Attachments

(1 attachment)

(Assignee)

Description

3 years ago
I ran `mozharness/scripts/merge_day/b2g_branch_repos.py -c mozharness/configs/merge_day/b2g_branch_repos.py --branch-name v2.5 --pull --pull-branch-repo` and got the following errors.


12:26:57 CRITICAL - WAT platform_prebuilts_misc b2g-5.1.0_r1 b2g-4.4.2_r1
12:26:57 CRITICAL - WAT platform_prebuilts_qemu-kernel b2g-5.1.0_r1 b2g-4.4.2_r1
12:26:57 CRITICAL - WAT platform_frameworks_av b2g-5.1.0_r1 b2g-4.4.2_r1
12:26:57 CRITICAL - WAT platform_system_core b2g-5.1.0_r1 b2g-4.4.2_r1
12:26:57 CRITICAL - WAT platform_bionic b2g_ics_strawberry b2g-4.0.4_r2.1
12:26:57 CRITICAL - WAT platform_bionic b2g_ics_strawberry b2g-4.0.4_r2.1
12:26:57 CRITICAL - WAT codeaurora_kernel_msm shinano t2m-flame-3.4-jb
12:26:57 CRITICAL - WAT platform_bionic bcm2835-4.0.1_r1.1 b2g-4.0.4_r2.1
12:26:58 CRITICAL - WAT platform_prebuilts_misc b2g-5.1.0_r1 b2g-4.4.2_r1
12:26:58 CRITICAL - WAT codeaurora_kernel_msm t2m-flame-3.4-kk t2m-flame-3.4-jb
12:26:58 CRITICAL - WAT platform_external_wpa_supplicant_8 b2g-4.4.2_r1 b2g-5.1.0_r1
12:26:58 CRITICAL - WAT platform_bionic b2g_ics_strawberry b2g-4.0.4_r2.1
12:26:58 CRITICAL - WAT platform_external_bluetooth_bluedroid foxfone-one-lollipop b2g_kk_3.5
12:26:58 CRITICAL - WAT platform_external_sepolicy LA.BF.1.1.2_rb1.12 b2g-5.1.0_r1
12:26:58 CRITICAL - WAT platform_frameworks_wilhelm b2g-5.0.0_r6 b2g-5.1.0_r1
12:26:58 CRITICAL - WAT platform_hardware_libhardware foxfone-one-lollipop bcm2835-4.0.1_r1.1
12:26:58 CRITICAL - WAT codeaurora_kernel_msm foxfone-one-lollipop t2m-flame-3.4-jb
12:26:58 CRITICAL - WAT platform_prebuilts_misc b2g-5.0.0_r6 b2g-4.4.2_r1
12:26:59 CRITICAL - WAT platform_prebuilts_misc b2g-5.1.0_r1 b2g-4.4.2_r1
12:26:59 CRITICAL - WAT platform_hardware_libhardware sony-aosp-l bcm2835-4.0.1_r1.1
12:26:59 CRITICAL - WAT codeaurora_kernel_msm sony-aosp-l t2m-flame-3.4-jb
12:26:59 CRITICAL - WAT platform_bionic b2g_ics_strawberry b2g-4.0.4_r2.1
12:26:59 CRITICAL - WAT platform_bionic b2g_ics_strawberry b2g-4.0.4_r2.1
12:26:59 CRITICAL - WAT platform_prebuilts_misc b2g-5.1.0_r1 b2g-4.4.2_r1
12:26:59 CRITICAL - WAT platform_hardware_libhardware sony-aosp-l bcm2835-4.0.1_r1.1
12:26:59 CRITICAL - WAT codeaurora_kernel_msm sony-aosp-l t2m-flame-3.4-jb
12:26:59    FATAL - Sanity: Not clear where to branch for platform_external_wpa_supplicant_8 git://github.com/mozilla-b2g/platform_external_wpa_supplicant_8 {u'b2g-4.4.2_r1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/emulator-kk.xml'],
12:26:59    FATAL -  u'b2g-5.1.0_r1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/emulator-l.xml']}
12:26:59    FATAL - Sanity: Not clear where to branch for platform_prebuilts_qemu-kernel git://github.com/mozilla-b2g/platform_prebuilts_qemu-kernel {u'b2g-5.1.0_r1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-5-l.xml'],
12:26:59    FATAL -  u'master': ['/home/rail/work/mozilla/merge/build/b2g-manifest/emulator-jb.xml',
12:26:59    FATAL -              '/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-4.xml',
12:26:59    FATAL -              '/home/rail/work/mozilla/merge/build/b2g-manifest/emulator.xml',
12:26:59    FATAL -              '/home/rail/work/mozilla/merge/build/b2g-manifest/flo.xml']}
12:26:59    FATAL - Sanity: Not clear where to branch for platform_frameworks_av git://github.com/mozilla-b2g/platform_frameworks_av {u'b2g-4.3_r2.1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/emulator-jb.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-4.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/flo.xml'],
12:26:59    FATAL -  u'b2g-5.1.0_r1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-5-l.xml']}
12:26:59    FATAL - Sanity: Not clear where to branch for platform_external_bluetooth_bluedroid git://github.com/mozilla-b2g/platform_external_bluetooth_bluedroid {u'b2g_kk_3.5': ['/home/rail/work/mozilla/merge/build/b2g-manifest/shinano.xml',
12:26:59    FATAL -                  '/home/rail/work/mozilla/merge/build/b2g-manifest/flame-kk.xml'],
12:26:59    FATAL -  u'foxfone-one-lollipop': ['/home/rail/work/mozilla/merge/build/b2g-manifest/flame-l.xml']}
12:26:59    FATAL - Sanity: Not clear where to branch for platform_external_sepolicy git://github.com/mozilla-b2g/platform_external_sepolicy {u'LA.BF.1.1.2_rb1.12': ['/home/rail/work/mozilla/merge/build/b2g-manifest/flame-l.xml'],
12:26:59    FATAL -  u'b2g-5.1.0_r1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-5-l.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/emulator-l.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/yukon-l.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/shinano-l.xml']}
12:26:59    FATAL - Sanity: Not clear where to branch for platform_system_core git://github.com/mozilla-b2g/platform_system_core {u'b2g-4.3_r2.1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/emulator-jb.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-4.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/flo.xml'],
12:26:59    FATAL -  u'b2g-5.1.0_r1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-5-l.xml']}
12:26:59    FATAL - Sanity: Not clear where to branch for platform_hardware_libhardware git://github.com/mozilla-b2g/platform_hardware_libhardware {u'bcm2835-4.0.1_r1.1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/rpi.xml'],
12:26:59    FATAL -  u'foxfone-one-lollipop': ['/home/rail/work/mozilla/merge/build/b2g-manifest/flame-l.xml'],
12:26:59    FATAL -  u'sony-aosp-l': ['/home/rail/work/mozilla/merge/build/b2g-manifest/yukon-l.xml',
12:26:59    FATAL -                   '/home/rail/work/mozilla/merge/build/b2g-manifest/shinano-l.xml']}
12:26:59    FATAL - Sanity: Not clear where to branch for platform_frameworks_wilhelm git://github.com/mozilla-b2g/platform_frameworks_wilhelm {u'b2g-5.0.0_r6': ['/home/rail/work/mozilla/merge/build/b2g-manifest/flame-l.xml'],
12:26:59    FATAL -  u'b2g-5.1.0_r1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-5-l.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/emulator-l.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/yukon-l.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/shinano-l.xml']}
12:26:59    FATAL - Sanity: Not clear where to branch for platform_prebuilts_misc git://github.com/mozilla-b2g/platform_prebuilts_misc {u'b2g-4.4.2_r1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/dolphin.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-4-kk.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/shinano.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/flame-kk.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/emulator-kk.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-5.xml'],
12:26:59    FATAL -  u'b2g-5.0.0_r6': ['/home/rail/work/mozilla/merge/build/b2g-manifest/flame-l.xml'],
12:26:59    FATAL -  u'b2g-5.1.0_r1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-5-l.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/emulator-l.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/yukon-l.xml',
12:26:59    FATAL -                    '/home/rail/work/mozilla/merge/build/b2g-manifest/shinano-l.xml']}
12:26:59    FATAL - Sanity: Not clear where to branch for codeaurora_kernel_msm git://github.com/mozilla-b2g/codeaurora_kernel_msm {u'foxfone-one-lollipop': ['/home/rail/work/mozilla/merge/build/b2g-manifest/flame-l.xml'],
12:26:59    FATAL -  u'shinano': ['/home/rail/work/mozilla/merge/build/b2g-manifest/shinano.xml'],
12:26:59    FATAL -  u'sony-aosp-l': ['/home/rail/work/mozilla/merge/build/b2g-manifest/yukon-l.xml',
12:26:59    FATAL -                   '/home/rail/work/mozilla/merge/build/b2g-manifest/shinano-l.xml'],
12:26:59    FATAL -  u't2m-flame-3.4-jb': ['/home/rail/work/mozilla/merge/build/b2g-manifest/flame.xml'],
12:26:59    FATAL -  u't2m-flame-3.4-kk': ['/home/rail/work/mozilla/merge/build/b2g-manifest/flame-kk.xml']}
12:26:59    FATAL - Sanity: Not clear where to branch for platform_bionic git://github.com/mozilla-b2g/platform_bionic {u'b2g-4.0.4_r2.1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-s-4g.xml',
12:26:59    FATAL -                      '/home/rail/work/mozilla/merge/build/b2g-manifest/nexus-s.xml',
12:26:59    FATAL -                      '/home/rail/work/mozilla/merge/build/b2g-manifest/pandaboard.xml',
12:26:59    FATAL -                      '/home/rail/work/mozilla/merge/build/b2g-manifest/wasabi.xml',
12:26:59    FATAL -                      '/home/rail/work/mozilla/merge/build/b2g-manifest/galaxy-nexus.xml',
12:26:59    FATAL -                      '/home/rail/work/mozilla/merge/build/b2g-manifest/emulator.xml',
12:26:59    FATAL -                      '/home/rail/work/mozilla/merge/build/b2g-manifest/galaxy-s2.xml'],
12:26:59    FATAL -  u'b2g_ics_strawberry': ['/home/rail/work/mozilla/merge/build/b2g-manifest/otoro.xml',
12:26:59    FATAL -                          '/home/rail/work/mozilla/merge/build/b2g-manifest/helix.xml',
12:26:59    FATAL -                          '/home/rail/work/mozilla/merge/build/b2g-manifest/hamachi.xml',
12:26:59    FATAL -                          '/home/rail/work/mozilla/merge/build/b2g-manifest/keon.xml',
12:26:59    FATAL -                          '/home/rail/work/mozilla/merge/build/b2g-manifest/peak.xml'],
12:26:59    FATAL -  u'bcm2835-4.0.1_r1.1': ['/home/rail/work/mozilla/merge/build/b2g-manifest/rpi.xml']}
12:26:59    FATAL - Use --branch-order or self.config['no_branch_repos'] to fix!
12:26:59    FATAL - Running post_fatal callback...
12:26:59    FATAL - Exiting -1
(Assignee)

Comment 1

3 years ago
Created attachment 8666884 [details] [diff] [review]
b2g_branching.diff

To make it work:

* updated the list of projects that we shouldn't touch (no_branch_repos). They are all referenced in various manifests using a particular branch.

* Added a list of manifests that are not used in production on mozilla-central. They just add extra churn to branching mechanics.
Assignee: nobody → rail
(Assignee)

Updated

3 years ago
Attachment #8666884 - Flags: review?(jlund)
Comment on attachment 8666884 [details] [diff] [review]
b2g_branching.diff

Review of attachment 8666884 [details] [diff] [review]:
-----------------------------------------------------------------

looks good

::: testing/mozharness/scripts/merge_day/b2g_branch_repos.py
@@ +132,5 @@
>              if os.path.islink(manifest):
>                  self.info("Skipping %s (softlink)" % manifest)
>                  continue
> +            if os.path.basename(manifest) in self.config["ignored_manifests"]:
> +                self.info("Skipping %s (ignored)" % manifest)

can we just delete these xml files that are not used in prod? or are they used elsewhere? Or, would deleting them complicate migration scripts?
Attachment #8666884 - Flags: review?(jlund) → review+
(Assignee)

Comment 3

3 years ago
(In reply to Jordan Lund (:jlund) from comment #2)
> can we just delete these xml files that are not used in prod? or are they
> used elsewhere? Or, would deleting them complicate migration scripts?

This is a question for the b2g team, I'm not quite sure that we can delete them...
https://hg.mozilla.org/mozilla-central/rev/424534192279
Status: NEW → RESOLVED
Last Resolved: 3 years ago
status-firefox44: --- → fixed
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.