From 3db5f27aecff1cb858302e3833a46195efd91238 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Tue, 28 May 2019 15:37:10 +0200 Subject: [PATCH] Adjust parameters of socInstaler.py to re-enable nightly builds on bop. --- bootstrap/socInstaller.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bootstrap/socInstaller.py b/bootstrap/socInstaller.py index 98c2488f..63164758 100755 --- a/bootstrap/socInstaller.py +++ b/bootstrap/socInstaller.py @@ -468,7 +468,7 @@ try: if conf.rmSource: gitCoriolis.removeLocalRepo() gitCoriolis.clone () - gitCoriolis.checkout( 'devel_anabatic' ) + gitCoriolis.checkout( 'devel' ) if conf.rmSource: gitBenchs.removeLocalRepo() gitBenchs.clone() @@ -491,14 +491,14 @@ try: benchsCommand = 'cd %s/benchs && ../bin/go.sh' % (gitBenchs.localRepoDir) commands = \ - [ ( conf.targets['SL7_64'], buildCommand % (3,conf.debugArg) , conf.fds['build' ] ) + [ ( conf.targets['SL7_64'], buildCommand % (6,conf.debugArg) , conf.fds['build' ] ) , ( conf.targets['SL7_64'], buildCommand % (1,conf.debugArg+' --doc') , conf.fds['build' ] ) , ( conf.targets['SL7_64'], benchsCommand , conf.fds['benchs'] ) - #, ( conf.targets['SL6_64'], buildCommand % (6,conf.debugArg+' --devtoolset-8') , conf.fds['build' ] ) - #, ( conf.targets['SL6_64'], buildCommand % (1,conf.debugArg+' --devtoolset-8 --doc'), conf.fds['build' ] ) + #, ( conf.targets['SL6_64'], buildCommand % (6,conf.debugArg+' --devtoolset=8') , conf.fds['build' ] ) + #, ( conf.targets['SL6_64'], buildCommand % (1,conf.debugArg+' --devtoolset=8 --doc'), conf.fds['build' ] ) #, ( conf.targets['SL6_64'], benchsCommand , conf.fds['benchs'] ) - #, ( conf.targets['SL6'] , buildCommand % (2,conf.debugArg+' --devtoolset-8') , conf.fds['build' ] ) - #, ( conf.targets['SL6'] , buildCommand % (1,conf.debugArg+' --devtoolset-8 --doc'), conf.fds['build' ] ) + #, ( conf.targets['SL6'] , buildCommand % (2,conf.debugArg+' --devtoolset=8') , conf.fds['build' ] ) + #, ( conf.targets['SL6'] , buildCommand % (1,conf.debugArg+' --devtoolset=8 --doc'), conf.fds['build' ] ) #, ( conf.targets['SL6'] , benchsCommand , conf.fds['benchs'] ) ]