Updating build flags; update and test patch mechanism; update patch files; add and update manifest content; allow for build_control repo URL speciication

9 files changed, 63 insertions, 18 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}"
                 }
diff --git a/manifests/HST.yaml b/manifests/HST.yaml
new file mode 100644
index 0000000..53ac61f
--- /dev/null
+++ b/manifests/HST.yaml
@@ -0,0 +1,34 @@
+repository: 'https://github.com/astroconda/astroconda-contrib'
+channel_URL: 'http://ssb.stsci.edu/astroconda'
+numpy_version: 1.11
+packages:
+  - stsci-hst
+  - purge_path
+  - acstools
+  - calcos
+  - costools
+  - crds
+  - d2to1
+  - drizzlepac
+  - fitsblender
+  - hstcal
+  - nictools
+  - pyregion
+  - pysynphot
+  - reftools
+  - stistools
+  - stsci.convolve
+  - stsci.distutils
+  - stsci.image
+  - stsci.imagemanip
+  - stsci.imagestats
+  - stsci.ndimage
+  - stsci.numdisplay
+  - stsci.skypac
+  - stsci.sphere
+  - stsci.sphinxext
+  - stsci.stimage
+  - stsci.tools
+  - stwcs
+  - wfc3tools
+  - wfpc2tools
diff --git a/manifests/public.yaml b/manifests/public.yaml
index d831d87..da0f560 100644
--- a/manifests/public.yaml
+++ b/manifests/public.yaml
@@ -48,6 +48,9 @@ packages:
   - purge_path
   - pyds9
   - pyfftw
+  - pyobjc-core
+  - pyobjc-framework-cocoa
+  - pyobjc-framework-quartz
   - pyqtgraph
   - pyraf
   - pyregion
diff --git a/manifests/test.yaml b/manifests/test.yaml
index 3777c77..77c19bc 100644
--- a/manifests/test.yaml
+++ b/manifests/test.yaml
@@ -1,6 +1,11 @@
 repository: 'https://github.com/astroconda/astroconda-contrib'
+channel_URL: 'http://ssb.stsci.edu/astroconda'
 numpy_version: 1.11
 packages:
-  - relic
-  - verhawk
-
+  - pyobjc-core
+  - pyobjc-framework-cocoa
+  - pyobjc-framework-quartz
+  - pyqtgraph
+  - pyraf
+  - stsci.tools
+  - d2to1
diff --git a/patches/conda_build_2.1.1_substr_fix_py2.patch b/patches/conda_build_2.1.1_substr_fix_py2.patch
index 20a69f0..4548d80 100644
--- a/patches/conda_build_2.1.1_substr_fix_py2.patch
+++ b/patches/conda_build_2.1.1_substr_fix_py2.patch
@@ -1,11 +1,11 @@
---- config.py.ORIG	2017-04-18 10:00:00.000000000 -0400
-+++ config.py	2017-04-18 10:00:24.000000000 -0400
+--- config.py	2017-04-21 21:51:11.000000000 -0400
++++ config.py.fixed	2017-04-21 11:12:31.000000000 -0400
 @@ -246,7 +246,7 @@
              assert not os.path.isabs(package_name), ("package name should not be a absolute path, "
                                                       "to preserve croot during path joins")
              build_folders = sorted([build_folder for build_folder in get_build_folders(self.croot)
 -                                if package_name in build_folder])
-+                                if package_name + "_" in build_folder])
++                                if build_folder.startswith(package_name + "_")])
  
              if self.dirty and build_folders:
                  # Use the most recent build with matching recipe name
diff --git a/patches/conda_build_2.1.1_substr_fix_py3.patch b/patches/conda_build_2.1.1_substr_fix_py3.patch
index 88fbaf4..fdfe7ef 100644
--- a/patches/conda_build_2.1.1_substr_fix_py3.patch
+++ b/patches/conda_build_2.1.1_substr_fix_py3.patch
@@ -1,11 +1,11 @@
---- config.py.ORIG	2017-04-18 08:08:06.000000000 -0400
-+++ config.py	2017-04-18 08:08:20.000000000 -0400
-@@ -327,7 +327,7 @@
+--- config.py	2017-04-21 21:51:11.000000000 -0400
++++ config.py.fixed	2017-04-21 21:53:21.000000000 -0400
+@@ -231,7 +231,7 @@
              assert not os.path.isabs(package_name), ("package name should not be a absolute path, "
                                                       "to preserve croot during path joins")
              build_folders = sorted([build_folder for build_folder in get_build_folders(self.croot)
 -                                if package_name in build_folder])
-+                                if package_name + "_" in build_folder])
++                                if build_folder.startswith(package_name + "_")])
  
              if self.dirty and build_folders:
                  # Use the most recent build with matching recipe name