From: Matt Rose Date: Wed, 15 May 2019 19:51:03 +0000 (-0400) Subject: fix multiline and comments in Jenkinsfile X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d03f596d24877263dfec5dcb408b9fc55fc6e18;p=thirdparty%2Ffreeradius-server.git fix multiline and comments in Jenkinsfile --- diff --git a/scripts/travis/Jenkinsfile b/scripts/travis/Jenkinsfile index 4be36348095..d80b916c92a 100644 --- a/scripts/travis/Jenkinsfile +++ b/scripts/travis/Jenkinsfile @@ -1,11 +1,12 @@ -# Initialize a variable to hold the matrix of travis builds +// Initialize a variable to hold the matrix of travis builds tmatrix = [] -# This function takes a list of tests and builds closures for each test to -# be run in it's own docker container. It's a little strange, and uses a -# functional programming trick (function currying) to create a closure that -# can be passed to the "parallel" function, which can only take one argument -# in this context +/* This function takes a list of tests and builds closures for each test to +* be run in it's own docker container. It's a little strange, and uses a +* functional programming trick (function currying) to create a closure that +* can be passed to the "parallel" function, which can only take one argument +* in this context +*/ def buildClosures(arg) { println arg.inspect() @@ -16,8 +17,8 @@ def buildClosures(arg) { closures[value] = { testEnv_str -> def(dir,testEnv) = testEnv_str.split(":") stage("$testEnv") { - # Docker needs full privileges and capabilites to run the tests - # This passes the necessary arguments to "docker run" + // Docker needs full privileges and capabilites to run the tests + // This passes the necessary arguments to "docker run" travisImage.inside("--privileged --cap-add=ALL") { checkout([$class: 'GitSCM',\ branches: [[name: scm.branches[0].name]],\ @@ -25,8 +26,7 @@ def buildClosures(arg) { extensions: [[$class: 'CleanCheckout'],\ [$class: 'CleanBeforeCheckout'],\ [$class: 'RelativeTargetDirectory', relativeTargetDir: dir]],\ - submoduleCfg: [],\ - userRemoteConfigs: [[url: 'https://github.com/FreeRADIUS/freeradius-server']]]) + submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/FreeRADIUS/freeradius-server']]]) sh "cd $dir ; export ${testEnv} ; bash scripts/travis/startservice.sh" } } @@ -35,11 +35,12 @@ def buildClosures(arg) { closures } -# This section does three things -# 1. Checkout the repo for the necessary setup files -# 2. Reads the test matrix from the .travis.yml and converts it into a list that -# can be passed to the buildClosures function -# 3. runs each test matrix under gcc and clang in parallel. +/* This section does three things +* 1. Checkout the repo for the necessary setup files +* 2. Reads the test matrix from the .travis.yml and converts it into a list that +* can be passed to the buildClosures function +* 3. runs each test matrix under gcc and clang in parallel. +*/ node { cleanWs()