From a3ffcc4338d57d70b333afce507b53a916cf6c12 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Thu, 11 Jan 2018 11:04:07 -0500 Subject: Manifest location (#51) * Remove manifests dir * Add manifests repo as submodule * Test submodule approach --- jenkins/dispatch.groovy | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'jenkins') diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index e45b236..e02b0cc 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -1,18 +1,18 @@ // Parameters inherited from the calling script via environment injection. //---------------------------------------------------------------------------- -// MANIFEST_FILE - The "release" type; list of recipes/packages to build -// LABEL - Node or logical group of build nodes -// PY_VERSION - Python version hosted by conda to support the build -// NUMPY_VERSION - numpy version used to support the build -// BUILD_CONTROL_REPO - Repository holding this & other build system files, -// and manifest files -// BUILD_CONTROL_BRANCH - Branch to obtain from build control repo -// BUILD_CONTROL_TAG - Tag to obtain from build control repo +// MANIFEST_FILE - The "release" type; list of recipes/packages to build +// LABEL - Node or logical group of build nodes +// PY_VERSION - Python version hosted by conda to support the build +// NUMPY_VERSION - numpy version used to support the build +// BUILD_CONTROL_REPO - Repository holding this & other build system files, +// and manifest files +// BUILD_CONTROL_BRANCH - Branch to obtain from build control repo +// BUILD_CONTROL_TAG - Tag to obtain from build control repo // CONDA_INSTALLER_VERSION - Conda installer version to use -// CONDA_VERSION - conda version is forced to this value -// CONDA_BUILD_VERSION - Conda-build is installed forced to this version. -// CONDA_BASE_URL - Where to get the conda installer -// UTILS_REPO - Repository holding support utilities +// CONDA_VERSION - conda version is forced to this value +// CONDA_BUILD_VERSION - Conda-build is installed forced to this version. +// CONDA_BASE_URL - Where to get the conda installer +// UTILS_REPO - Repository holding support utilities // Directories to create within the workspace this.utils_dir = "utils" @@ -83,9 +83,13 @@ node(LABEL) { sh "env | sort" - // Get the manifest and build control files + // 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. -- cgit