commit d1c4575407e95a6fb29200656fa7c968baf3f98d
author Joey Armstrong <joey@opennetworking.org> Tue Aug 29 16:56:05 2023 -0400
committer Joey Armstrong <joey@opennetworking.org> Tue Aug 29 16:56:05 2023 -0400
tree bf8c570c46f0594a580f9fb576f89620a43b8b29
parent db9caab1c257c2611e907f7e1ed6c418d2524941

Vars with braces require esc, simple quoted var deref does not

Change-Id: If73576e4c833afb4a5ee374d173bb4c9971ce811

jjb/pipeline/voltha/master/bbsim-tests.groovy

diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index a188469..d77d472 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -203,7 +203,7 @@
                     String iam = getIam('Deploy Voltha')
                     String onosLog = "${logsDir}/onos-voltha-startup-combined.log"
                     sh("""
-          mkdir -p ${logsDir}
+          mkdir -p "$logsDir"
           touch "$onosLog"
           echo "** kail-startup ENTER: \$(date)" > "$onosLog"
 
@@ -424,7 +424,7 @@
       cd "${logsDir}"
 
       echo "** Available logs:"
-      /bin/ls -l "${logsDir}"
+      /bin/ls -l "\$logsDir"
       echo
 
       declare -i count=0

jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy

diff --git a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
index 8a2332d..5372846 100644
--- a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
@@ -203,7 +203,7 @@
                     String iam = getIam('Deploy Voltha')
                     String onosLog = "${logsDir}/onos-voltha-startup-combined.log"
                     sh("""
-          mkdir -p ${logsDir}
+          mkdir -p "$logsDir"
           touch "$onosLog"
           echo "** kail-startup ENTER: \$(date)" > "$onosLog"
 
@@ -424,7 +424,7 @@
       cd "${logsDir}"
 
       echo "** Available logs:"
-      /bin/ls -l "${logsDir}"
+      /bin/ls -l "$logsDir"
       echo
 
       # readarray -t logs < <(find . -name '*-combined.log' -print)