From 9bd684bec294d70178434777f4a6ca9b3ce169b3 Mon Sep 17 00:00:00 2001
From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Tue, 10 Oct 2017 16:31:13 -0700
Subject: [PATCH] Move Jenkins Groovy Scripts under jenkins/scripts

This should help de-clutter the current jenkins directory containing the
Dockerfile and configs.

Change-Id: Iea68c13640291e9a654424300454319a0df2bd1a
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---
 jenkins/Dockerfile                                | 12 ++++++------
 jenkins/{ => scripts}/basic-security-setup.groovy |  0
 jenkins/{ => scripts}/create-jenkins-agent.groovy |  0
 jenkins/{ => scripts}/create-jjbini.groovy        |  0
 jenkins/{ => scripts}/gerrit-config.groovy        |  0
 jenkins/{ => scripts}/global-properties.groovy    |  0
 jenkins/{ => scripts}/ldap.groovy                 |  0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename jenkins/{ => scripts}/basic-security-setup.groovy (100%)
 rename jenkins/{ => scripts}/create-jenkins-agent.groovy (100%)
 rename jenkins/{ => scripts}/create-jjbini.groovy (100%)
 rename jenkins/{ => scripts}/gerrit-config.groovy (100%)
 rename jenkins/{ => scripts}/global-properties.groovy (100%)
 rename jenkins/{ => scripts}/ldap.groovy (100%)

diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile
index 2f8e6a3..139c7be 100644
--- a/jenkins/Dockerfile
+++ b/jenkins/Dockerfile
@@ -19,20 +19,20 @@ RUN /usr/local/bin/install-plugins.sh < /usr/share/jenkins/ref/plugins.txt
 ENV JENKINS_GROOVY_INIT /usr/share/jenkins/ref/init.groovy.d/
 
 # Configure Basic Security
-COPY basic-security-setup.groovy $JENKINS_GROOVY_INIT
+COPY scripts/basic-security-setup.groovy $JENKINS_GROOVY_INIT
 
 # Configure LDAP
-COPY ldap.groovy $JENKINS_GROOVY_INIT
+COPY scripts/ldap.groovy $JENKINS_GROOVY_INIT
 
 # Configure Gerrit-Trigger
-COPY gerrit-config.groovy $JENKINS_GROOVY_INIT
+COPY scripts/gerrit-config.groovy $JENKINS_GROOVY_INIT
 
 # Set Global Properties
-COPY global-properties.groovy $JENKINS_GROOVY_INIT
+COPY scripts/global-properties.groovy $JENKINS_GROOVY_INIT
 
 # Create Jenkins SSH Agent
-COPY create-jenkins-agent.groovy $JENKINS_GROOVY_INIT
+COPY scripts/create-jenkins-agent.groovy $JENKINS_GROOVY_INIT
 
 # Create JJB INI in Config File Plugin
-COPY create-jjbini.groovy $JENKINS_GROOVY_INIT
+COPY scripts/create-jjbini.groovy $JENKINS_GROOVY_INIT
 
diff --git a/jenkins/basic-security-setup.groovy b/jenkins/scripts/basic-security-setup.groovy
similarity index 100%
rename from jenkins/basic-security-setup.groovy
rename to jenkins/scripts/basic-security-setup.groovy
diff --git a/jenkins/create-jenkins-agent.groovy b/jenkins/scripts/create-jenkins-agent.groovy
similarity index 100%
rename from jenkins/create-jenkins-agent.groovy
rename to jenkins/scripts/create-jenkins-agent.groovy
diff --git a/jenkins/create-jjbini.groovy b/jenkins/scripts/create-jjbini.groovy
similarity index 100%
rename from jenkins/create-jjbini.groovy
rename to jenkins/scripts/create-jjbini.groovy
diff --git a/jenkins/gerrit-config.groovy b/jenkins/scripts/gerrit-config.groovy
similarity index 100%
rename from jenkins/gerrit-config.groovy
rename to jenkins/scripts/gerrit-config.groovy
diff --git a/jenkins/global-properties.groovy b/jenkins/scripts/global-properties.groovy
similarity index 100%
rename from jenkins/global-properties.groovy
rename to jenkins/scripts/global-properties.groovy
diff --git a/jenkins/ldap.groovy b/jenkins/scripts/ldap.groovy
similarity index 100%
rename from jenkins/ldap.groovy
rename to jenkins/scripts/ldap.groovy
-- 
2.16.6