From 41ba8c0651635f54684ee4b07c95b03f18cfa5d9 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Mon, 7 Aug 2017 16:31:34 +1000 Subject: [PATCH] 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 --- .../{include-raw-cleanup-docker.sh => cleanup-docker.sh} | 0 jjb/ovsdb/ovsdb-full-integration.yaml | 4 ++-- jjb/ovsdb/ovsdb-sonar.yaml | 4 ++-- jjb/ovsdb/{include-raw-setup-docker.sh => setup-docker.sh} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename jjb/ovsdb/{include-raw-cleanup-docker.sh => cleanup-docker.sh} (100%) rename jjb/ovsdb/{include-raw-setup-docker.sh => setup-docker.sh} (100%) 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 -- 2.36.6