From cc0098f24e73fc5f7172218ddc19c43597e168bf Mon Sep 17 00:00:00 2001
From: Matt Rendina <mrendina@stsci.edu>
Date: Mon, 18 Sep 2017 17:03:10 -0400
Subject: Test conda_build 3.x substring bugfix patch

---
 jenkins/dispatch.groovy                      |  9 +++++++++
 manifests/dev-test.yaml                      |  6 ++++--
 patches/conda_build_3.0.15_substr_fix2.patch | 11 +++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 patches/conda_build_3.0.15_substr_fix2.patch

diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy
index a1e91cd..aa6b924 100644
--- a/jenkins/dispatch.groovy
+++ b/jenkins/dispatch.groovy
@@ -200,6 +200,15 @@ node(LABEL) {
             def full_patchname = "${patches_dir}/${patchname}"
             sh "patch ${filename} ${full_patchname}"
         }
+        if (conda_build_maj_ver == "3") {
+            println("conda-build major version ${conda_build_maj_ver} detected. Applying bugfix patch.")
+            def filename = "${this.conda_install_dir}/lib/python${PY_VERSION}/" +
+                           "site-packages/conda_build/config.py"
+            def patches_dir = "${env.WORKSPACE}/patches"
+            def patchname = "conda_build_3.0.15_substr_fix2.patch"
+            def full_patchname = "${patches_dir}/${patchname}"
+            sh "patch ${filename} ${full_patchname}"
+        }
 
         // (conda-build 3.x only)
         // Create and populate environment to be used for pinning reference when
diff --git a/manifests/dev-test.yaml b/manifests/dev-test.yaml
index 68da460..fd6fe7e 100644
--- a/manifests/dev-test.yaml
+++ b/manifests/dev-test.yaml
@@ -5,9 +5,11 @@ repository: 'https://github.com/astroconda/astroconda-dev'
 channel_URL: 'http://ssb.stsci.edu/astroconda-dev'
 
 # publication_root path needs to be visible from the slave nodes.
-publication_root: '/eng/ssb/websites/ssbpublic/astroconda-j-dev-testing'
+publication_root: '/eng/ssb/websites/ssbpublic/astroconda-dev'
 packages:
-  - drizzlepac
+#  - drizzlepac 
+  - jwst_gtvt
+  - jwst
 #  - crds
 #  - cube-tools
 #  - sphinxcontrib-programoutput
diff --git a/patches/conda_build_3.0.15_substr_fix2.patch b/patches/conda_build_3.0.15_substr_fix2.patch
new file mode 100644
index 0000000..3086592
--- /dev/null
+++ b/patches/conda_build_3.0.15_substr_fix2.patch
@@ -0,0 +1,11 @@
+--- config.py	2017-09-18 17:22:59.000000000 -0400
++++ config.py.new	2017-09-18 16:39:48.000000000 -0400
+@@ -370,7 +370,7 @@
+                                                      "to preserve croot during path joins")
+             build_folders = sorted([os.path.basename(build_folder)
+                             for build_folder in get_build_folders(self.croot)
+-                            if os.path.basename(build_folder).startswith(package_name + "_")])
++                            if build_folder[:build_folder.rfind('_')] == package_name])
+             if self.dirty and build_folders:
+                 # Use the most recent build with matching recipe name
+                 self._build_id = build_folders[-1]
-- 
cgit