[VOL-5124] - Fix perms on ~/.volt/config
vars/installVoltctl.groovy
--------------------------
o Remove quotes added to protect value of shell var expansion.
o Triple quoted vars passed to sh() require an escaped dollar sign.
o Combination of nested quotes resulted in a literal value with
unexpanded tilda being used.
Change-Id: I91495da1f7c618d955a87832514d0acbc5f9f438
diff --git a/jjb/voltha-e2e/voltha-2.8.yaml b/jjb/voltha-e2e/voltha-2.8.yaml
index 4713a1a..994a79d 100644
--- a/jjb/voltha-e2e/voltha-2.8.yaml
+++ b/jjb/voltha-e2e/voltha-2.8.yaml
@@ -57,7 +57,7 @@
extraHelmFlags: '--set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
olts: 2
timeout: 180
- logLevel: 'INFO'
+ logLevel: 'DEBUG'
testTargets: |
- target: voltha-pm-data-multiolt-kind-att
workflow: att
diff --git a/vars/installVoltctl.groovy b/vars/installVoltctl.groovy
index cfc525d..93963c3 100644
--- a/vars/installVoltctl.groovy
+++ b/vars/installVoltctl.groovy
@@ -58,17 +58,18 @@
umask 022
- declare volt_dir='~/.volt'
- declare volt_cfg='~/.volt/config'
+ declare volt_dir=\$HOME/.volt
+ declare volt_cfg=\$HOME/.volt/config
echo
- echo "** Fixing perms: \$volt_cfg"
- mkdir -p "\$volt_dir"
- chmod -R u+w,go-rwx "\$volt_dir"
- chmod u=rwx "\$volt_dir"
- touch "\$volt_cfg"
- /bin/ls -l "\$volt_dir"
+ echo "** Fixing perms: \$volt_cfg
+ mkdir -p \$volt_dir
+ chmod -R u+w,go-rwx \$volt_dir
+ chmod u=rwx \$volt_dir
+ touch \$volt_cfg
+ /bin/ls -l \$volt_dir
""")
+
leave('fixPerms')
return
}