Check, if git is available, before trying to update the client

[buildfarm-client.git] / build-farm.conf.template

diff --git a/build-farm.conf.template b/build-farm.conf.template
index a9c6c6872d4baea430f0e02b8a271179b576a006..ba4714f7b16db4da33e76afacdd2c26266313b50 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -24,32 +24,31 @@ my $branch;
 }
 
 # This template assumes that the user running the buildfarm process is "farm"
 }
 
 # This template assumes that the user running the buildfarm process is "farm"

+my $farm_user_name = 'farm';
+

 %conf =(
     scm => 'git',
     # default is github mirror of Exim
     scmrepo => 'https://github.com/Exim/exim.git',
 %conf =(
     scm => 'git',
     # default is github mirror of Exim
     scmrepo => 'https://github.com/Exim/exim.git',

-    # Wishlist for future, track and build from multiple repos.
-    # Doesn't do anything yet.
-    repos => {
-      'exim' => 'git://www.mrball.net/exim/exim.git',
-      'exim.jgh' => 'git://www.mrball.net/exim/exim-jgh.git',
-      'exim.pdp' => 'git://www.mrball.net/exim/exim-pdp.git',
-      'exim.tlyons' => 'git://www.mrball.net/exim/exim-tlyons.git',
-    },

     # webref for diffs on server - use default for community
     scm_url => undef,
     # for --reference on git repo
     # git_reference => undef,
     # or gmake if required. can include path if necessary.
     make => 'make',
     # webref for diffs on server - use default for community
     scm_url => undef,
     # for --reference on git repo
     # git_reference => undef,
     # or gmake if required. can include path if necessary.
     make => 'make',

+    # 1 = any make will do, 0 = require GNU (default)
+    non_gnu_make => 0,

     # >1 for parallel "make" and "make check" steps
     make_jobs => undef,
     # default is "tar -z -cf runlogs.tgz *.log"
     # replacement must have the same effect
     # must be absolute, can be either Unix or Windows style for MSVC
     tar_log_cmd => undef,
     # >1 for parallel "make" and "make check" steps
     make_jobs => undef,
     # default is "tar -z -cf runlogs.tgz *.log"
     # replacement must have the same effect
     # must be absolute, can be either Unix or Windows style for MSVC
     tar_log_cmd => undef,

+    # If running multiple animals, an explicit common directory for
+    # the lockfile so that runs do not conflict. Otherwise, leave unset.
+    global_lock_dir => "/home/$farm_user_name",

     # this directory must exist before anything will work
     # this directory must exist before anything will work

-    build_root => '/home/farm/buildfarm',
+    build_root => "/home/$farm_user_name/buildfarm",

     # set true to do vpath builds
     use_vpath => undef,
 
     # set true to do vpath builds
     use_vpath => undef,
 


@@ -114,7 +113,7 @@ my $branch;
     build_env =>{
         # use a dedicated cache for the build farm. this should give us
         # very high hit rates and slightly faster cache searching.
     build_env =>{
         # use a dedicated cache for the build farm. this should give us
         # very high hit rates and slightly faster cache searching.

-        CCACHE_DIR => "/home/farm/buildfarm/ccache/$branch",
+        CCACHE_DIR => "/home/$farm_user_name/buildfarm/ccache/$branch",

 
         ### set this if you need a proxy setting for the
         # outbound web transaction that reports the results
 
         ### set this if you need a proxy setting for the
         # outbound web transaction that reports the results


@@ -131,9 +130,18 @@ my $branch;
     makefile_set =>{
         # comment out if not using ccache
         CC => 'ccache gcc',
     makefile_set =>{
         # comment out if not using ccache
         CC => 'ccache gcc',

+        # Required for some tests to pass
+        AUTH_PLAINTEXT => 'yes',
+        SUPPORT_MAILDIR => 'yes',

         # Other examples. Could use makefile_regex instead.
         #SUPPORT_TLS => 'yes',
         # Other examples. Could use makefile_regex instead.
         #SUPPORT_TLS => 'yes',

+        #USE_OPENSSL_PC => 'openssl',

         #TLS_LIBS => '-lssl -lcrypto',
         #TLS_LIBS => '-lssl -lcrypto',

+        #EXPERIMENTAL_SPF => 'yes',
+        #LOOKUP_LDAP => 'yes',
+        #LOOKUP_INCLUDE => '-I/usr/include/mysql',
+        #LOOKUP_LIBS => '-lmysqlclient -lpq -lldap -llber',
+        #LDAP_LIB_TYPE => 'OPENLDAP2',

     },
     # Settings to add to Local/Makefile. These will add to variables that
     # are already defined earlier in the Makefile.  Example:
     },
     # Settings to add to Local/Makefile. These will add to variables that
     # are already defined earlier in the Makefile.  Example:


@@ -144,12 +152,25 @@ my $branch;
         # Or enable debugging flags
         #CFLAGS => '-g -Wall',
         #LFLAGS => '-g',
         # Or enable debugging flags
         #CFLAGS => '-g -Wall',
         #LFLAGS => '-g',

+        # If set EXPERIMENTAL_SPF above, add it to the linker:
+        #LDFLAGS => '-lspf2',

     },
 
     # Another way to enable things in the Local/Makefile.
     # Use a simple regex to change a default to what you want.
     makefile_regex =>[
     },
 
     # Another way to enable things in the Local/Makefile.
     # Use a simple regex to change a default to what you want.
     makefile_regex =>[

-        #q(s/^# EXPERIMENTAL_PRDR.*/EXPERIMENTAL_PRDR=yes/),
+        # If have perl devel libraries installed, can build embedded perl
+        #q(s/^# EXIM_PERL=/EXIM_PERL=/),
+        # If have mysql devel libraries installed
+        #q(s/^# LOOKUP_MYSQL=/LOOKUP_MYSQL=/),
+        # If have postgres devel librarires installed
+        #q(s/^# LOOKUP_PGSQL=/LOOKUP_PGSQL=/),
+        # Severl experimental features to consider
+        #q(s/^# EXPERIMENTAL_CERTNAMES.*/EXPERIMENTAL_CERTNAMES=yes/),
+        #q(s/^# EXPERIMENTAL_DNSSEC.*/EXPERIMENTAL_DNSSEC=yes/),
+        # Proxy causes some extra debug output messing with tests
+        #q(s/^# EXPERIMENTAL_PROXY.*/EXPERIMENTAL_PROXY=yes/),
+        #q(s/^# EXPERIMENTAL_TPDA.*/EXPERIMENTAL_TPDA=yes/),

     ],
 
     # The user compiled as the master exim username.
     ],
 
     # The user compiled as the master exim username.


@@ -161,9 +182,9 @@ my $branch;
 
     # Range of tests to run if enable make_test in optional steps.
     #range_num_tests => '1 999',
 
     # Range of tests to run if enable make_test in optional steps.
     #range_num_tests => '1 999',

-    range_num_tests => '1 999',
+    range_num_tests => '1 5999',

     # Hardcode some valid version for use during make test
     # Hardcode some valid version for use during make test

-    exim_test_version => '4.80',
+    exim_test_version => '4.84',

 
     optional_steps =>{
         # which optional steps to run and when to run them
 
     optional_steps =>{
         # which optional steps to run and when to run them


@@ -179,28 +200,6 @@ my $branch;
         qw()
     ],
 
         qw()
     ],
 

-    # per-branch contents of extra config for check stages.
-    # each branch has an array of setting lines (no \n required)
-    # a DEFAULT entry is used for all branches, before any
-    # branch-specific settings.
-    extra_config =>{
-        DEFAULT => [
-            #q(log_line_prefix = '[%c:%l] '),
-            #"log_connections = 'true'",
-            #"log_disconnections = 'true'",
-            #"log_statement = 'all'",
-            #"fsync = off"
-        ],
-    },
-
-    # Unused
-    # port number actually used will be based on this param and the branch,
-    # so we ensure they don't collide
-    base_port => 5678,
-
-    # Unused
-    modules => [qw(TestUpgrade)],
-

 );
 
 if ($branch eq 'global')
 );
 
 if ($branch eq 'global')