diff options
Diffstat (limited to 'jenkins')
| -rw-r--r-- | jenkins/dispatch.groovy | 10 | ||||
| -rw-r--r-- | jenkins/generator_DSL.groovy | 2 | ||||
| -rw-r--r-- | jenkins/job-suite-generator.groovy | 1 | ||||
| -rw-r--r-- | jenkins/package_builder.groovy | 6 |
4 files changed, 11 insertions, 8 deletions
diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 4ba44fd..f48022e 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -75,7 +75,7 @@ node(LABEL) { println("PATH = ${env.PATH}") // Fetch the manifest files - git url: BUILD_CONTROL_REPO + git branch: BUILD_CONTROL_BRANCH, url: BUILD_CONTROL_REPO // Check for the availability of a download tool and then use it // to get the conda installer. @@ -107,11 +107,11 @@ node(LABEL) { sh "conda install --quiet --yes conda-build=${CONDA_BUILD_VERSION}" // Apply bugfix patch to conda_build 2.1.1 + def filename = "${env.WORKSPACE}/miniconda/lib/python${PY_VERSION}/site-packages/conda_build/config.py" def patches_dir = "${env.WORKSPACE}/patches" - def patch = "${patches_dir}/conda_build_2.1.1_substr_fix_py${this.py_maj_version}.patch" - dir("miniconda/lib/python${PY_VERSION}/site-packages/conda/conda_build") { - sh "patch ${patch}" - } + def patchname = "conda_build_2.1.1_substr_fix_py${this.py_maj_version}.patch" + def full_patchname = "${patches_dir}/${patchname}" + sh "patch ${filename} ${full_patchname}" this.manifest = readYaml file: "manifests/${MANIFEST_FILE}" if (this.manifest.channel_URL[-1..-1] == "/") { diff --git a/jenkins/generator_DSL.groovy b/jenkins/generator_DSL.groovy index a4b40a8..bab75a2 100644 --- a/jenkins/generator_DSL.groovy +++ b/jenkins/generator_DSL.groovy @@ -31,6 +31,7 @@ pipelineJob("${suite_name}/_dispatch") { println("LABEL = ${label}") println("PY_VERSION = ${py_version}") println("BUILD_CONTROL_REPO = ${build_control_repo}") + println("BUILD_CONTROL_BRANCH = ${build_control_branch}") println("CONDA_VERSION = ${conda_version}") println("CONDA_BUILD_VERSION = ${conda_build_version}") println("CONDA_BASE_URL = ${conda_base_URL}") @@ -40,6 +41,7 @@ pipelineJob("${suite_name}/_dispatch") { env("LABEL", label) env("PY_VERSION", py_version) env("BUILD_CONTROL_REPO", build_control_repo) + env("BUILD_CONTROL_BRANCH", build_control_branch) env("CONDA_VERSION", conda_version) env("CONDA_BUILD_VERSION", conda_build_version) env("CONDA_BASE_URL", conda_base_URL) diff --git a/jenkins/job-suite-generator.groovy b/jenkins/job-suite-generator.groovy index 9ef3e08..b5a40c0 100644 --- a/jenkins/job-suite-generator.groovy +++ b/jenkins/job-suite-generator.groovy @@ -20,6 +20,7 @@ node("master") { println("label=${this.label}") println("py_version=${this.py_version}") println("build_control_repo=${this.build_control_repo}") + println("build_control_branch=${this.build_control_branch}") println("conda_version=${this.conda_version}") println("conda_build_version=${this.conda_build_version}") println("conda_base_URL=${this.conda_base_URL}") diff --git a/jenkins/package_builder.groovy b/jenkins/package_builder.groovy index 9f06ac7..3772b66 100644 --- a/jenkins/package_builder.groovy +++ b/jenkins/package_builder.groovy @@ -33,6 +33,8 @@ node(this.label) { "--python=${this.py_version}", "--numpy=${this.numpy_version}", "--skip-existing", + "--override-channels", + "--channel defaults", "--dirty"] for (arg in args) { build_cmd = "${build_cmd} ${arg}" @@ -48,10 +50,8 @@ node(this.label) { stage("Test") { build_cmd = cmd args = ["--test", - "--no-anaconda-upload", "--python=${this.py_version}", - "--numpy=${this.numpy_version}", - "--skip-existing"] + "--numpy=${this.numpy_version}"] for (arg in args) { build_cmd = "${build_cmd} ${arg}" } |