Update jobs

Author: Rakshitha Kamath

jobs/macros.yml renamed to globals/macros/macros.yml

@@ -13,7 +13,7 @@
 - builder:
     name: get-node
     builders:
-    - shell: !include-raw: ../build_scripts/common/get-node.sh
+    - shell: !include-raw-verbatim: ../../build_scripts/common/get-node.sh
 
 - property:
     name: nfs-github
@@ -56,7 +56,7 @@
                 exclude-drafts: true
                 exclude-no-code-change: true
             - comment-added-contains-event:
-                comment-contains-value: 'recheck {option}'
+                comment-contains-value: 'recheck all'
           projects:
             - project-compare-type: PLAIN
               project-pattern: 'ffilz/nfs-ganesha'
@@ -162,7 +162,7 @@
             - log-text: Build was aborted
               operator: OR
           script:
-            !include-raw: ../build_scripts/common/return-node.sh
+            !include-raw-verbatim: ../../build_scripts/common/return-node.sh
 
 - publisher:
     name: archive_artifacts

jobs/checkpatch.yml

@@ -32,7 +32,7 @@
         name: GERRIT_USER 
 
     builders:
-    - shell: !include-raw: scripts/checkpatch.sh
+    - shell: !include-raw-verbatim: scripts/checkpatch.sh
 
     triggers:
       - gerrit:

jobs/code_compilation.yml

@@ -32,7 +32,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/common.sh
+    - shell: !include-raw-verbatim: scripts/common.sh
 
     wrappers:
     - gerrithub_key

jobs/dbench.yml

@@ -32,7 +32,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/common.sh
+    - shell: !include-raw-verbatim: scripts/common.sh
 
     wrappers:
     - cleanup-ws

jobs/fsal_template.yml

@@ -33,11 +33,11 @@
 
     builders:
 
-    - shell: !include-raw-escape: scripts/fsal-build.sh
+    - shell: !include-raw-verbatim: scripts/fsal-build.sh
 
     builders:
     - get-node
-    - shell: !include-raw-escape: scripts/fsal-build.sh
+    - shell: !include-raw-verbatim: scripts/fsal-build.sh
 
     triggers:
     -  gerrithub-trigger:

jobs/labelled_nfs.yml

@@ -25,6 +25,7 @@
 
     triggers:
     - gerrithub-trigger:
+        option: 'labelled_nfs'
 
     builders:
     - get-node

jobs/posix-compliance.yml

@@ -35,7 +35,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/posix_compliance.sh
+    - shell: !include-raw-verbatim: scripts/posix_compliance.sh
 
     wrappers:
     - gerrithub_key

jobs/pylint.yml

@@ -27,7 +27,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/pylint.sh
+    - shell: !include-raw-verbatim: scripts/pylint.sh
 
     wrappers:
     - gerrithub_key

jobs/pynfs-acl.yml

@@ -38,7 +38,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/common.sh
+    - shell: !include-raw-verbatim: scripts/common.sh
 
     triggers:
     - gerrithub-trigger:

jobs/pynfs-ceph.yml

@@ -35,7 +35,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/common.sh
+    - shell: !include-raw-verbatim: scripts/common.sh
 
     wrappers:
     - gerrithub_key

jobs/pynfs.yml

@@ -34,7 +34,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/common.sh
+    - shell: !include-raw-verbatim: scripts/common.sh
 
     wrappers:
     - gerrithub_key

jobs/storage-scale.yml

@@ -29,7 +29,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/common.sh
+    - shell: !include-raw-verbatim: scripts/common.sh
 
     wrappers:
     - cleanup-ws

jobs/template_iozone.yml

@@ -44,7 +44,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw-escape: scripts/common.sh  
+    - shell: !include-raw-verbatim: scripts/common.sh  
 
     triggers:
     - gerrithub-trigger:

jobs/trigger-tests.yml

@@ -22,7 +22,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/tests.sh
+    - shell: !include-raw-verbatim: scripts/tests.sh
 
     triggers:
     - gerrithub-trigger:

tests/deploy-nfs-ganesha-ci.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 sed "s/JENKINS_API_KEY/$JENKINS_API_KEY/g" tests/jenkins.conf > jobs/jenkins.ini
-jenkins-jobs --conf jobs/jenkins.ini update jobs
+jenkins-jobs --allow-empty-variables --conf jobs/jenkins.ini update jobs/:globals/macros/