Re-exec after auto update

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

diff --git a/build-farm.conf.template b/build-farm.conf.template
index dbfabcc42bf226305ed74d6de37ff4efd25db805..fdaa9296496592f210c4ec94e5dc59e54bb968a7 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -24,18 +24,12 @@ my $branch;
 }
 
 # 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',
-    # 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
@@ -50,8 +44,11 @@ my $branch;
     # 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
-    build_root => '/home/farm/buildfarm',
+    build_root => "/home/$farm_user_name/buildfarm",
     # set true to do vpath builds
     use_vpath => undef,
 
@@ -60,10 +57,10 @@ my $branch;
     core_file_glob => "core*",
 
     # build process will connect to this URL to upload results
-    target => "http://eximbuild.mrball.net/cgi-bin/eximstatus.pl",
+    target => "http://buildfarm.exim.org/cgi-bin/eximstatus.pl",
     # update_personality uses this when you want to update your
     # machine's info (OS, version, compiler, version)
-    upgrade_target => "http://eximbuild.mrball.net/cgi-bin/upgrade.pl",
+    upgrade_target => "http://buildfarm.exim.org/cgi-bin/upgrade.pl",
 
     # Your host alias and password in the BuildFarm
     animal => "alias_assigned_by_build_team",
@@ -116,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.
-        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
@@ -168,7 +165,7 @@ my $branch;
         #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
@@ -185,9 +182,9 @@ my $branch;
 
     # 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
-    exim_test_version => '4.80',
+    exim_test_version => '4.84',
 
     optional_steps =>{
         # which optional steps to run and when to run them
@@ -203,28 +200,6 @@ my $branch;
         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')