autobuild now building samba with cluster support! (Re: [SCM] Samba Shared Repository - branch master updated)

[David Disseldorp]

On Thu, 28 Jun 2012 10:17:58 +0930
Rusty Russell <rusty at ozlabs.org> wrote:

> In fact, I think autobuild.py should have a --ctdb-git= option where it
> fetches a ctdb git tree.

It may also be worth considering using git submodules, that way Samba
and CTDB projects can be tracked from a single parent repository.
Integrated samba/ctdb test infrastructure could then be added to the
parent tree.
Main advantages I see are that separate commit logs are maintained for
both projects, developers can continue to work on samba and ctdb in
isolation, integrators can use the parent tree and test/commit/tag
appropriately supported combinations.
Main disadvantages are that working with git submodules is a bit
cumbersome IMO, also integrators have yet another git tree to look
after.

Cheers, David

ddiss at d115:~/isms> mkdir samba_with_ctdb
ddiss at d115:~/isms> cd samba_with_ctdb
ddiss at d115:~/isms/samba_with_ctdb> git init
Initialized empty Git repository in /home/ddiss/isms/samba_with_ctdb/.git/
ddiss at d115:~/isms/samba_with_ctdb> git submodule add git://git.samba.org/samba.git samba
Initialized empty Git repository in /home/ddiss/isms/samba_with_ctdb/samba/.git/
remote: Counting objects: 1082538, done.
remote: Compressing objects: 100% (244050/244050), done.
remote: Total 1082538 (delta 836432), reused 1078716 (delta 832842)
Receiving objects: 100% (1082538/1082538), 211.54 MiB | 3.98 MiB/s, done.
Resolving deltas: 100% (836432/836432), done.
ddiss at d115:~/isms/samba_with_ctdb> git submodule add git://git.samba.org/ctdb.git ctdb
Initialized empty Git repository in /home/ddiss/isms/samba_with_ctdb/ctdb/.git/
remote: Counting objects: 29503, done.
remote: Compressing objects: 100% (10033/10033), done.
remote: Total 29503 (delta 21450), reused 26412 (delta 18943)
Receiving objects: 100% (29503/29503), 5.05 MiB | 1.50 MiB/s, done.
Resolving deltas: 100% (21450/21450), done.
ddiss at d115:~/isms/samba_with_ctdb> ls
ctdb  samba
ddiss at d115:~/isms/samba_with_ctdb> cd samba
ddiss at d115:~/isms/samba_with_ctdb/samba> git checkout samba-3.6.6 -b samba-3.6.6
Switched to a new branch 'samba-3.6.6'
ddiss at d115:~/isms/samba_with_ctdb/samba> cd ../ctdb/
ddiss at d115:~/isms/samba_with_ctdb/ctdb> git checkout ctdb-1.0.114.5 -b ctdb-1.0.114.5
Switched to a new branch 'ctdb-1.0.114.5'
ddiss at d115:~/isms/samba_with_ctdb/ctdb> cd ../

ddiss at d115:~/isms/samba_with_ctdb> git commit -a -m "samba 3.6.6 alongside ctdb 1.0.114.5"
[master (root-commit) 07db166] samba 3.6.6 alongside ctdb 1.0.114.5
 3 files changed, 8 insertions(+), 0 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 ctdb
 create mode 160000 samba