From fdf28dcf162ad3f2bff53d5a781da9de83cf29b3 Mon Sep 17 00:00:00 2001
From: Matt Rendina <rendinam@users.noreply.github.com>
Date: Fri, 12 Jan 2018 14:37:26 -0500
Subject: [PATCH] Manifest management fixes (#55)

* Obtain manifests via simple clone
* Remove submodule clone
* Fix copy syntax
---
 jenkins/job-suite-generator.groovy | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jenkins/job-suite-generator.groovy b/jenkins/job-suite-generator.groovy
index faf1647..3b43535 100644
--- a/jenkins/job-suite-generator.groovy
+++ b/jenkins/job-suite-generator.groovy
@@ -29,7 +29,9 @@ node("master") {
         deleteDir()
 
         // Clone the manifests repository.
-        git url: manifest_repo, relativeTargetDir: "manifests"
+        dir ("manifests") {
+            git url: manifest_repo
+        }
 
         // Get the git repo and branch values used to obtain this and other
         // build_control scripts so they may be passed to the jobDSL script
@@ -102,7 +104,7 @@ node("master") {
         // (handled by the job that reads this pipeline script) into the actual
         // workspace of this job so the jobDsl call below will be able to find
         // what it needs.
-        sh "cp -r ${env.WORKSPACE}@script/* ."
+        sh "cp -r ${env.WORKSPACE}@script/. ."
     }
 
     stage("Spawn job definition") {