Add initial cleanup checks

ichasepucks · Dec 21, 2017 · a88c31e · a88c31e
1 parent e4934ef
commit a88c31e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/createDevJob.groovy b/createDevJob.groovy
@@ -3,8 +3,12 @@ if [ ! -d /var/jenkins_home/jobs/devPipeline/ ]; then
     mkdir /var/jenkins_home/jobs/devPipeline/
     mkdir /var/jenkins_home/jobs/devPipeline/workspace/
 fi
-rm -r /var/jenkins_home/jobs/devPipeline/workspace/*
-cp -r ../pipeline-dev/* /var/jenkins_home/jobs/devPipeline/workspace/
+if [ -e /var/jenkins_home/jobs/devPipeline/workspace/* ]; then
+    rm -r /var/jenkins_home/jobs/devPipeline/workspace/*
+fi
+if [[ ! -z "$(ls -A)" ]] ; then
+    cp -r * /var/jenkins_home/jobs/devPipeline/workspace/
+fi
 '''
 
 

diff --git a/jenkins/jobs/pipeline-updater/config.xml b/jenkins/jobs/pipeline-updater/config.xml
@@ -21,8 +21,12 @@
     mkdir /var/jenkins_home/jobs/devPipeline/
     mkdir /var/jenkins_home/jobs/devPipeline/workspace/
 fi
-rm -r /var/jenkins_home/jobs/devPipeline/workspace/*
-cp -r ../pipeline-dev/* /var/jenkins_home/jobs/devPipeline/workspace/</command>
+if [ -e /var/jenkins_home/jobs/devPipeline/workspace/* ]; then
+    rm -r /var/jenkins_home/jobs/devPipeline/workspace/*
+fi
+if [[ ! -z "$(ls -A)" ]] ; then
+    cp -r * /var/jenkins_home/jobs/devPipeline/workspace/
+fi</command>
     </hudson.tasks.Shell>
     <javaposse.jobdsl.plugin.ExecuteDslScripts plugin="[email protected]">
       <scriptText>pipelineJob(&apos;devPipeline&apos;) {