[PATCH] Make autobuild on newer ubuntu possible

[Jelmer Vernooij]

On Tue, Apr 14, 2015 at 12:27:16PM +1200, Andrew Bartlett wrote:
> On Mon, 2015-04-13 at 12:28 +0200, Jelmer Vernooij wrote:
> 
> > Could we rather just blacklist those files, instead of allowing a blanket
> > "ignore all changes" ?
> > 
> > This problem seems intrinsic to all files that are autogenerated *and* checked
> > in if there are multiple versions of the generator out there. We don't
> > have many files that fall into this category - the pidl files are the only I
> > can think of at the moment.
> 
> I think you will prefer this patch set then.
> 
> I also fix up another pet annoyance of mine, that is when testing
> changes like this, we now automatically skip the 60-600 second wait for
> modules other than the main samba build.
> 
> Please review/push.

Yes, this is much nicer - thanks! :)

Feel free to push with "Reviewed-By: me". Alternatively, I can do so this
weekend.

Cheers,

Jelmer

> From 1ac314dae40096007154fa50005cb370b56263cd Mon Sep 17 00:00:00 2001
> From: Andrew Bartlett <abartlet at samba.org>
> Date: Tue, 14 Apr 2015 11:59:57 +1200
> Subject: [PATCH 1/4] autobuild: Do not wait when running just one target
> 
> This avoids having to remember to specify AUTOBUILD_RANDOM_SLEEP_OVERRIDE manually
> 
> Signed-off-by: Andrew Bartlett <abartlet at samba.org>
> ---
>  script/autobuild.py | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/script/autobuild.py b/script/autobuild.py
> index 6e1e3e0..3c788dd 100755
> --- a/script/autobuild.py
> +++ b/script/autobuild.py
> @@ -230,6 +230,11 @@ class buildlist(object):
>          self.retry = None
>          if tasknames == []:
>              tasknames = defaulttasks
> +        else:
> +            # If we are only running one test,
> +            # do not sleep randomly to wait for it to start
> +            os.environ['AUTOBUILD_RANDOM_SLEEP_OVERRIDE'] = '1'
> +
>          for n in tasknames:
>              b = builder(n, tasks[n])
>              self.tlist.append(b)
> -- 
> 2.1.4
> 

> From d9b55e764c2514051afef613a457bcb636db7c43 Mon Sep 17 00:00:00 2001
> From: Andrew Bartlett <abartlet at samba.org>
> Date: Tue, 14 Apr 2015 12:03:43 +1200
> Subject: [PATCH 2/4] .gitignore: Ignore pidl/MYMETA.json
> 
> This is generated by newer versions of MakeMaker
> 
> Signed-off-by: Andrew Bartlett <abartlet at samba.org>
> ---
>  .gitignore | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.gitignore b/.gitignore
> index aa51a37..a4c2a69 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -21,6 +21,7 @@ pidl/cover_db
>  pidl/Makefile
>  pidl/pm_to_blib
>  pidl/MYMETA.yml
> +pidl/MYMETA.json
>  packaging/RHEL-CTDB/samba.spec
>  packaging/RHEL/samba.spec
>  packaging/RHEL/makerpms.sh
> -- 
> 2.1.4
> 

> From a83a3332319a47f8d9d5d7014a631a9355409463 Mon Sep 17 00:00:00 2001
> From: Andrew Bartlett <abartlet at samba.org>
> Date: Tue, 14 Apr 2015 12:00:36 +1200
> Subject: [PATCH 3/4] Improve output of check-clean-tree.sh script
> 
> Signed-off-by: Andrew Bartlett <abartlet at samba.org>
> ---
>  script/clean-source-tree.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/script/clean-source-tree.sh b/script/clean-source-tree.sh
> index d0107f6..ea9e6e3 100755
> --- a/script/clean-source-tree.sh
> +++ b/script/clean-source-tree.sh
> @@ -5,8 +5,8 @@ N=`git clean -n | wc -l`
>  C=`git diff --stat HEAD | wc -l`
>  
>  test x"$N" != x"0" && {
> -	echo "The tree has uncommitted changes!!! see stderr"
> -	echo "The tree has uncommitted changes!!!" >&2
> +	echo "The tree has $N new uncommitted files!!! see stderr"
> +	echo "The tree has $N new uncommitted files!!!" >&2
>  
>  	echo "git clean -n" >&2
>  	git clean -n >&2
> -- 
> 2.1.4
> 

> From 0545894f12e1f48da4c51f36dd12f2e44457ddb4 Mon Sep 17 00:00:00 2001
> From: Andrew Bartlett <abartlet at samba.org>
> Date: Tue, 14 Apr 2015 12:19:56 +1200
> Subject: [PATCH 4/4] autobuild: Do not consider IDL.pm and Expr.pm changes to
>  make a build bad
> 
> This allows a different yapp to be installed on the build host without failing
> the whole autobuild
> 
> Signed-off-by: Andrew Bartlett <abartlet at samba.org>
> ---
>  script/autobuild.py | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/script/autobuild.py b/script/autobuild.py
> index 3c788dd..3c455bd 100755
> --- a/script/autobuild.py
> +++ b/script/autobuild.py
> @@ -150,6 +150,7 @@ tasks = {
>                 ("make", "make", "text/plain"),
>                 ("test", "make test", "text/plain"),
>                 ("install", "make install", "text/plain"),
> +               ("checkout-yapp-generated", "git checkout lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm", "text/plain"),
>                 ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),
>                 ("clean", "make clean", "text/plain") ],
>  
> -- 
> 2.1.4
>