Strip include-raw prefix for script files

Prefixing the files with `include-raw-` make the file name longer
and also not a standard to be followed.

Change-Id: Iea81fae69a5c1733568151ba8b80ef7036ed5f80
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/opflex/deps-inc-v1/include-raw-libuv_tgz-build.sh b/jjb/opflex/deps-inc-v1/libuv_tgz-build.sh
similarity index 100%
rename from jjb/opflex/deps-inc-v1/include-raw-libuv_tgz-build.sh
rename to jjb/opflex/deps-inc-v1/libuv_tgz-build.sh

diff --git a/jjb/opflex/deps-inc-v1/include-raw-openvswitch_tgz-build.sh b/jjb/opflex/deps-inc-v1/openvswitch_tgz-build.sh
similarity index 100%
rename from jjb/opflex/deps-inc-v1/include-raw-openvswitch_tgz-build.sh
rename to jjb/opflex/deps-inc-v1/openvswitch_tgz-build.sh

diff --git a/jjb/opflex/deps-inc-v1/include-raw-rapidjson_tgz-build.sh b/jjb/opflex/deps-inc-v1/rapidjson_tgz-build.sh
similarity index 100%
rename from jjb/opflex/deps-inc-v1/include-raw-rapidjson_tgz-build.sh
rename to jjb/opflex/deps-inc-v1/rapidjson_tgz-build.sh

diff --git a/jjb/opflex/deps-inc-v2/include-raw-openvswitch_tgz-build.sh b/jjb/opflex/deps-inc-v2/openvswitch_tgz-build.sh
similarity index 100%
rename from jjb/opflex/deps-inc-v2/include-raw-openvswitch_tgz-build.sh
rename to jjb/opflex/deps-inc-v2/openvswitch_tgz-build.sh

diff --git a/jjb/opflex/include-raw-opflex-build.sh b/jjb/opflex/opflex-build.sh
similarity index 100%
rename from jjb/opflex/include-raw-opflex-build.sh
rename to jjb/opflex/opflex-build.sh

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

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index 1b49ffd13db1ee68797255b4f2ded047aa993c4d..33a4028dd9d9afd88697c8530a322e49e5e7e7c4 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -91,7 +91,7 @@
 - builder:
     name: 'builder-opflex-libuv-v1'
     builders:
-      - shell: !include-raw-escape: deps-inc-v1/include-raw-libuv_tgz-build.sh
+      - shell: !include-raw-escape: deps-inc-v1/libuv_tgz-build.sh
 
 - job-template:
     name: 'opflex-libuv_tgz-{stream}'
@@ -124,7 +124,7 @@
 - builder:
     name: 'builder-opflex-rapidjson-v1'
     builders:
-      - shell: !include-raw-escape: deps-inc-v1/include-raw-rapidjson_tgz-build.sh
+      - shell: !include-raw-escape: deps-inc-v1/rapidjson_tgz-build.sh
 
 - job-template:
     name: 'opflex-rapidjson_tgz-{stream}'
@@ -157,12 +157,12 @@
 - builder:
     name: 'builder-opflex-openvswitch-v1'
     builders:
-      - shell: !include-raw: deps-inc-v1/include-raw-openvswitch_tgz-build.sh
+      - shell: !include-raw: deps-inc-v1/openvswitch_tgz-build.sh
 
 - builder:
     name: 'builder-opflex-openvswitch-v2'
     builders:
-      - shell: !include-raw: deps-inc-v2/include-raw-openvswitch_tgz-build.sh
+      - shell: !include-raw: deps-inc-v2/openvswitch_tgz-build.sh
 
 - job-template:
     name: 'opflex-openvswitch_tgz-{stream}'