From: Anil Belur <abelur@linuxfoundation.org>
Date: Mon, 7 Aug 2017 06:31:34 +0000 (+1000)
Subject: Strip include-raw prefix for script files
X-Git-Tag: release/nitrogen~183
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=41ba8c0651635f54684ee4b07c95b03f18cfa5d9;p=releng%2Fbuilder.git

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: I4394c5c971587583def53e545ddbac824c916309
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/jjb/ovsdb/include-raw-cleanup-docker.sh b/jjb/ovsdb/cleanup-docker.sh
similarity index 100%
rename from jjb/ovsdb/include-raw-cleanup-docker.sh
rename to jjb/ovsdb/cleanup-docker.sh
diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index c5711b65f..fc46b0df8 100644
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -80,7 +80,7 @@
     builders:
       - inject:
           properties-content: OVS_VERSION={OVS_VERSION}
-      - shell: !include-raw-escape: include-raw-setup-docker.sh
+      - shell: !include-raw-escape: setup-docker.sh
       - inject:
           properties-file: env.properties
       - run-southbound-it:
@@ -96,7 +96,7 @@
           OVS_VERSION: '{OVS_VERSION}'
           maven-version: '{maven-version}'
           stream: '{stream}'
-      - shell: !include-raw-escape: include-raw-cleanup-docker.sh
+      - shell: !include-raw-escape: cleanup-docker.sh
 
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index f669024a6..0fd1c418a 100644
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -42,7 +42,7 @@
           name: 'ovsdb'
 
     builders:
-      - shell: !include-raw-escape: include-raw-setup-docker.sh
+      - shell: !include-raw-escape: setup-docker.sh
       - inject:
           properties-file: env.properties
       - shell: !include-raw-escape: include-setup-hwvtep-docker.sh
@@ -90,7 +90,7 @@
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
-      - shell: !include-raw-escape: include-raw-cleanup-docker.sh
+      - shell: !include-raw-escape: cleanup-docker.sh
       - jacoco-nojava-workaround
 
     publishers:
diff --git a/jjb/ovsdb/include-raw-setup-docker.sh b/jjb/ovsdb/setup-docker.sh
similarity index 100%
rename from jjb/ovsdb/include-raw-setup-docker.sh
rename to jjb/ovsdb/setup-docker.sh