Merge "Add Workspace Permission Fix Wrapper for SampleVNF"

diff --combined jjb/samplevnf/samplevnf.yaml
index d7a5e0c,9549017..e4413c0
--- 1/jjb/samplevnf/samplevnf.yaml
--- 2/jjb/samplevnf/samplevnf.yaml
+++ b/jjb/samplevnf/samplevnf.yaml
@@@ -25,6 -25,10 +25,10 @@@
  
      disabled: '{obj:disabled}'
  
+     wrappers:
+       - ssh-agent-wrapper
+       - fix-workspace-permissions
+ 
      parameters:
        - project-parameter:
            project: '{project}'
@@@ -55,13 -59,17 +59,17 @@@
      builders:
        - shell: |
            cd $WORKSPACE/rapidvm/dib
 -          bash build-image.sh -g {gs-pathname} -i {tag}
 +          bash build-image.sh -g {gs-pathname} -i {tag} -w $WORKSPACE
  
  - job-template:
      name: 'rapid-prox-verify-{stream}'
  
      disabled: '{obj:disabled}'
  
+     wrappers:
+       - ssh-agent-wrapper
+       - fix-workspace-permissions
+ 
      parameters:
        - project-parameter:
            project: '{project}'
@@@ -101,4 -109,4 +109,4 @@@
            sudo pip install tox-pip-version
            cd $WORKSPACE && tox -e docs
            cd $WORKSPACE/rapidvm/dib
 -          bash build-image.sh -g {gs-pathname} -i {tag} -v
 +          bash build-image.sh -g {gs-pathname} -i {tag} -v -w $WORKSPACE