916911 - Create v1.2 branch in repos mentioned in b2g-manifests

Status: RESOLVED FIXED

(Developer Services :: Mercurial: hg.mozilla.org, defect)

Description

[Rail Aliiev [:rail]]

+++ This bug was initially created as a clone of Bug #836319 +++

Please create "v1.2" branch in b2g-manifest and gaia repos. It would be great to have this done by EOD or earlier (needed for the merge happening today).

Comment 1

[Rail Aliiev [:rail]]

<jhford> rail:  my understanding was that releng was creating the branches
<rail> jhford: I wasn't sure because of https://bugzilla.mozilla.org/show_bug.cgi?id=836319
<hwine> jhford: wfm -- I couldn't remember if there were any exceptions for the "meta data" repos
<jhford> please create a pr for b2g manifest because that has content changes, otherwise it should be fine
<rail> hwine, jhford: I'm going to create the branches in this case
<jhford> ok
<rail> thanks

Comment 2

[Rail Aliiev [:rail]]

Attachment: new branches

before I proceed with a pull request, I'd like to verify that the branch names are correct.

Comment 3

[Rail Aliiev [:rail]]

Gaia branching is done

~/work/mozilla/repos ❯ git clone [e-mail]:mozilla-b2g/gaia.git
Cloning into 'gaia'...
X11 forwarding request failed on channel 1
remote: Counting objects: 176400, done.
remote: Compressing objects: 100% (57212/57212), done.
remote: Total 176400 (delta 125614), reused 164827 (delta 115801)
Receiving objects: 100% (176400/176400), 464.38 MiB | 1.91 MiB/s, done.
Resolving deltas: 100% (125614/125614), done.
git clone [e-mail]:mozilla-b2g/gaia.git  69.67s user 15.11s system 28% cpu 4:58.00 total

rail@magma  [15:44:44] 
~/work/mozilla/repos ❯ cd gaia 

rail@magma  [15:47:12] (master)
~/work/mozilla/repos/gaia ❯ git co -b v1.2 origin/master
Branch v1.2 set up to track remote branch master from origin.
Switched to a new branch 'v1.2'

rail@magma  [15:47:36] (v1.2)
~/work/mozilla/repos/gaia ❯ git push --all --dry-run 
X11 forwarding request failed on channel 1
To [e-mail]:mozilla-b2g/gaia.git
 * [new branch]      v1.2 -> v1.2

rail@magma  [15:47:45] (v1.2)
~/work/mozilla/repos/gaia ❯ git rev-list ^master v1.2

rail@magma  [15:48:04] (v1.2)
~/work/mozilla/repos/gaia ❯ git rev-list master ^v1.2
rail@magma  [15:49:14] (v1.2)
~/work/mozilla/repos/gaia ❯ git show-ref v1.2 
4b325feed1abedf0f9b4d7e5b61516ca561844ec refs/heads/v1.2

rail@magma  [15:50:51] (v1.2)
~/work/mozilla/repos/gaia ❯ git fetch

rail@magma  [15:52:00] (v1.2)
~/work/mozilla/repos/gaia ❯ git push --all
Total 0 (delta 0), reused 0 (delta 0)
To [e-mail]:mozilla-b2g/gaia.git
 * [new branch]      v1.2 -> v1.2

Comment 4

[hwine]

Comment on attachment 805506 [details] [diff] [review]
new branches

They all need to refer to v1.2 on gecko.git, not aurora.

Comment 5

[Rail Aliiev [:rail]]

Attachment: new branches

Comment 6

[hwine]

Comment on attachment 805618 [details] [diff] [review]
new branches

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

lgtm; r+

Comment 7

[Rail Aliiev [:rail]]

Comment on attachment 805618 [details] [diff] [review]
new branches

https://github.com/mozilla-b2g/b2g-manifest/commit/b231614d0a50ff91a2471322562c941decf068f4

Comment 8

[Rail Aliiev [:rail]]

I pushed the patch directly without a pull request because a pull request doesn't create a new branch.

Comment 9

[Ed Morley [:emorley]]

Did this work for gaia.json? Just seeing issues - see bug 917692 comment 6.

Comment 10

[Rail Aliiev [:rail]]

I just realized that I forgot to change some of the files in b2g-manifests...

PR sent https://github.com/mozilla-b2g/b2g-manifest/pull/103

Comment 11

[John Ford [:jhford] CET/CEST Berlin Time]

(In reply to Rail Aliiev [:rail] from comment #10)
> I just realized that I forgot to change some of the files in b2g-manifests...
> 
> PR sent https://github.com/mozilla-b2g/b2g-manifest/pull/103

Commented in the PR.

Comment 12

[John Ford [:jhford] CET/CEST Berlin Time]

v1.2@da7dde9

Comment 13

[Rail Aliiev [:rail]]

We decided to branch all branches mentioned in b2g-manifests that we can branch (can push to).

Comment 14

[Rail Aliiev [:rail]]

I used the following script to branch the repos and update b2g-manifests:

http://hg.mozilla.org/build/braindump/file/a889899ca778/git-related/b2g-branching/b2g_branch_repos.py

I failed to push only one repo (https://github.com/mozilla/Negatus) where for some reason I don't have rights to push (I thought that Releng was Admin for https://github.com/mozilla).

After my push to Negatus failed I had to add the repos I already pushed + Negatis to skip_repos and rerun the script.

I asked for a pull request here: https://github.com/mozilla-b2g/b2g-manifest/pull/106

Comment 15

[Rail Aliiev [:rail]]

First run output:
python b2g_branch_repos.py -m b2g-manifest -b v1.2 -v --push

2013-09-27 14:08:06,393 - INFO - processing optimus-l5.xml
2013-09-27 14:08:06,395 - INFO - processing wasabi.xml
2013-09-27 14:08:06,397 - INFO - processing helix.xml
2013-09-27 14:08:06,399 - INFO - processing pandaboard.xml
2013-09-27 14:08:06,400 - INFO - processing tara.xml
2013-09-27 14:08:06,402 - WARNING - revision conflict in ['pandaboard.xml', 'tara.xml']. screencap-gonk: existing rev master, new e6403c71e9eca8cb943739d5a0a192deac60fc51 ['master', 'e6403c71e9eca8cb943739d5a0a192deac60fc51']
2013-09-27 14:08:06,402 - INFO - processing otoro.xml
2013-09-27 14:08:06,404 - INFO - processing base-jb.xml
2013-09-27 14:08:06,406 - WARNING - revision conflict in ['otoro.xml', 'base-jb.xml']. platform_build: existing rev master, new b2g-4.3_r2.1 ['master', 'b2g-4.3_r2.1']
2013-09-27 14:08:06,406 - INFO - processing peak.xml
2013-09-27 14:08:06,408 - INFO - processing emulator.xml
2013-09-27 14:08:06,410 - INFO - processing emulator-jb.xml
2013-09-27 14:08:06,410 - INFO - processing leo.xml
2013-09-27 14:08:06,412 - INFO - processing galaxy-s2.xml
2013-09-27 14:08:06,413 - INFO - processing galaxy-nexus.xml
2013-09-27 14:08:06,415 - INFO - processing nexus-4.xml
2013-09-27 14:08:06,416 - INFO - processing nexus-s-4g.xml
2013-09-27 14:08:06,417 - INFO - processing nexus-s.xml
2013-09-27 14:08:06,419 - INFO - processing keon.xml
2013-09-27 14:08:06,423 - INFO - processing hamachi.xml
2013-09-27 14:08:06,424 - INFO - fetching android-device-otoro
2013-09-27 14:08:07,044 - INFO - Creating v1.2 branch in android-device-otoro based on master
2013-09-27 14:08:07,060 - INFO - pushing android-device-otoro
2013-09-27 14:08:08,453 - INFO - fetching gonk-misc
2013-09-27 14:08:09,076 - INFO - Creating v1.2 branch in gonk-misc based on master
2013-09-27 14:08:09,091 - INFO - pushing gonk-misc
2013-09-27 14:08:10,014 - INFO - fetching device-inari
2013-09-27 14:08:10,628 - INFO - Creating v1.2 branch in device-inari based on master
2013-09-27 14:08:10,641 - INFO - pushing device-inari
2013-09-27 14:08:11,707 - INFO - fetching android-device-unagi
2013-09-27 14:08:12,357 - INFO - Creating v1.2 branch in android-device-unagi based on master
2013-09-27 14:08:12,373 - INFO - pushing android-device-unagi
2013-09-27 14:08:13,854 - INFO - fetching platform_external_elfutils
2013-09-27 14:08:14,508 - INFO - Creating v1.2 branch in platform_external_elfutils based on master
2013-09-27 14:08:14,524 - INFO - pushing platform_external_elfutils
2013-09-27 14:08:16,003 - INFO - fetching platform_external_libpng
2013-09-27 14:08:16,649 - INFO - Creating v1.2 branch in platform_external_libpng based on b2g-4.3_r2.1
2013-09-27 14:08:16,668 - INFO - pushing platform_external_libpng
2013-09-27 14:08:17,668 - INFO - fetching android-development
2013-09-27 14:08:18,259 - INFO - Creating v1.2 branch in android-development based on emu-fix
2013-09-27 14:08:18,284 - INFO - pushing android-development
2013-09-27 14:08:19,230 - INFO - fetching rilproxy
2013-09-27 14:08:19,854 - INFO - Creating v1.2 branch in rilproxy based on master
2013-09-27 14:08:19,870 - INFO - pushing rilproxy
2013-09-27 14:08:21,837 - INFO - fetching android-device-galaxys2
2013-09-27 14:08:22,440 - INFO - Creating v1.2 branch in android-device-galaxys2 based on master
2013-09-27 14:08:22,456 - INFO - pushing android-device-galaxys2
2013-09-27 14:08:23,370 - INFO - fetching android-device-m4
2013-09-27 14:08:24,025 - INFO - Creating v1.2 branch in android-device-m4 based on master
2013-09-27 14:08:24,037 - INFO - pushing android-device-m4
2013-09-27 14:08:25,486 - INFO - fetching platform_frameworks_av
2013-09-27 14:08:26,083 - INFO - Creating v1.2 branch in platform_frameworks_av based on b2g-4.3_r2.1
2013-09-27 14:08:26,098 - INFO - pushing platform_frameworks_av
2013-09-27 14:08:26,998 - INFO - fetching skia-b2g-sgs2
2013-09-27 14:08:27,622 - INFO - Creating v1.2 branch in skia-b2g-sgs2 based on master
2013-09-27 14:08:27,634 - INFO - pushing skia-b2g-sgs2
2013-09-27 14:08:28,686 - INFO - fetching device_generic_goldfish
2013-09-27 14:08:29,343 - INFO - Creating v1.2 branch in device_generic_goldfish based on master
2013-09-27 14:08:29,356 - INFO - pushing device_generic_goldfish
2013-09-27 14:08:30,461 - INFO - fetching platform_external_opensans
2013-09-27 14:08:31,095 - INFO - Creating v1.2 branch in platform_external_opensans based on master
2013-09-27 14:08:31,111 - INFO - pushing platform_external_opensans
2013-09-27 14:08:32,585 - INFO - fetching android-device-hamachi
2013-09-27 14:08:33,252 - INFO - Creating v1.2 branch in android-device-hamachi based on master
2013-09-27 14:08:33,268 - INFO - pushing android-device-hamachi
2013-09-27 14:08:34,740 - INFO - fetching vex
2013-09-27 14:08:35,326 - INFO - Creating v1.2 branch in vex based on fxos
2013-09-27 14:08:35,338 - INFO - pushing vex
2013-09-27 14:08:36,380 - INFO - fetching device-helix
2013-09-27 14:08:36,953 - INFO - Creating v1.2 branch in device-helix based on master
2013-09-27 14:08:36,965 - INFO - pushing device-helix
2013-09-27 14:08:37,987 - INFO - fetching android-device-maguro
2013-09-27 14:08:38,638 - INFO - Creating v1.2 branch in android-device-maguro based on master
2013-09-27 14:08:38,653 - INFO - pushing android-device-maguro
2013-09-27 14:08:40,171 - INFO - fetching android-device-crespo
2013-09-27 14:08:40,818 - INFO - Creating v1.2 branch in android-device-crespo based on master
2013-09-27 14:08:40,833 - INFO - pushing android-device-crespo
2013-09-27 14:08:41,814 - INFO - fetching platform_external_elfcopy
2013-09-27 14:08:42,443 - INFO - Creating v1.2 branch in platform_external_elfcopy based on master
2013-09-27 14:08:42,459 - INFO - pushing platform_external_elfcopy
2013-09-27 14:08:43,552 - INFO - fetching android-sdk
2013-09-27 14:08:44,158 - INFO - Creating v1.2 branch in android-sdk based on emu-fix
2013-09-27 14:08:44,173 - INFO - pushing android-sdk
2013-09-27 14:08:45,083 - WARNING - Not updating emulator-jb.xml's android-sdk revision (b2g-4.3_r2.1), because it is ponting to a revision different from our branchig point emu-fix.
2013-09-27 14:08:45,089 - INFO - fetching device-leo
2013-09-27 14:08:45,706 - INFO - Creating v1.2 branch in device-leo based on master
2013-09-27 14:08:45,722 - INFO - pushing device-leo
2013-09-27 14:08:46,806 - INFO - fetching Negatus
2013-09-27 14:08:47,523 - INFO - Creating v1.2 branch in Negatus based on master
2013-09-27 14:08:47,538 - INFO - pushing Negatus
Traceback (most recent call last):
  File "/home/rail/work/mozilla/build/braindump/git-related/b2g-branching/b2g_branch_repos.py", line 173, in <module>
    push=args.push)
  File "/home/rail/work/mozilla/build/braindump/git-related/b2g-branching/b2g_branch_repos.py", line 124, in main
    _cwd=name)
  File "/usr/lib/python2.7/dist-packages/sh.py", line 648, in __call__
    return RunningCommand(cmd, call_args, stdin, stdout, stderr)
  File "/usr/lib/python2.7/dist-packages/sh.py", line 268, in __init__
    self.wait()
  File "/usr/lib/python2.7/dist-packages/sh.py", line 272, in wait
    self._handle_exit_code(self.process.wait())
  File "/usr/lib/python2.7/dist-packages/sh.py", line 281, in _handle_exit_code
    self.process.stderr
sh.ErrorReturnCode_128: 

  RAN: '/usr/bin/git push origin v1.2:v1.2'

  STDOUT:


  STDERR:
X11 forwarding request failed on channel 1
ERROR: Permission to mozilla/Negatus.git denied to rail.
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

Comment 16

[Rail Aliiev [:rail]]

Second run:

2013-09-27 14:19:49,427 - INFO - processing optimus-l5.xml
2013-09-27 14:19:49,430 - INFO - processing wasabi.xml
2013-09-27 14:19:49,432 - INFO - processing helix.xml
2013-09-27 14:19:49,434 - INFO - processing pandaboard.xml
2013-09-27 14:19:49,435 - INFO - processing tara.xml
2013-09-27 14:19:49,437 - WARNING - revision conflict in ['pandaboard.xml', 'tara.xml']. screencap-gonk: existing rev master, new e6403c71e9eca8cb943739d5a0a192deac60fc51 ['master', 'e6403c71e9eca8cb943739d5a0a192deac60fc51']
2013-09-27 14:19:49,437 - INFO - processing otoro.xml
2013-09-27 14:19:49,439 - INFO - processing base-jb.xml
2013-09-27 14:19:49,441 - WARNING - revision conflict in ['otoro.xml', 'base-jb.xml']. platform_build: existing rev master, new b2g-4.3_r2.1 ['master', 'b2g-4.3_r2.1']
2013-09-27 14:19:49,441 - INFO - processing peak.xml
2013-09-27 14:19:49,443 - INFO - processing emulator.xml
2013-09-27 14:19:49,445 - INFO - processing emulator-jb.xml
2013-09-27 14:19:49,446 - INFO - processing leo.xml
2013-09-27 14:19:49,447 - INFO - processing galaxy-s2.xml
2013-09-27 14:19:49,449 - INFO - processing galaxy-nexus.xml
2013-09-27 14:19:49,451 - INFO - processing nexus-4.xml
2013-09-27 14:19:49,451 - INFO - processing nexus-s-4g.xml
2013-09-27 14:19:49,453 - INFO - processing nexus-s.xml
2013-09-27 14:19:49,454 - INFO - processing keon.xml
2013-09-27 14:19:49,462 - INFO - processing hamachi.xml
2013-09-27 14:19:49,468 - INFO - fetching codeaurora_kernel_msm
2013-09-27 14:19:50,128 - INFO - Creating v1.2 branch in codeaurora_kernel_msm based on master
2013-09-27 14:19:50,143 - INFO - pushing codeaurora_kernel_msm
2013-09-27 14:19:51,074 - INFO - fetching android-device-panda
2013-09-27 14:19:51,663 - INFO - Creating v1.2 branch in android-device-panda based on master
2013-09-27 14:19:51,676 - INFO - pushing android-device-panda
2013-09-27 14:19:52,592 - INFO - fetching device-wasabi
2013-09-27 14:19:53,193 - INFO - Creating v1.2 branch in device-wasabi based on master
2013-09-27 14:19:53,208 - INFO - pushing device-wasabi
2013-09-27 14:19:54,138 - INFO - fetching moztt
2013-09-27 14:19:54,746 - INFO - Creating v1.2 branch in moztt based on master
2013-09-27 14:19:54,761 - INFO - pushing moztt
2013-09-27 14:19:55,736 - INFO - fetching platform_external_apriori
2013-09-27 14:19:56,350 - INFO - Creating v1.2 branch in platform_external_apriori based on master
2013-09-27 14:19:56,365 - INFO - pushing platform_external_apriori
2013-09-27 14:19:57,439 - INFO - fetching platform_build
2013-09-27 14:19:58,125 - INFO - Creating v1.2 branch in platform_build based on master
2013-09-27 14:19:58,140 - INFO - pushing platform_build
2013-09-27 14:19:59,116 - WARNING - Not updating base-jb.xml's platform_build revision (b2g-4.3_r2.1), because it is ponting to a revision different from our branchig point master.
2013-09-27 14:19:59,129 - INFO - fetching fake-libdvm
2013-09-27 14:19:59,831 - INFO - Creating v1.2 branch in fake-libdvm based on master
2013-09-27 14:19:59,847 - INFO - pushing fake-libdvm
2013-09-27 14:20:01,384 - INFO - fetching android-device-tuna
2013-09-27 14:20:02,052 - INFO - Creating v1.2 branch in android-device-tuna based on master
2013-09-27 14:20:02,068 - INFO - pushing android-device-tuna
2013-09-27 14:20:03,031 - INFO - fetching valgrind
2013-09-27 14:20:03,719 - INFO - Creating v1.2 branch in valgrind based on fxos
2013-09-27 14:20:03,734 - INFO - pushing valgrind
2013-09-27 14:20:05,297 - INFO - fetching fake-dalvik
2013-09-27 14:20:05,974 - INFO - Creating v1.2 branch in fake-dalvik based on master
2013-09-27 14:20:05,990 - INFO - pushing fake-dalvik
2013-09-27 14:20:07,542 - INFO - fetching platform_hardware_ril
2013-09-27 14:20:08,186 - INFO - Creating v1.2 branch in platform_hardware_ril based on master
2013-09-27 14:20:08,201 - INFO - pushing platform_hardware_ril
2013-09-27 14:20:09,150 - WARNING - Not updating emulator-jb.xml's platform_hardware_ril revision (b2g-jellybean), because it is ponting to a revision different from our branchig point master.
2013-09-27 14:20:09,160 - INFO - fetching platform_external_qemu
2013-09-27 14:20:09,878 - INFO - Creating v1.2 branch in platform_external_qemu based on master
2013-09-27 14:20:09,904 - INFO - pushing platform_external_qemu
2013-09-27 14:20:11,454 - WARNING - Not updating emulator-jb.xml's platform_external_qemu revision (b2g-jellybean), because it is ponting to a revision different from our branchig point master.
2013-09-27 14:20:11,457 - INFO - fetching unbootimg
2013-09-27 14:20:12,051 - INFO - Creating v1.2 branch in unbootimg based on master
2013-09-27 14:20:12,070 - INFO - pushing unbootimg
2013-09-27 14:20:12,955 - INFO - fetching android-device-crespo4g
2013-09-27 14:20:13,554 - INFO - Creating v1.2 branch in android-device-crespo4g based on ics-b2g
2013-09-27 14:20:13,571 - INFO - pushing android-device-crespo4g
2013-09-27 14:20:14,532 - INFO - fetching orangutan
2013-09-27 14:20:15,167 - INFO - Creating v1.2 branch in orangutan based on master
2013-09-27 14:20:15,179 - INFO - pushing orangutan
2013-09-27 14:20:16,542 - INFO - fetching librecovery
2013-09-27 14:20:17,140 - INFO - Creating v1.2 branch in librecovery based on master
2013-09-27 14:20:17,152 - INFO - pushing librecovery
2013-09-27 14:20:18,143 - INFO - fetching screencap-gonk
2013-09-27 14:20:18,768 - INFO - Creating v1.2 branch in screencap-gonk based on master
2013-09-27 14:20:18,783 - INFO - pushing screencap-gonk
2013-09-27 14:20:20,453 - WARNING - Not updating tara.xml's screencap-gonk revision (e6403c71e9eca8cb943739d5a0a192deac60fc51), because it is ponting to a revision different from our branchig point master.
2013-09-27 14:20:20,466 - INFO - fetching platform_prebuilts_qemu-kernel
2013-09-27 14:20:21,085 - INFO - Creating v1.2 branch in platform_prebuilts_qemu-kernel based on master
2013-09-27 14:20:21,102 - INFO - pushing platform_prebuilts_qemu-kernel
2013-09-27 14:20:22,015 - INFO - fetching gonk-patches
2013-09-27 14:20:22,606 - INFO - Creating v1.2 branch in gonk-patches based on master
2013-09-27 14:20:22,627 - INFO - pushing gonk-patches
2013-09-27 14:20:23,590 - INFO - fetching device-gp-keon
2013-09-27 14:20:24,230 - INFO - Creating v1.2 branch in device-gp-keon based on master
2013-09-27 14:20:24,243 - INFO - pushing device-gp-keon
2013-09-27 14:20:25,711 - INFO - fetching platform_system_core
2013-09-27 14:20:26,395 - INFO - Creating v1.2 branch in platform_system_core based on b2g-4.3_r2.1
2013-09-27 14:20:26,411 - INFO - pushing platform_system_core

Comment 17

[Rail Aliiev [:rail]]

I filed bug 921575 to get Negatus branched.

Comment 18

[Rail Aliiev [:rail]]

b2g-manifests:
https://github.com/mozilla-b2g/b2g-manifest/commit/778bc1b7a4352cc24381a0171dfa8f66832dde08

Comment 19

[Rail Aliiev [:rail]]

and https://github.com/mozilla-b2g/b2g-manifest/commit/069a47f089af20bcd7785e0b216327ef49b5a8d0

All done here.