Merge "Add Workspace Permission Fix Wrapper for SampleVNF"

[releng.git] / jjb / samplevnf / samplevnf.yaml

diff --git a/jjb/samplevnf/samplevnf.yaml b/jjb/samplevnf/samplevnf.yaml
index 82c8f9b..e4413c0 100644 (file)
--- a/jjb/samplevnf/samplevnf.yaml
+++ b/jjb/samplevnf/samplevnf.yaml
@@ -11,13 +11,13 @@
     stream:
       - master:
           branch: '{stream}'
-          gs-pathname: ''
-          docker-tag: 'latest'
+          gs-pathname: 'artifacts.opnfv.org/samplevnf/images'
+          tag: 'latest'
           disabled: false
       - jerma:
           branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          docker-tag: 'stable'
+          gs-pathname: 'artifacts.opnfv.org/samplevnf/images'
+          tag: '{stream}'
           disabled: false
 
 - job-template:
@@ -25,6 +25,10 @@
 
     disabled: '{obj:disabled}'
 
+    wrappers:
+      - ssh-agent-wrapper
+      - fix-workspace-permissions
+
     parameters:
       - project-parameter:
           project: '{project}'
@@ -55,13 +59,17 @@
     builders:
       - shell: |
           cd $WORKSPACE/rapidvm/dib
-          bash build-image.sh
+          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}'
@@ -85,6 +93,10 @@
                 exclude-drafts: 'false'
                 exclude-trivial-rebase: 'false'
                 exclude-no-code-change: 'false'
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
@@ -97,4 +109,4 @@
           sudo pip install tox-pip-version
           cd $WORKSPACE && tox -e docs
           cd $WORKSPACE/rapidvm/dib
-          bash verify-image.sh -v
+          bash build-image.sh -g {gs-pathname} -i {tag} -v -w $WORKSPACE