whitespace

diff --git a/scripts/jenkins/Jenkinsfile.defs b/scripts/jenkins/Jenkinsfile.defs
index 89cb231ba68f7d7ceae0a31f2f21ef078b309d61..4ef31c42706054f3a0e33c4df52e6d833d39abe6 100644 (file)
--- a/scripts/jenkins/Jenkinsfile.defs
+++ b/scripts/jenkins/Jenkinsfile.defs
@@ -1,78 +1,104 @@
 platforms = ["centos7", "debian9", "ubuntu16", "ubuntu18"]
 artifacts = 'build-number, **/*.changes, **/*.buildinfo, **/*.deb, **/*.rpm'
 
-/*  The detectChanges function looks at the last git commit and searches for changes to
- *   "redhat/freeradius.spec" or anything in the "debian" directory.  If it
- *   finds any changes to those files it returns the string " --no-cache "
- *   which can be fed to a docker build command to tell docker to rebuild
- *   the image from scratch so that it can pick up any new dependencies
- *   specified in those package manifest files
+
+/*
+ *  The detectChanges function looks at the last git commit and
+ *  searches for changes to "redhat/freeradius.spec" or anything
+ *  in the "debian" directory.  If it finds any changes to those
+ *  files it returns the string " --no-cache " which can be fed to
+ *  a docker build command to tell docker to rebuild the image
+ *  from scratch so that it can pick up any new dependencies
+ *  specified in those package manifest files
  */
 
 def detectChanges() {
-    def string = ""
-    def changeLogSets = currentBuild.changeSets
-    for (int i = 0; i < changeLogSets.size(); i++) {
-        def entries = changeLogSets[i].items
-        for (int j = 0; j < entries.length; j++) {
-            def entry = entries[j]
-            def files = new ArrayList(entry.affectedFiles)
-            for (int k = 0; k < files.size(); k++) {
-                def file = files[k]
-                if (file.path =~ /(^debian\/.*)|(redhat\/freeradius.spec)/) {
-                    echo "changes in file ${file.path}, passing --no-cache flag to docker build"
-                    string = " --no-cache "
-                    return string
-                }
-            }
-        }
-    }
-    return string
+       def string = ""
+       def changeLogSets = currentBuild.changeSets
+
+       for (int i = 0; i < changeLogSets.size(); i++) {
+               def entries = changeLogSets[i].items
+
+               for (int j = 0; j < entries.length; j++) {
+                       def entry = entries[j]
+                       def files = new ArrayList(entry.affectedFiles)
+
+                       for (int k = 0; k < files.size(); k++) {
+                               def file = files[k]
+
+                               if (file.path =~ /(^debian\/.*)|(redhat\/freeradius.spec)/) {
+                                       echo "changes in file ${file.path}, passing --no-cache flag to docker build"
+                                       string = " --no-cache "
+                                       return string
+                               }
+                       }
+               }
+       }
+       return string
 }
 
+
 /*
- *  The buildClosures function is the core function of the script and uses
- *  function currying to be able to pass multiple dynamically generated
- *  jenkins build commands into a jenkins parallel block.
- *  This function ensures that the docker image is built and builds
- *  FreeRADIUS packages inside the docker image
+ *  The buildClosures function is the core function of the script
+ *  and uses function currying to be able to pass multiple
+ *  dynamically generated jenkins build commands into a jenkins
+ *  parallel block. This function ensures that the docker image is
+ *  built and builds FreeRADIUS packages inside the docker image
  */
 
 def buildClosures(arg, scmBranches, scmURC) {
-    println arg.inspect()
-    def platforms = arg
-    def closures = [:]
-    for (value in platforms) {
-        //final valueCopy = value
-
-        closures[value] = {platform ->
-                stage("build-${platform}") {
-                    rebuild = detectChanges()
-                    docker.build("${platform}-master-test","${rebuild} -f ./scripts/docker/build-${platform}/Dockerfile.deps ./scripts/docker/build-${platform}").inside {
-
-                        checkout([$class: 'GitSCM', branches: scmBranches, userRemoteConfigs: scmURC, extensions: [[$class: 'CleanBeforeCheckout'],[$class: 'RelativeTargetDirectory', relativeTargetDir: "${platform}/build"],[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false]], submoduleCfg: []])
-                        sh "cat /etc/os-release || cat /etc/redhat-release"
-                        def commit_num = readFile("./build-number").trim()
-                        dir("${platform}/build/") {
-                            if (platform.contains("centos")) {
-                                sh "sed -i -e \"s/^Release:.*\$/Release: ${commit_num}/\" redhat/freeradius.spec"
-                                sh 'RADIUSD_VERSION_STRING=$(cat VERSION) make rpm'
-                                sh "mv rpmbuild/RPMS/x86_64/*.rpm .."
-                            } else {
-                                sh "apt-get install -y unixodbc-dev"
-                                def version = sh (script: "dpkg-parsechangelog | grep '^Version: ' | awk '{print \$2}'", returnStdout: true).trim()
-                                def commit_msg = sh (script: "git log --oneline -1 \$GIT_COMMIT", returnStdout: true).trim()
-
-                                sh "dch -b -v ${version}-${commit_num} \"${commit_msg}\""
-                                sh "make deb"
-                            }
-                        }
-                    }
-                }
-                echo platform.toString()
-            }.curry(value)
-    }
-    closures
+       println arg.inspect()
+       def platforms = arg
+       def closures = [:]
+       for (value in platforms) {
+
+               closures[value] = {platform ->
+                       stage("build-${platform}") {
+                               rebuild = detectChanges()
+                               docker.build("${platform}-master-test","${rebuild} -f ./scripts/docker/build-${platform}/Dockerfile.deps ./scripts/docker/build-${platform}").inside {
+
+                                       checkout([$class: 'GitSCM',
+                                               branches: scmBranches,
+                                               userRemoteConfigs: scmURC,
+                                               extensions: [
+                                                       [$class: 'CleanBeforeCheckout'],
+                                                       [$class: 'RelativeTargetDirectory',
+                                                               relativeTargetDir: "${platform}/build"
+                                                       ],
+                                                       [$class: 'CloneOption',
+                                                               depth: 0,
+                                                               noTags: false,
+                                                               reference: '',
+                                                               shallow: false]
+                                                       ],
+                                               submoduleCfg: []
+                                       ])
+
+                                       sh "cat /etc/os-release || cat /etc/redhat-release"
+
+                                       def commit_num = readFile("./build-number").trim()
+       
+                                       dir("${platform}/build/") {
+                                               if (platform.contains("centos")) {
+                                                       sh "sed -i -e \"s/^Release:.*\$/Release: ${commit_num}/\" redhat/freeradius.spec"
+                                                       sh 'RADIUSD_VERSION_STRING=$(cat VERSION) make rpm'
+                                                       sh "mv rpmbuild/RPMS/x86_64/*.rpm .."
+                                               } else {
+                                                       sh "apt-get install -y unixodbc-dev"
+                                                       def version = sh (script: "dpkg-parsechangelog | grep '^Version: ' | awk '{print \$2}'", returnStdout: true).trim()
+                                                       def commit_msg = sh (script: "git log --oneline -1 \$GIT_COMMIT", returnStdout: true).trim()
+
+                                                       sh "dch -b -v ${version}-${commit_num} \"${commit_msg}\""
+                                                       sh "make deb"
+                                               }
+                                       }
+
+                               }
+                       }
+                       echo platform.toString()
+               }.curry(value)
+       }
+       closures
 }