From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 13 Nov 2015 20:24:25 +0000 (-0500)
Subject: New include syntax
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=ef63064fd40c71fa23ea36a9121d06936b361add;p=lttng-ci.git

New include syntax
---

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 7239f39..d30974c 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -66,7 +66,7 @@
 
     builders:
       - shell:
-         !include-raw-escape scripts/babeltrace/build.sh
+         !include-raw-escape: scripts/babeltrace/build.sh
 
     # TODO: Scan for open tasks
     publishers:
@@ -127,7 +127,7 @@
 
     builders:
       - shell:
-          !include-raw-escape scripts/babeltrace/scan-build.sh
+          !include-raw-escape: scripts/babeltrace/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -156,7 +156,7 @@
               password: COVERITY_SCAN_TOKEN
     builders:
       - shell:
-          !include-raw-escape scripts/common/coverity.sh
+          !include-raw-escape: scripts/common/coverity.sh
 
     publishers:
       - workspace-cleanup
@@ -180,7 +180,7 @@
            filter: 'build/**'
            target: 'deps/babeltrace'
        - shell:
-          !include-raw-escape scripts/babeltrace/pylint.sh
+          !include-raw-escape: scripts/babeltrace/pylint.sh
 
     publishers:
       - archive:
@@ -206,7 +206,7 @@
 - project:
     name: babeltrace
     version:
-      !include jobs/inc/babeltrace-versions.yaml.inc
+      !include: jobs/inc/babeltrace-versions.yaml.inc
     jobs:
       - 'babeltrace_{version}_{buildtype}':
           buildtype: build
diff --git a/jobs/kernel.yaml b/jobs/kernel.yaml
index 0a1cfd7..6b542e3 100644
--- a/jobs/kernel.yaml
+++ b/jobs/kernel.yaml
@@ -56,7 +56,7 @@
       - shell: |
           git clone --depth=1 -b "v{kversion}" --reference $HOME/gitcache/linux-stable.git/ git://artifacts.internal.efficios.com/git/linux-stable.git linux
       - shell:
-         !include-raw-escape scripts/kernel/build.sh
+         !include-raw-escape: scripts/kernel/build.sh
 
     publishers:
       - archive:
@@ -69,7 +69,7 @@
 - project:
     name: kernel
     kversion:
-      !include jobs/inc/kernel-versions.yaml.inc
+      !include: jobs/inc/kernel-versions.yaml.inc
     jobs:
       - 'kernel_{kversion}_{buildtype}':
           buildtype: build
diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml
index d36e101..727ef0f 100644
--- a/jobs/liburcu.yaml
+++ b/jobs/liburcu.yaml
@@ -82,7 +82,7 @@
 
     builders:
       - shell:
-         !include-raw-escape scripts/liburcu/build.sh
+         !include-raw-escape: scripts/liburcu/build.sh
 
     # TODO: Scan for open tasks
     publishers:
@@ -139,7 +139,7 @@
 
     builders:
       - shell:
-          !include-raw-escape scripts/liburcu/scan-build.sh
+          !include-raw-escape: scripts/liburcu/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -169,7 +169,7 @@
 
     builders:
       - shell:
-          !include-raw-escape scripts/common/coverity.sh
+          !include-raw-escape: scripts/common/coverity.sh
 
     publishers:
       - workspace-cleanup
@@ -179,7 +179,7 @@
 - project:
     name: liburcu
     version:
-      !include jobs/inc/liburcu-versions.yaml.inc
+      !include: jobs/inc/liburcu-versions.yaml.inc
     jobs:
       - 'liburcu_{version}_{buildtype}':
           buildtype: build
diff --git a/jobs/lttng-analyses.yaml b/jobs/lttng-analyses.yaml
index 4da79c7..c698640 100644
--- a/jobs/lttng-analyses.yaml
+++ b/jobs/lttng-analyses.yaml
@@ -57,7 +57,7 @@
           filter: 'build/**'
           target: 'deps/babeltrace'
       - shell:
-         !include-raw-escape scripts/lttng-analyses/build.sh
+         !include-raw-escape: scripts/lttng-analyses/build.sh
 
 #    publishers:
 #      - archive:
@@ -82,7 +82,7 @@
            filter: 'build/**'
            target: 'deps/babeltrace'
        - shell:
-          !include-raw-escape scripts/lttng-analyses/pylint.sh
+          !include-raw-escape: scripts/lttng-analyses/pylint.sh
 
     publishers:
       - archive:
diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml
index 7c5fb39..f834f23 100644
--- a/jobs/lttng-modules.yaml
+++ b/jobs/lttng-modules.yaml
@@ -71,7 +71,7 @@
       - shell: |
           git clone --depth=1 -b "v{kversion}" --reference $HOME/gitcache/linux-stable.git/ git://artifacts.internal.efficios.com/git/linux-stable.git linux
       - shell:
-              !include-raw-escape scripts/lttng-modules/build.sh
+         !include-raw-escape: scripts/lttng-modules/build.sh
 
     publishers:
       - archive:
@@ -109,7 +109,7 @@
 
     builders:
       - shell:
-          !include-raw-escape scripts/common/coverity.sh
+         !include-raw-escape: scripts/common/coverity.sh
 
     publishers:
       - workspace-cleanup
@@ -151,9 +151,9 @@
 - project:
     name: lttng-modules
     mversion:
-      !include jobs/inc/lttng-modules-versions.yaml.inc
+      !include: jobs/inc/lttng-modules-versions.yaml.inc
     kversion:
-      !include jobs/inc/kernel-versions.yaml.inc
+      !include: jobs/inc/kernel-versions.yaml.inc
     jobs:
       - 'lttng-modules_{mversion}_{kversion}_{buildtype}':
           buildtype: build
diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index c74acd8..253a607 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -162,7 +162,7 @@
                 target: 'deps/lttng-ust'
                 do-not-fingerprint: true
       - shell:
-         !include-raw-escape scripts/lttng-tools/build.sh
+         !include-raw-escape: scripts/lttng-tools/build.sh
 
     # TODO: Scan for open tasks
     publishers:
@@ -239,7 +239,7 @@
           target: 'deps/lttng-ust'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape scripts/lttng-tools/scan-build.sh
+          !include-raw-escape: scripts/lttng-tools/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -283,7 +283,7 @@
           target: 'deps/lttng-ust'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape scripts/common/coverity.sh
+          !include-raw-escape: scripts/common/coverity.sh
 
     publishers:
       - workspace-cleanup
@@ -309,7 +309,7 @@
            target: 'deps/lttng-tools'
            do-not-fingerprint: true
        - shell:
-          !include-raw-escape scripts/lttng-tools/pylint.sh
+          !include-raw-escape: scripts/lttng-tools/pylint.sh
 
     publishers:
       - archive:
@@ -335,7 +335,7 @@
 - project:
     name: lttng-tools
     version:
-      !include jobs/inc/lttng-tools-versions.yaml.inc
+      !include: jobs/inc/lttng-tools-versions.yaml.inc
     jobs:
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index c17b32e..ecadffd 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -61,7 +61,7 @@
          type: user-defined
          name: liburcu_version
          values:
-           !include jobs/inc/liburcu-versions.yaml.inc
+           !include: jobs/inc/liburcu-versions.yaml.inc
       - axis:
          type: user-defined
          name: build
@@ -76,7 +76,7 @@
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - shell:
-         !include-raw-escape scripts/lttng-ust/build.sh
+         !include-raw-escape: scripts/lttng-ust/build.sh
 
     # TODO: Scan for open tasks
     publishers:
@@ -146,7 +146,7 @@
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape scripts/lttng-ust/scan-build.sh
+          !include-raw-escape: scripts/lttng-ust/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -183,7 +183,7 @@
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape scripts/common/coverity.sh
+          !include-raw-escape: scripts/common/coverity.sh
 
     publishers:
       - workspace-cleanup
@@ -209,7 +209,7 @@
            target: 'deps/lttng-ust'
            do-not-fingerprint: true
        - shell:
-          !include-raw-escape scripts/lttng-ust/pylint.sh
+          !include-raw-escape: scripts/lttng-ust/pylint.sh
 
     publishers:
       - archive:
@@ -235,7 +235,7 @@
 - project:
     name: lttng-ust
     version:
-      !include jobs/inc/lttng-ust-versions.yaml.inc
+      !include: jobs/inc/lttng-ust-versions.yaml.inc
     jobs:
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build