update cruise config file with config from actual cruise control

2 files changed, 12 insertions, 10 deletions

diff --git a/cruise-control/example.config b/cruise-control/example.config
index 203dbb0b0..257a64253 100644
--- a/cruise-control/example.config
+++ b/cruise-control/example.config
@@ -1,21 +1,17 @@
 # the tmp directory
-MCC_TEMPDIR="/tmp/"
+MCC_TEMPDIR="/disk4/cruise-control/cruise-control/tmp/"
 
 # where logs are saved
-MCC_LOGDIR="/home/cruise/"
-
-# where moses gets checked out, tested etc.
-MCC_WORKDIR="/home/cruise/work/"
+MCC_LOGDIR="/disk4/cruise-control/cruise-control/"
 
 # repository that will be checked out
 MCC_GITREPO="https://github.com/moses-smt/mosesdecoder.git"
 
 # arguments passed to Moses configure
-MCC_CONFIGURE_ARGS=" --with-srilm=/path/to/srilm --with-irstlm=/path/to/irstlm "
+MCC_CONFIGURE_ARGS=" --with-srilm=/disk4/cruise-control/srilm --with-irstlm=/disk4/cruise-control/irstlm --with-dalm=/disk4/cruise-control/DALM --with-cmph=/disk4/cruise-control/cmph-2.0 --with-boost=/disk4/cruise-control/boost_1_55_0 --with-xmlrpc-c=/disk4/cruise-control/xmlrpc-c -j8 "
 
 # list of branches to be checked
-MCC_SCAN_BRANCHES="master"
-
-# regression test data archive (optional, this is the default)
-MCC_REGTEST_ARCHIVE="http://www.statmt.org/moses/reg-testing/moses-reg-test-data-8.tgz"
+MCC_SCAN_BRANCHES="origin/master"
 
+# run full training/eval pipeline using EMS?
+MCC_RUN_EMS="yes"
diff --git a/cruise-control/test_all_new_commits.sh b/cruise-control/test_all_new_commits.sh
index cf9ec7d01..0bc2c04a0 100755
--- a/cruise-control/test_all_new_commits.sh
+++ b/cruise-control/test_all_new_commits.sh
@@ -116,6 +116,12 @@ function run_single_test () {
   #regtest_dir=$PWD/$(basename $regtest_file .tgz)
   cd ..
 
+  # test build with different configurations
+  for configArgs in "${ALTERNATIVE_CONFIGURE_ARGS[@]}"
+  do
+    echo $configArgs
+  done
+
   echo "## ./bjam clean" >> $longlog
   ./bjam clean $MCC_CONFIGURE_ARGS --with-regtest=$regtest_dir >> $longlog 2>&1 || warn "bjam clean failed, suspicious"