Fix include-raw deprecation warnings

Resolves the following warning in current versions of JJB.

WARNING:jenkins_jobs.local_yaml:tag '!include-raw' is deprecated, switch
to using '!include-raw:'

Change-Id: Ia2f14dbf81610829596f5b99fe8a39b3e3419e97
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index a527f0c56e12f9fad874077164723bea57f43ee0..63da8b741f759fe670267af781131e2e5f519a79 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -101,7 +101,9 @@
 - builder:
     name: autorelease-maven-deploy
     builders:
-        - shell: !include-raw include-raw-autorelease-maven-deploy.sh
+        - shell:
+            !include-raw:
+                - include-raw-autorelease-maven-deploy.sh
 
 - builder:
     name: autorelease-maven-sources
@@ -131,7 +133,8 @@
     name: autorelease-generate-release-patches
     builders:
         - shell:
-            !include-raw-escape include-raw-autorelease-release-versions.sh
+            !include-raw-escape:
+                - include-raw-autorelease-release-versions.sh
 
 - builder:
     name: autorelease-sys-stats
@@ -143,9 +146,13 @@
 - builder:
     name: autorelease-get-integration-test-variables
     builders:
-    - shell: !include-raw include-raw-autorelease-get-integration-test-variables.sh
+    - shell:
+        !include-raw:
+            - include-raw-autorelease-get-integration-test-variables.sh
 
 - builder:
     name: autorelease-generate-project-report
     builders:
-    - shell: !include-raw include-raw-generate-project-report.sh
+    - shell:
+        !include-raw:
+            - include-raw-generate-project-report.sh

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index ba544ca79049ef30b7bf3e4e56dde64abeb7c198..d3b0ce2552d6606e9b30ad9dfef9c7e38afcc29d 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -180,7 +180,8 @@
     name: integration-get-slave-addresses
     builders:
         - shell:
-            !include-raw include-raw-integration-get-slave-addresses.sh
+            !include-raw:
+                - include-raw-integration-get-slave-addresses.sh
 
 # Macro: integration-get-bundle-vars
 # Operation: this macro gets all bundle related variables
@@ -190,7 +191,8 @@
     name: integration-get-bundle-vars
     builders:
         - shell:
-            !include-raw include-raw-integration-get-bundle-vars.sh
+            !include-raw:
+                - include-raw-integration-get-bundle-vars.sh
 
 # Macro: integration-deploy-controller-verify
 # Operation: this macro deploys the controller with all fetures
@@ -200,7 +202,8 @@
     name: integration-deploy-controller-verify
     builders:
         - shell:
-            !include-raw include-raw-integration-deploy-controller-verify.sh
+            !include-raw:
+                - include-raw-integration-deploy-controller-verify.sh
 
 # Macro: integration-deploy-controller-offline
 # Operation: this macro deploys the controller with no external repo configuration
@@ -210,7 +213,8 @@
     name: integration-deploy-controller-offline
     builders:
         - shell:
-            !include-raw include-raw-integration-deploy-controller-offline.sh
+            !include-raw:
+                - include-raw-integration-deploy-controller-offline.sh
 
 # Macro: integration-deply-controller-run-test
 # Operation: this macro deploys single contoller and runs test
@@ -220,7 +224,8 @@
     name: integration-deploy-controller-run-test
     builders:
         - shell:
-            !include-raw include-raw-integration-deploy-controller-run-test.sh
+            !include-raw:
+                - include-raw-integration-deploy-controller-run-test.sh
 
 # Macro: integration-deploy-controller
 # Operation: this macro prepares 3-node cluster controller
@@ -230,7 +235,8 @@
     name: integration-deploy-controller
     builders:
         - shell:
-            !include-raw include-raw-integration-deploy-controller.sh
+            !include-raw:
+                - include-raw-integration-deploy-controller.sh
 
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
@@ -240,7 +246,8 @@
     name: integration-configure-clustering
     builders:
         - shell:
-            !include-raw include-raw-integration-configure-clustering.sh
+            !include-raw:
+                - include-raw-integration-configure-clustering.sh
 
 # Macro: integration-start-cluster-run-test
 # Operation: this macro starts the 3-node cluster and runs test
@@ -250,7 +257,8 @@
     name: integration-start-cluster-run-test
     builders:
         - shell:
-            !include-raw include-raw-integration-start-cluster-run-test.sh
+            !include-raw:
+                - include-raw-integration-start-cluster-run-test.sh
 
 # Macro: integration-get-bundle-url
 # Operation: this macro gets the job generated distribution URL from distribution pom.xml
@@ -260,7 +268,8 @@
     name: integration-get-bundle-url
     builders:
         - shell:
-            !include-raw include-raw-integration-get-bundle-url.sh
+            !include-raw:
+                - include-raw-integration-get-bundle-url.sh
 
 # Macro: integration-get-bundle-url-root
 # Operation: this macro gets the job generated distribution URL from root pom.xml
@@ -270,7 +279,8 @@
     name: integration-get-bundle-url-root
     builders:
         - shell:
-            !include-raw include-raw-integration-get-bundle-url-root.sh
+            !include-raw:
+                - include-raw-integration-get-bundle-url-root.sh
 
 # Macro: integration-install-robotframework
 # Operation: Installs robotframework using pip to a virtualenv
@@ -280,7 +290,8 @@
     name: integration-install-robotframework
     builders:
         - shell:
-            !include-raw include-raw-integration-install-robotframework.sh
+            !include-raw:
+                - include-raw-integration-install-robotframework.sh
 
 # Macro: integration-cleanup-tmp
 # Operation: Cleans up temporary files created by build
@@ -290,7 +301,8 @@
     name: integration-cleanup-tmp
     builders:
         - shell:
-            !include-raw include-raw-integration-cleanup-tmp.sh
+            !include-raw:
+                - include-raw-integration-cleanup-tmp.sh
 
 # Macro: integration-multipatch-builder
 # Operation: checks out multiple patches and builds custom distribution
@@ -300,7 +312,8 @@
     name: integration-multipatch-builder
     builders:
         - shell:
-            !include-raw include-raw-integration-multipatch-distribution-test.sh
+            !include-raw:
+                - include-raw-integration-multipatch-distribution-test.sh
 
 # Macro: integration-cleanup-worspace
 # Operation: Cleans up files possibly left there by the previous build
@@ -310,7 +323,8 @@
     name: integration-cleanup-workspace
     builders:
         - shell:
-            !include-raw include-raw-integration-cleanup-workspace.sh
+            !include-raw:
+                - include-raw-integration-cleanup-workspace.sh
 
 ##############
 # Publishers #

diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
index 673a07530a854192130a02456fe7a6b22c70bcb9..9c4bc6e7da9aaa54545945c8cd21e3b0dfd5af8b 100644 (file)
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
@@ -42,7 +42,8 @@
               TEMPEST_REGEX=tempest.api.network
               KARAFFEATURE=odl-neutron-dummyprovider-test
         - shell:
-            !include-raw-escape include-raw-openstack-ci.sh
+            !include-raw-escape:
+                - include-raw-openstack-ci.sh
 
     publishers:
         - archive:

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 6e26c44e427d2530e96bb8fb0ad25344c43f07ca..186d91e3aa91cc4b7a39b8e6bb441f06ab1e1907 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -34,7 +34,8 @@
           project: opflex-openvswitch_tgz-{stream}
           flatten: true
       - shell:
-          !include-raw-escape include-raw-opflex-build.sh
+          !include-raw-escape:
+            - include-raw-opflex-build.sh
 
 - job-template:
     name: 'opflex-verify-{stream}'

diff --git a/jjb/opflex/opflex-dependencies-rpm.yaml b/jjb/opflex/opflex-dependencies-rpm.yaml
index 679050030ae1f58a0f6ab5cc0ac7e73e38cef048..8f4291d250f4827149ab7f893c7216325b6e6fb4 100644 (file)
--- a/jjb/opflex/opflex-dependencies-rpm.yaml
+++ b/jjb/opflex/opflex-dependencies-rpm.yaml
@@ -57,7 +57,8 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-opflex-dep_rpm-build.sh
+            !include-raw-escape:
+                - include-raw-opflex-dep_rpm-build.sh
 
     publishers:
         - email-notification:
@@ -92,7 +93,8 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-ovs_rpm-build.sh
+            !include-raw-escape:
+                - include-raw-ovs_rpm-build.sh
 
     publishers:
         - email-notification:

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index 1b092003fc41db0a4034ad402c2db94f0cd72780..d4a1d55e6a0339dbe0eca39a9f557bb9c4f0016c 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -65,7 +65,8 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-libuv_tgz-build.sh
+            !include-raw-escape:
+                - include-raw-libuv_tgz-build.sh
 
     publishers:
         - email-notification:
@@ -97,7 +98,8 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-rapidjson_tgz-build.sh
+            !include-raw-escape:
+                - include-raw-rapidjson_tgz-build.sh
 
     publishers:
         - email-notification:
@@ -139,7 +141,8 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-openvswitch_tgz-build.sh
+            !include-raw-escape:
+                - include-raw-openvswitch_tgz-build.sh
 
     publishers:
         - email-notification:

diff --git a/jjb/ovsdb/ovsdb-custom.yaml b/jjb/ovsdb/ovsdb-custom.yaml
index ba2897cce9745cfb0d2105f053a4c61cf05090fe..dc18e1b42de795d6eb279263e5ff49ff4fccbe96 100644 (file)
--- a/jjb/ovsdb/ovsdb-custom.yaml
+++ b/jjb/ovsdb/ovsdb-custom.yaml
@@ -40,7 +40,8 @@
 
     prebuilders:
         - shell:
-            !include-raw-escape include-raw-setup-docker.sh
+            !include-raw-escape:
+                - include-raw-setup-docker.sh
 
     maven:
         maven-name: '{mvn33}'
@@ -64,7 +65,8 @@
             settings: '{ovsdb-settings}'
             global-settings: '{odl-global-settings}'
         - shell:
-            !include-raw-escape include-raw-cleanup-docker.sh
+            !include-raw-escape:
+                - include-raw-cleanup-docker.sh
         - jacoco-nojava-workaround
 
     publishers:

diff --git a/jjb/ovsdb/ovsdb-daily-openstack-beryllium.yaml b/jjb/ovsdb/ovsdb-daily-openstack-beryllium.yaml
index 30af62028b4ca7bb320b261ed9738079ae69b6cd..1ca70a208736f4406261b980b7c201b69f13eb96 100644 (file)
--- a/jjb/ovsdb/ovsdb-daily-openstack-beryllium.yaml
+++ b/jjb/ovsdb/ovsdb-daily-openstack-beryllium.yaml
@@ -44,7 +44,8 @@
               ODL_VERSION='{odl_version}'
               TEMPEST_REGEX=tempest.api.network
         - shell:
-            !include-raw-escape include-raw-openstack-ci.sh
+            !include-raw-escape:
+                - include-raw-openstack-ci.sh
 
     publishers:
         - archive:

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index a52e8e8495a0b00e26ec16ec175fb7d39f49564b..bd90efb5798833f982d0df7ebc3beef509960326 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -92,7 +92,8 @@
     builders:
         - wipe-org-opendaylight-repo
         - shell:
-            !include-raw-escape include-raw-setup-docker.sh
+            !include-raw-escape:
+                - include-raw-setup-docker.sh
         - inject:
             properties-file: env.properties
         - maven-target:
@@ -111,7 +112,8 @@
             settings: '{ovsdb-settings}'
             global-settings: '{odl-global-settings}'
         - shell:
-            !include-raw-escape include-raw-cleanup-docker.sh
+            !include-raw-escape:
+                - include-raw-cleanup-docker.sh
         - jacoco-nojava-workaround
 
     publishers:

diff --git a/jjb/ovsdb/ovsdb-openstack.yaml b/jjb/ovsdb/ovsdb-openstack.yaml
index 2c29418626b5aa6f78ccd4b7aeca6e0411016192..4e2d1b93e3c57e23e3139c4cfa80f643911b2a94 100644 (file)
--- a/jjb/ovsdb/ovsdb-openstack.yaml
+++ b/jjb/ovsdb/ovsdb-openstack.yaml
@@ -75,7 +75,8 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-openstack-ci.sh
+            !include-raw-escape:
+                - include-raw-openstack-ci.sh
 
     publishers:
         - archive:

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index b2e748a28c827aea9b4e3fac50d99439739f2da4..55b7cbb09d601ba3a0468a7fb08c8d3781b35bd8 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -184,7 +184,8 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-jjb-update.sh
+            !include-raw-escape:
+                - include-raw-jjb-update.sh
 
     publishers:
         - email-notification:
@@ -254,7 +255,8 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-check-poms.sh
+            !include-raw-escape:
+                - include-raw-check-poms.sh
 
     publishers:
         - email-notification: