Merge "Fix the wrong pod and job name of Daisy"

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 28888d6..2267a28 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -148,8 +148,6 @@
         - 'functest-suite-builder'
         - shell: |
             functest_log="$HOME/opnfv/functest/results/{stream}/{project}.log"
-            to_be_archived="$WORKSPACE/tests/functest-{project}.log"
-            cp $functest_log $to_be_archived
             # NOTE: checking the test result, as the previous job could return
             #       0 regardless the result of doctor test scenario.
             grep -e ' OK$' $functest_log || exit 1
@@ -157,6 +155,8 @@
     publishers:
         - archive:
             artifacts: 'tests/*.log'
+        - archive:
+            artifacts: '$HOME/opnfv/functest/results/{stream}/{project}.log'
 
 
 #####################################

diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml
index 69fcefc..7f3d6ce 100644 (file)
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.yml
@@ -55,7 +55,11 @@
                     branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
-                    pattern: 'docs/**|.gitignore'
+                    pattern: 'docs/**'
+                  - compare-type: ANT
+                    pattern: 'governance/**'
+                  - compare-type: ANT
+                    pattern: '*.txt|.gitignore|.gitreview|INFO|LICENSE'
 
     builders:
         - shell: |