X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fqtip%2Fqtip-verify-jobs.yml;h=12cfa95b76b444f09ed52734b38a25d3f3c8b204;hb=a92e3a3763ea8c45552996866ca15eef200d86fd;hp=26a97066f8ec346a6802c1869e16d2cdd8f030c8;hpb=fdbb13462e85aefb8f7176e2e61256eda7058b8e;p=releng.git

diff --git a/jjb/qtip/qtip-verify-jobs.yml b/jjb/qtip/qtip-verify-jobs.yml
index 26a97066f..12cfa95b7 100644
--- a/jjb/qtip/qtip-verify-jobs.yml
+++ b/jjb/qtip/qtip-verify-jobs.yml
@@ -8,14 +8,12 @@
     project: qtip
     jobs:
       - 'qtip-verify-{stream}'
-      - 'qtip-review-notebook-{stream}'
-      - 'qtip-merge-{stream}'
     stream:
       - master:
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - danube:
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
@@ -67,9 +65,10 @@
       - publish-coverage
       - email-jenkins-admins-on-failure
 
-# upload juypter notebook to artifacts for review
+# Upload juypter notebook to artifacts for review
+# TODO(yujunz): deal with *.ipynb deletion
 - job-template:
-    name: 'qtip-review-notebook-{stream}'
+    name: 'qtip-verify-notebook-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -104,14 +103,14 @@
               disable-strict-forbidden-file-verification: 'true'
               file-paths:
                 - compare-type: ANT
-                  pattern: 'examples/**'
+                  pattern: '**/*.ipynb'
 
     builders:
       - upload-under-review-notebooks-to-opnfv-artifacts
       - report-build-result-to-gerrit
 
 - job-template:
-    name: 'qtip-merge-{stream}'
+    name: 'qtip-merged-notebook-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -123,10 +122,6 @@
           name: GS_URL
           default: '$GS_BASE{gs-pathname}'
           description: "Directory where the build artifact will be located upon the completion of the build."
-      - string:
-          name: GERRIT_REFSPEC
-          default: 'refs/heads/{branch}'
-          description: "JJB configured GERRIT_REFSPEC parameter"
 
     scm:
       - git-scm
@@ -146,7 +141,7 @@
                   branch-pattern: '**/{branch}'
               file-paths:
                 - compare-type: ANT
-                  pattern: examples/**
+                  pattern: '**/*ipynb'
 
     builders:
       - remove-old-docs-from-opnfv-artifacts
@@ -178,7 +173,6 @@
           export PATH=$PATH:/usr/local/bin/
 
           [[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
-          [[ -d examples ]] || exit 0
 
           echo
           echo "###########################"
@@ -190,8 +184,10 @@
           gs_path="$gs_base/$GERRIT_CHANGE_NUMBER"
           local_path="upload/$GERRIT_CHANGE_NUMBER"
 
-          mkdir -p upload
-          cp -r examples "$local_path"
+          mkdir -p $local_path
+
+          git diff HEAD~1 --name-status | grep -E "[AM]\t.+\.ipynb$" | awk '{print $2}' \
+            | xargs -I '{}' cp '{}' $local_path
           gsutil -m cp -r "$local_path" "gs://$gs_base/"
 
           echo "Document link(s):" >> gerrit_comment.txt