Merge lp:~pfalcon/linaro-android-gerrit-support/cronjob-deploy into lp:linaro-android-gerrit-support

[Paul Sokolovsky]

These are changes for last WI "Deploy as cronjob" of
https://blueprints.launchpad.net/linaro-android-infrastructure/+spec/linaro-android-automate-upstream-sync

So, these are changes needed to actually run automatic upstream mirror on android.git.linaro.org

[lp:~pfalcon/linaro-android-gerrit-support/cronjob-deploy]

70. By Paul Sokolovsky on 2011-12-05

cd into tool dir to access mirror.conf

[Deepti B. Kalakeri (deeptik)]

On Fri, Dec 2, 2011 at 11:39 PM, Paul Sokolovsky <<email address hidden>
> wrote:

> Paul Sokolovsky has proposed merging
> lp:~pfalcon/linaro-android-gerrit-support/cronjob-deploy into
> lp:linaro-android-gerrit-support.
>
> Requested reviews:
> Linaro Infrastructure (linaro-infrastructure)
>
> For more details, see:
>
> https://code.launchpad.net/~pfalcon/linaro-android-gerrit-support/cronjob-deploy/+merge/84309<https://code.launchpad.net/%7Epfalcon/linaro-android-gerrit-support/cronjob-deploy/+merge/84309>
>
> These are changes for last WI "Deploy as cronjob" of
>
> https://blueprints.launchpad.net/linaro-android-infrastructure/+spec/linaro-android-automate-upstream-sync
>
> So, these are changes needed to actually run automatic upstream mirror on
> android.git.linaro.org
>
> --
>
> https://code.launchpad.net/~pfalcon/linaro-android-gerrit-support/cronjob-deploy/+merge/84309<https://code.launchpad.net/%7Epfalcon/linaro-android-gerrit-support/cronjob-deploy/+merge/84309>
> Your team Linaro Infrastructure is requested to review the proposed merge
> of lp:~pfalcon/linaro-android-gerrit-support/cronjob-deploy into
> lp:linaro-android-gerrit-support.
>
> === added file 'crontab'
> --- crontab 1970-01-01 00:00:00 +0000
> +++ crontab 2011-12-02 18:08:23 +0000
> @@ -0,0 +1,4 @@
> +# This is a sample crontab for Linaro Gerrit Mirror Service
> +
> +0 */2 * * * ~/linaro-android-gerrit-support/runner.sh fetch
> +30 */2 * * * ~/linaro-android-gerrit-support/runner.sh push
>
> === modified file 'mirror.conf'
> --- mirror.conf 2011-11-23 18:53:52 +0000
> +++ mirror.conf 2011-12-02 18:08:23 +0000
> @@ -1,7 +1,9 @@
> [DESTINATION]
> # Usecase 1: target is Gerrit
> -$repo_root = ssh://<email address hidden>:29418
> -$gerrit_host = <email address hidden>
> +#$repo_root = ssh://<email address hidden>:29418
> +#$gerrit_host = <email address hidden>

Was it intentional to leave the above commented than removed?

>
> +$repo_root = ssh://linaro-aosp-sync-bot@gerrit-git:29418
> +$gerrit_host = linaro-aosp-sync-bot@gerrit-git
> $gerrit_port = 29418
>

we can move the gerrit_port declaration above and can use it in the
repo_root command above.

>
> # Usecase 2: target is a remote tree
> @@ -26,5 +28,5 @@
> #$active = false
> kernel/omap = kernel/omap-omapzoom
>
> -[git://github.com]
> +[https://github.com]
> msg555/PowerTutor = platform/packages/apps/PowerTutor
>
> === added file 'runner.sh'
> --- runner.sh 1970-01-01 00:00:00 +0000
> +++ runner.sh 2011-12-02 18:08:23 +0000
> @@ -0,0 +1,10 @@
> +#!/bin/bash
> +
> +MIRROR_DIR=/srv/build_engineer_scratch/gerrit-mirror/
> +LOG_DIR=/srv/build_engineer_scratch/gerrit-mirror-logs/
> +TSTAMP=`date '+%Y%m%dT%H%M'`
> +
> +MYPATH=`dirname $0`
> +
> +LOG=$LOG_DIR/$TSTAMP-$1.log
> +(time $MYPATH/git-gerrit-mirror --mirror-dir=$MIRROR_DIR $* >$LOG 2>&1)
> 2>>$LOG
>
>
>

--
Thanks!!!
Deepti

[Paul Sokolovsky (pfalcon)]

Hello,

On Mon, 05 Dec 2011 10:04:23 -0000
"Deepti B. Kalakeri" <email address hidden> wrote:

[]
> > === modified file 'mirror.conf'
> > --- mirror.conf 2011-11-23 18:53:52 +0000
> > +++ mirror.conf 2011-12-02 18:08:23 +0000
> > @@ -1,7 +1,9 @@
> > [DESTINATION]
> > # Usecase 1: target is Gerrit
> > -$repo_root = ssh://<email address hidden>:29418
> > -$gerrit_host = <email address hidden>
> > +#$repo_root = ssh://<email address hidden>:29418
> > +#$gerrit_host = <email address hidden>
>
> Was it intentional to leave the above commented than removed?

Yes, for debugging any issues and being able to run easily at
alternative location (android-build).

>
> >
> > +$repo_root = ssh://linaro-aosp-sync-bot@gerrit-git:29418
> > +$gerrit_host = linaro-aosp-sync-bot@gerrit-git
> > $gerrit_port = 29418
> >
>
> we can move the gerrit_port declaration above and can use it in the
> repo_root command above.

No, those are different settings for different services (git vs
gerrit). They happen to coincide in this case, but that's it -
coincidence.

--
Best Regards,
Paul

Linaro.org | Open source software for ARM SoCs
Follow Linaro: http://www.facebook.com/pages/Linaro
http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog

[Deepti B. Kalakeri (deeptik)]

On Mon, Dec 5, 2011 at 4:31 PM, Paul Sokolovsky
<email address hidden>wrote:

> Hello,
>
> On Mon, 05 Dec 2011 10:04:23 -0000
> "Deepti B. Kalakeri" <email address hidden> wrote:
>
> []
> > > === modified file 'mirror.conf'
> > > --- mirror.conf 2011-11-23 18:53:52 +0000
> > > +++ mirror.conf 2011-12-02 18:08:23 +0000
> > > @@ -1,7 +1,9 @@
> > > [DESTINATION]
> > > # Usecase 1: target is Gerrit
> > > -$repo_root = ssh://<email address hidden>:29418
> > > -$gerrit_host = <email address hidden>
> > > +#$repo_root = ssh://<email address hidden>:29418
> > > +#$gerrit_host = <email address hidden>
> >
> > Was it intentional to leave the above commented than removed?
>
> Yes, for debugging any issues and being able to run easily at
> alternative location (android-build).
>
> >
> > >
> > > +$repo_root = ssh://linaro-aosp-sync-bot@gerrit-git:29418
> > > +$gerrit_host = linaro-aosp-sync-bot@gerrit-git
> > > $gerrit_port = 29418
> > >
> >
> > we can move the gerrit_port declaration above and can use it in the
> > repo_root command above.
>
> No, those are different settings for different services (git vs
> gerrit). They happen to coincide in this case, but that's it -
> coincidence.
>
> ah! ok.
+1 looks fine.

>
> --
> Best Regards,
> Paul
>
> Linaro.org | Open source software for ARM SoCs
> Follow Linaro: http://www.facebook.com/pages/Linaro
> http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog
>
>
> https://code.launchpad.net/~pfalcon/linaro-android-gerrit-support/cronjob-deploy/+merge/84309<https://code.launchpad.net/%7Epfalcon/linaro-android-gerrit-support/cronjob-deploy/+merge/84309>
> Your team Linaro Infrastructure is requested to review the proposed merge
> of lp:~pfalcon/linaro-android-gerrit-support/cronjob-deploy into
> lp:linaro-android-gerrit-support.
>

--
Thanks and Regards,
Deepti
Infrastructure Team Member, Linaro Platform Teams
Linaro.org | Open source software for ARM SoCs
Follow Linaro: http://www.facebook.com/pages/Linaro
http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog

[Guilherme Salgado (salgado)]

I don't quite like the commented code left behind nor the hard-coded paths. The former is not a big deal but we should at least try and fix the latter

[Paul Sokolovsky (pfalcon)]

> I don't quite like the commented code left behind nor the hard-coded paths.
> The former is not a big deal but we should at least try and fix the latter

Well, all the changes here are essentially configuration for running specific instance of service on specific machine, so yes, all paths are specific to that machine. We could have two configs for production vs reserve/test machine, but then they would need to be updated in parallel, so as they differ in just 3-4 lines, it's easier to keep them in one file, to avoid head-scratching trying to understand what's where in 6 months ;-).

[Guilherme Salgado (salgado)]

> > I don't quite like the commented code left behind nor the hard-coded paths.
> > The former is not a big deal but we should at least try and fix the latter
>
> Well, all the changes here are essentially configuration for running specific
> instance of service on specific machine, so yes, all paths are specific to
> that machine. We could have two configs for production vs reserve/test
> machine, but then they would need to be updated in parallel, so as they differ
> in just 3-4 lines, it's easier to keep them in one file, to avoid head-
> scratching trying to understand what's where in 6 months ;-).

runner.sh doesn't look like configuration to me; it looks like a script which developers may want to run on their machine and in that case they'll have to manually change the script. I see that sync-linaro.sh also has a hard-coded path in it, so if I wanted to test linaro-android-gerrit-support on my machine I'd have to change at least these two places and I'd have to find a way to keep those changes locally while I'm trying l-a-g-s, but not commit them back. We used to have a similar problem in Offspring and I can tell you it's very annoying.

As you said, those paths are really just configuration so I think they should at least be moved to a config file so that they're not scattered all around and developers have a single place to change when they want to run it on their machine.

[Paul Sokolovsky (pfalcon)]

Hello,

On Wed, 07 Dec 2011 13:38:32 -0000
Guilherme Salgado <email address hidden> wrote:

> > > I don't quite like the commented code left behind nor the
> > > hard-coded paths. The former is not a big deal but we should at
> > > least try and fix the latter
> >
> > Well, all the changes here are essentially configuration for
> > running specific instance of service on specific machine, so yes,
> > all paths are specific to that machine. We could have two configs
> > for production vs reserve/test machine, but then they would need to
> > be updated in parallel, so as they differ in just 3-4 lines, it's
> > easier to keep them in one file, to avoid head- scratching trying
> > to understand what's where in 6 months ;-).
>
> runner.sh doesn't look like configuration to me; it looks like a
> script which developers may want to run on their machine and in that
> case they'll have to manually change the script.

Well, that's typical pattern of setting up a cronjob: instead of
putting too long lines into crontab itself, you call a wrapper script
which sets up environment/configuration for actual (and generic) tool
to run. So, it's kinda of "executable configuration". runner.sh is not
intended to be run by developer, except for the case of simulating
running from cron (that's another case why this pattern of wrapper
scripts is useful). So, maybe the name is confusing, let's rename it to
cron-runner.sh and add corresponding comment if that answers your
concerns.

> I see that
> sync-linaro.sh also has a hard-coded path in it, so if I wanted to

Well, that's a deprecated script ;-). It really should be removed some
time later, once new system is up and running for some buffer time.

> test linaro-android-gerrit-support on my machine I'd have to change
> at least these two places and I'd have to find a way to keep those
> changes locally while I'm trying l-a-g-s, but not commit them back.
> We used to have a similar problem in Offspring and I can tell you
> it's very annoying.

Yes, I understand your concerns. But those are indeed just one-off
wrapper scripts. Except that one "one-off" is special - the production
one. It could have been a separate script lying elsewhere on a target
host, but we really want to capture all details of the production
service setup, to be able to re-setup it without contingencies in case
of need. The ideal situation to handle that would be to keep generic
tool vs specific service config in two different repositories, and I
would happily do that if LP supported >1 repos per project. But
creating a new LP project for each such case doesn't scale at all IMHO.

Anyway, if you think that separating generic tool vs specific config
into different dirs in repo will be helpful, let's do that.

Finally, answering your concern how to deal with that locally - you'd
need just to copy runner.sh to your one-off wrapper, runner-local.sh,
and change it, that's the idea.

> As you said, those paths are really just configuration so I think
> they should at least be moved to a config file so that they're not
> scattered all around and developers have a single place to change
> when they want to run it on their machine.

So, there'r...

[lp:~pfalcon/linaro-android-gerrit-support/cronjob-deploy]

71. By Paul Sokolovsky on 2011-12-08

Rename runner.sh => cron-runner.sh to avoid confusion.

72. By Paul Sokolovsky on 2011-12-08

Remove stale file.

73. By Paul Sokolovsky on 2011-12-08

Move older utilities to old/ .

Keep them around for some time yet.

74. By Paul Sokolovsky on 2011-12-08

Add description for re-remote.sh

75. By Paul Sokolovsky on 2011-12-08

Move host-specific cron config to the corresponding dir.

[Paul Sokolovsky (pfalcon)]

Ok, made changes along the lines of what was described above. This wasn't intended to be done for this merge request (not related to cronjob set up per se), so now there're too many changes, so it make sense to look at the end result: http://bazaar.launchpad.net/~pfalcon/linaro-android-gerrit-support/cronjob-deploy/files

review: Approve

[Guilherme Salgado (salgado)]

On Thu, 2011-12-08 at 12:17 +0000, Paul Sokolovsky wrote:
> Hello,
>
> On Wed, 07 Dec 2011 13:38:32 -0000
> Guilherme Salgado <email address hidden> wrote:
>
> > > > I don't quite like the commented code left behind nor the
> > > > hard-coded paths. The former is not a big deal but we should at
> > > > least try and fix the latter
> > >
> > > Well, all the changes here are essentially configuration for
> > > running specific instance of service on specific machine, so yes,
> > > all paths are specific to that machine. We could have two configs
> > > for production vs reserve/test machine, but then they would need to
> > > be updated in parallel, so as they differ in just 3-4 lines, it's
> > > easier to keep them in one file, to avoid head- scratching trying
> > > to understand what's where in 6 months ;-).
> >
> > runner.sh doesn't look like configuration to me; it looks like a
> > script which developers may want to run on their machine and in that
> > case they'll have to manually change the script.
>
> Well, that's typical pattern of setting up a cronjob: instead of
> putting too long lines into crontab itself, you call a wrapper script
> which sets up environment/configuration for actual (and generic) tool
> to run. So, it's kinda of "executable configuration". runner.sh is not
> intended to be run by developer, except for the case of simulating
> running from cron (that's another case why this pattern of wrapper
> scripts is useful). So, maybe the name is confusing, let's rename it to
> cron-runner.sh and add corresponding comment if that answers your
> concerns.
>
> > I see that
> > sync-linaro.sh also has a hard-coded path in it, so if I wanted to
>
> Well, that's a deprecated script ;-). It really should be removed some
> time later, once new system is up and running for some buffer time.
>
> > test linaro-android-gerrit-support on my machine I'd have to change
> > at least these two places and I'd have to find a way to keep those
> > changes locally while I'm trying l-a-g-s, but not commit them back.
> > We used to have a similar problem in Offspring and I can tell you
> > it's very annoying.
>
> Yes, I understand your concerns. But those are indeed just one-off
> wrapper scripts. Except that one "one-off" is special - the production

What do you mean with one-off here? To me a one-off script is something that
we'll run once and throw away, but here it's something that will run as a
cronjob in production, so it definitely doesn't fall on that category.

> one. It could have been a separate script lying elsewhere on a target
> host, but we really want to capture all details of the production
> service setup, to be able to re-setup it without contingencies in case

Ok, if that's not expected to be needed on developer machines it's probably
fine to keep the paths hard-coded, but it's a good idea to move it to a
separate directory, which you've already did. :)

> of need. The ideal situation to handle that would be to keep generic
> tool vs specific service config in two different repositories, and I
> would happily do that if LP supported >1 repos per project. But
> creating a new LP project for each such case doesn't...

[lp:~pfalcon/linaro-android-gerrit-support/cronjob-deploy]

76. By Paul Sokolovsky on 2011-12-09

Add READMEs.

[Paul Sokolovsky (pfalcon)]

Hello Guilherme,

On Thu, 08 Dec 2011 18:22:24 -0000
Guilherme Salgado <email address hidden> wrote:

[]
> > Yes, I understand your concerns. But those are indeed just one-off
> > wrapper scripts. Except that one "one-off" is special - the
> > production
>
> What do you mean with one-off here? To me a one-off script is
> something that we'll run once and throw away, but here it's something
> that will run as a cronjob in production, so it definitely doesn't
> fall on that category.

Yep, I meant more along the lines "configured once for specific
usecase, and can be easily forked and reconfigured for another usecase".

> > one. It could have been a separate script lying elsewhere on a
> > target host, but we really want to capture all details of the
> > production service setup, to be able to re-setup it without
> > contingencies in case
>
> Ok, if that's not expected to be needed on developer machines it's
> probably fine to keep the paths hard-coded, but it's a good idea to
> move it to a separate directory, which you've already did. :)
>
> > of need. The ideal situation to handle that would be to keep generic
> > tool vs specific service config in two different repositories, and I
> > would happily do that if LP supported >1 repos per project. But
> > creating a new LP project for each such case doesn't scale at all
> > IMHO.
>
> You can have as many branches as you want under a given project in LP
> and those branches may contain distinct code bases, so you could do
> something like:
>
> mkdir cronscripts
> cd cronscripts
> bzr init
> cp /path/to/wrapper-script .
> bzr add *
> bzr commit -m "..."
> bzr push
> lp:~linaro-infrastructure/linaro-android-gerrit-support/cronscripts
>
> And then when deploying you fetch that branch as well.

Well, yeah, I'm aware that one can have completely different content in
two branches and git, and you point that it can be doable for bzr too.
But is it natural use pattern for bzr? For git, that would be quite a
hack. And does LP has good support for such usage (e.g. does it allow
to specify descriptions for each such branch)? Anyway, I'll keep that
option in mind, and on next occasion will figure those questions.

>
> > Anyway, if you think that separating generic tool vs specific config
> > into different dirs in repo will be helpful, let's do that.
> >
> > Finally, answering your concern how to deal with that locally -
> > you'd need just to copy runner.sh to your one-off wrapper,
> > runner-local.sh, and change it, that's the idea.
>
> Yes, I know there are many ways a developer can deal with that, but
> my point is that they shouldn't have to change any code to run (or
> test) our software, and if they do need to change configs and such,
> it should be documented.

Yes, improving docs is a known TODO, I added
https://bugs.launchpad.net/linaro-android-gerrit-support/+bug/902176 to
track case of this specific tool/service.

Thanks,
Paul

Linaro.org | Open source software for ARM SoCs
Follow Linaro: http://www.facebook.com/pages/Linaro
http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog

=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2011-12-09 15:10:28 +0000
@@ -0,0 +1,13 @@
+git-gerrit-mirror is a generic tool to mirror set of git repositories. It
+can mirror one set of remote repositories ("upstreams") into set of
+corresponding remote repositories ("targets"), by keeping local working
+copy to perform fetch/push operations. It also has optional support for
+Gerrit services associated with upstream and target repositories, which
+can be used to automatically discover new projects in upstream and
+create corresponding projects in target.
+
+More documenation is available at:
+http://wiki.linaro.org/Platform/Android/GerritMirroring
+
+Project home page:
+https://launchpad.net/linaro-android-gerrit-support

=== added directory 'android.git.linaro.org'
=== added file 'android.git.linaro.org/README'
--- android.git.linaro.org/README	1970-01-01 00:00:00 +0000
+++ android.git.linaro.org/README	2011-12-09 15:10:28 +0000
@@ -0,0 +1,2 @@
+This directory contains configuration and helper scripts to run Gerrit
+mirroring cronjob on android.git.linaro.org host.

=== added file 'android.git.linaro.org/cron-runner.sh'
--- android.git.linaro.org/cron-runner.sh	1970-01-01 00:00:00 +0000
+++ android.git.linaro.org/cron-runner.sh	2011-12-09 15:10:28 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+# This script is intended to be run from crontab
+
+MIRROR_DIR=/srv/build_engineer_scratch/gerrit-mirror/
+LOG_DIR=/srv/build_engineer_scratch/gerrit-mirror-logs/
+
+TSTAMP=`date '+%Y%m%dT%H%M'`
+MYPATH=.
+LOG=$LOG_DIR/$TSTAMP-$1.log
+
+(time $MYPATH/git-gerrit-mirror --mirror-dir=$MIRROR_DIR $* >$LOG 2>&1) 2>>$LOG

=== added file 'android.git.linaro.org/crontab'
--- android.git.linaro.org/crontab	1970-01-01 00:00:00 +0000
+++ android.git.linaro.org/crontab	2011-12-09 15:10:28 +0000
@@ -0,0 +1,4 @@
+# This is a sample crontab for Linaro Gerrit Mirror Service
+
+0  */2 * * *	(cd ~/linaro-android-gerrit-support; android.git.linaro.org/cron-runner.sh fetch)
+30 */2 * * *	(cd ~/linaro-android-gerrit-support; android.git.linaro.org/cron-runner.sh push)

=== removed file 'linaro-aosp-projects.txt'
--- linaro-aosp-projects.txt	2011-07-23 19:42:48 +0000
+++ linaro-aosp-projects.txt	1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-platform/bionic
-platform/bootable/bootloader/legacy
-platform/bootable/diskinstaller
-platform/bootable/recovery
-platform/cts
-platform/development
-device/common
-device/sample
-device/samsung/crespo
-platform/external/apache-http
-platform/external/astl
-platform/external/bison
-platform/external/blktrace
-platform/external/bluetooth/bluez
-platform/external/bluetooth/glib
-platform/external/bluetooth/hcidump
-platform/external/bouncycastle
-platform/external/bsdiff
-platform/external/bzip2
-platform/external/chromium
-platform/external/clearsilver
-platform/external/dbus
-platform/external/dhcpcd
-platform/external/dnsmasq
-platform/external/dropbear
-platform/external/e2fsprogs
-platform/external/easymock
-platform/external/elfutils
-platform/external/embunit
-platform/external/emma
-platform/external/esd
-platform/external/expat
-platform/external/fdlibm
-platform/external/freetype
-platform/external/fsck_msdos
-platform/external/genext2fs
-platform/external/giflib
-platform/external/grub
-platform/external/gtest
-platform/external/guava
-platform/external/icu4c
-platform/external/iproute2
-platform/external/ipsec-tools
-platform/external/iptables
-platform/external/jdiff
-platform/external/jhead
-platform/external/jpeg
-platform/external/jsr305
-platform/external/junit
-platform/external/kernel-headers
-platform/external/libffi
-platform/external/libgsm
-platform/external/libnfc-nxp
-platform/external/libpcap
-platform/external/libpng
-platform/external/libvpx
-platform/external/libxml2
-platform/external/mtpd
-platform/external/netcat
-platform/external/netperf
-platform/external/neven
-platform/external/nist-sip
-platform/external/oauth
-platform/external/openssl
-platform/external/oprofile
-platform/external/ping
-platform/external/ppp
-platform/external/proguard
-platform/external/protobuf
-platform/external/qemu
-platform/external/quake
-platform/external/safe-iop
-platform/external/sonivox
-platform/external/speex
-platform/external/sqlite
-platform/external/srec
-platform/external/stlport
-platform/external/strace
-platform/external/tagsoup
-platform/external/tcpdump
-platform/external/tinyxml
-platform/external/tremolo
-platform/external/v8
-platform/external/wpa_supplicant
-platform/external/wpa_supplicant_6
-platform/external/xmlwriter
-platform/external/yaffs2
-platform/external/zlib
-platform/frameworks/ex
-platform/hardware/libhardware
-platform/hardware/libhardware_legacy
-platform/hardware/ril
-platform/ndk
-platform/packages/apps/AccountsAndSyncSettings
-platform/packages/apps/Bluetooth
-platform/packages/apps/Browser
-platform/packages/apps/Calculator
-platform/packages/apps/Calendar
-platform/packages/apps/Camera
-platform/packages/apps/CertInstaller
-platform/packages/apps/Contacts
-platform/packages/apps/DeskClock
-platform/packages/apps/Email
-platform/packages/apps/Gallery
-platform/packages/apps/Gallery3D
-platform/packages/apps/HTMLViewer
-platform/packages/apps/Launcher2
-platform/packages/apps/Mms
-platform/packages/apps/Music
-platform/packages/apps/Nfc
-platform/packages/apps/PackageInstaller
-platform/packages/apps/Phone
-platform/packages/apps/Protips
-platform/packages/apps/QuickSearchBox
-platform/packages/apps/Settings
-platform/packages/apps/SoundRecorder
-platform/packages/apps/SpeechRecorder
-platform/packages/apps/Stk
-platform/packages/apps/Tag
-platform/packages/apps/VoiceDialer
-platform/packages/experimental
-platform/packages/inputmethods/LatinIME
-platform/packages/inputmethods/OpenWnn
-platform/packages/inputmethods/PinyinIME
-platform/packages/providers/ApplicationsProvider
-platform/packages/providers/CalendarProvider
-platform/packages/providers/ContactsProvider
-platform/packages/providers/DownloadProvider
-platform/packages/providers/DrmProvider
-platform/packages/providers/GoogleContactsProvider
-platform/packages/providers/MediaProvider
-platform/packages/providers/TelephonyProvider
-platform/packages/providers/UserDictionaryProvider
-platform/packages/wallpapers/Basic
-platform/packages/wallpapers/LivePicker
-platform/packages/wallpapers/MagicSmoke
-platform/packages/wallpapers/MusicVisualization
-platform/prebuilt
-platform/sdk
-platform/system/bluetooth
-platform/system/extras
-platform/system/netd

=== modified file 'mirror.conf'
--- mirror.conf	2011-11-23 18:53:52 +0000
+++ mirror.conf	2011-12-09 15:10:28 +0000
@@ -1,7 +1,9 @@
 [DESTINATION]
 # Usecase 1: target is Gerrit
-$repo_root = ssh://[e-mail]:29418
-$gerrit_host = [e-mail]
+#$repo_root = ssh://[e-mail]:29418
+#$gerrit_host = [e-mail]
+$repo_root = ssh://linaro-aosp-sync-bot@gerrit-git:29418
+$gerrit_host = linaro-aosp-sync-bot@gerrit-git
 $gerrit_port = 29418
 
 # Usecase 2: target is a remote tree
@@ -26,5 +28,5 @@
 #$active = false
 kernel/omap = kernel/omap-omapzoom
 
-[git://github.com]
+[https://github.com]
 msg555/PowerTutor = platform/packages/apps/PowerTutor

=== added directory 'old'
=== renamed file 'gerrit-create-projects.py' => 'old/gerrit-create-projects.py'
=== renamed file 'ls-projects2gerrit.py' => 'old/ls-projects2gerrit.py'
=== renamed file 'manifest2gerrit.py' => 'old/manifest2gerrit.py'
=== renamed file 'mirror-aosp-project.sh' => 'old/mirror-aosp-project.sh'
=== renamed file 'sync-aosp.sh' => 'old/sync-aosp.sh'
=== renamed file 'sync-linaro.sh' => 'old/sync-linaro.sh'
=== modified file 're-remote.sh'
--- re-remote.sh	2011-11-01 21:35:13 +0000
+++ re-remote.sh	2011-12-09 15:10:28 +0000
@@ -1,1 +1,2 @@
+# Replace one git remote URL with another, similar to svn switch --relocate
 find -path '*.git/config' | xargs -n1 sed -i.bak -e's%git://android.git.kernel.org/%https://android.googlesource.com/%'