From 8471485b317bbe8bfa8ac27c749f3b9b05d89de9 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Fri, 12 Jan 2018 13:33:34 -0500 Subject: Obtain manifests via a simple clone (#54) * Place clone in top-level job script * Remove submodule clone --- jenkins/dispatch.groovy | 4 ---- jenkins/job-suite-generator.groovy | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index fa293a6..6cc7cb5 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -87,10 +87,6 @@ node(LABEL) { // Get the build control files git branch: BUILD_CONTROL_BRANCH, url: BUILD_CONTROL_REPO - // Get manifests by cloning the submodule - sh(script: "git submodule init") - sh(script: "git submodule update") - // If a tag was specified in the job-suite-generator configuration, // explicitly check out that tag after cloning the (master) branch, // since the 'git' pipeline step does not yet support accessing tags. diff --git a/jenkins/job-suite-generator.groovy b/jenkins/job-suite-generator.groovy index d8c56bf..faf1647 100644 --- a/jenkins/job-suite-generator.groovy +++ b/jenkins/job-suite-generator.groovy @@ -28,6 +28,9 @@ node("master") { // Delete any existing job workspace directory contents. deleteDir() + // Clone the manifests repository. + git url: manifest_repo, relativeTargetDir: "manifests" + // 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 // that gets invoked at the bottom of this script. Vars harvested from -- cgit