commit 8c3333c6c4bcc6e04785cb95210f0f26dcbef09e
author Jeremy Ronquillo <jeremyr@opennetworking.org> Fri Mar 27 12:59:48 2020 -0700
committer Jeremy Ronquillo <jeremyr@opennetworking.org> Mon Mar 30 17:42:13 2020 +0000
tree 1ad8dc023381ae1588686685f12029bf3e507908
parent 43c3501ac2bde0d8ba7c9042432987bdc15dfe10

Fix for REUSE scanning merge commits in omec repos

Change-Id: Ia3aa15857b400d89398b560e58eb65bd9e8c261b

jjb/pipeline/omec-reuse-scan.groovy

diff --git a/jjb/pipeline/omec-reuse-scan.groovy b/jjb/pipeline/omec-reuse-scan.groovy
index 6b471ab..ade6f6e 100644
--- a/jjb/pipeline/omec-reuse-scan.groovy
+++ b/jjb/pipeline/omec-reuse-scan.groovy
@@ -49,20 +49,26 @@
 
         stage("Run REUSE Linter"){
             steps {
-                sh  """
+                sh  '''
                     #!/usr/bin/env bash
 
-                    cd ${params.project}
+                    cd $project
                     git checkout FETCH_HEAD
                     git show
 
                     mkdir ../jenkins-license-scan
-                    cp --parents $(git diff-tree --no-commit-id --name-only -r HEAD) ../jenkins-license-scan
-                    cd ../jenkins-license-scan
+                    modifiedFiles=$(git diff-tree --no-commit-id --name-only -r HEAD)
+                    if [ -n "$modifiedFiles" ]
+                    then
+                        cp --parents "$modifiedFiles" ../jenkins-license-scan
+                        cd ../jenkins-license-scan
 
-                    reuse download --all
-                    reuse lint
-                    """
+                        reuse download --all
+                        reuse lint
+                    else
+                        echo "There were no files to check. Skipping REUSE scan."
+                    fi
+                    '''
             }
         }
     }