diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2018-01-12 13:33:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 13:33:34 -0500 |
| commit | 8471485b317bbe8bfa8ac27c749f3b9b05d89de9 (patch) | |
| tree | 7b84fd02dadb48dc47b3ff3d137051450cc0de28 /jenkins | |
| parent | e8342ab151fe2c82030f9a92412d541c02c02487 (diff) | |
| download | build_control-8471485b317bbe8bfa8ac27c749f3b9b05d89de9.tar.gz | |
Obtain manifests via a simple clone (#54)
* Place clone in top-level job script
* Remove submodule clone
Diffstat (limited to 'jenkins')
| -rw-r--r-- | jenkins/dispatch.groovy | 4 | ||||
| -rw-r--r-- | 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 |