aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules3
-rw-r--r--jenkins/dispatch.groovy30
m---------manifests0
-rw-r--r--manifests/ETC.yaml24
-rw-r--r--manifests/HST.yaml40
-rw-r--r--manifests/dev-next.yaml103
-rw-r--r--manifests/dev-test.yaml25
-rw-r--r--manifests/dev.yaml105
-rw-r--r--manifests/jwst.yaml21
-rw-r--r--manifests/public-test.yaml11
-rw-r--r--manifests/public.yaml104
-rw-r--r--manifests/test-fail.yaml13
-rw-r--r--manifests/test.yaml25
13 files changed, 20 insertions, 484 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..6d39af4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "manifests"]
+ path = manifests
+ url = https://github.com/astroconda/build_manifests
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.
diff --git a/manifests b/manifests
new file mode 160000
+Subproject 7bb02efd82f5cfa683806b988a24aa20c3cc08a
diff --git a/manifests/ETC.yaml b/manifests/ETC.yaml
deleted file mode 100644
index cbc3055..0000000
--- a/manifests/ETC.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Recipe repository
-repository: 'https://github.com/astroconda/astroconda-etc'
-
-# Publication channel to consult when determining what packages already exist.
-channel_URL: 'http://ssb.stsci.edu/astroconda-etc'
-
-# publication_root path needs to be visible from the slave nodes.
-publication_root: '/eng/ssb/websites/ssbpublic/astroconda-etc'
-numpy_version: 1.11
-packages:
- - beautifulsoup
- - d2to1
- - django
- - epydoc
- - mechanize
- - mod-wsgi
- - pmw
-# - pyetc-thirdparty
- - pyfits
- - stsci.distutils
- - stsci.tools
- - urwid
- - wsgiref
- - yolk
diff --git a/manifests/HST.yaml b/manifests/HST.yaml
deleted file mode 100644
index 9e2b5db..0000000
--- a/manifests/HST.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Recipe repository
-repository: 'https://github.com/astroconda/astroconda-contrib'
-
-# Publication channel to consult when determining what packages already exist.
-channel_URL: 'http://ssb.stsci.edu/astroconda'
-
-# publication_root path needs to be visible from the slave nodes.
-publication_root: '/eng/ssb/websites/ssbpublic/astroconda-j-pub-staging'
-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/dev-next.yaml b/manifests/dev-next.yaml
deleted file mode 100644
index d15e697..0000000
--- a/manifests/dev-next.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-# Recipe repository
-repository: 'https://github.com/jhunkeler/astroconda-dev'
-git_ref_spec: 'next'
-
-# Publication channel to consult when determining what packages already exist.
-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-staging'
-packages:
- - acstools
- - appdirs
- - aprio
- - asdf
- - asdf-standard
- - astroimtools
- - astropy
- - astroquery
- - asv
- - calcos
- - cfitsio
- - costools
- - crds
- - cubeviz
- - d2to1
- - dbus-glib
- - dbus-python
- - drizzle
- - drizzlepac
- - ds9
- - fftw
- - fitsblender
- - ginga
- - glue-core
- - glue-vispy-viewers
- - glueviz
- - gwcs
- - hstcal
- - htc_utils
- - imexam
- - jplephem
- - jwst
- - jwst_coronagraph_visibility
- - jwst_gtvt
- - jwxml
- - mosviz
- - namedlist
- - nictools
- - opuscoords
- - photutils
- - poppy
- - purge_path
- - py-expression-eval
- - pyds9
- - pyfftw
- - pymssql
- - pyobjc-core
- - pyobjc-framework-cocoa
- - pyobjc-framework-quartz
- - pyqtgraph
- - pyraf
- - pyregion
- - pysynphot
- - python-daemon
- - pytools
- - pywcs
- - reftools
- - relic
- - secretstorage
- - selenium
- - shunit2
- - specutils
- - specviz
- - spherical-geometry
- - sphinx_rtd_theme
- - sphinxcontrib-programoutput
- - stginga
- - stistools
- - stsci
- - stsci-data-analysis
- - stsci-hst
- - stsci.convolve
- - stsci.distutils
- - stsci.image
- - stsci.imagemanip
- - stsci.imagestats
- - stsci.ndimage
- - stsci.numdisplay
- - stsci.skypac
- - stsci.sphere
- - stsci.sphinxext
- - stsci.stimage
- - stsci.tools
- - stsynphot
- - stwcs
- - synphot
- - verhawk
- - wcstools
- - webbpsf
- - webbpsf-data
- - wfc3tools
- - wfpc2tools
- - xpa
diff --git a/manifests/dev-test.yaml b/manifests/dev-test.yaml
deleted file mode 100644
index 3b39ac0..0000000
--- a/manifests/dev-test.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Recipe repository
-repository: 'https://github.com/astroconda/astroconda-dev'
-
-# Publication channel to consult when determining what packages already exist.
-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-staging'
-packages:
- - py-expression-eval
-# - drizzlepac
-# - jwst_gtvt
-# - jwst
-# - pandokia
-# - crds
-# - cube-tools
-# - sphinxcontrib-programoutput
-# - pyds9
-# - wcstools
-# - webbpsf
-# - mosviz
-# - specutils
-# - glueviz
-# - glue-vispy-viewers
-# - glue-core
diff --git a/manifests/dev.yaml b/manifests/dev.yaml
deleted file mode 100644
index 41ab9de..0000000
--- a/manifests/dev.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-# Recipe repository
-repository: 'https://github.com/astroconda/astroconda-dev'
-git_ref_spec: 'master'
-
-# Publication channel to consult when determining what packages already exist.
-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-dev'
-packages:
- - acstools
- - appdirs
- - aprio
- - asdf
- - asdf-standard
- - asteval
- - astroimtools
- - astropy
- - astroquery
- - asv
- - calcos
- - cfitsio
- - costools
- - crds
- - cubeviz
- - d2to1
- - dbus-glib
- - dbus-python
- - drizzle
- - drizzlepac
- - ds9
- - fftw
- - fitsblender
- - ginga
- - glue-core
- - glue-vispy-viewers
- - glueviz
- - gwcs
- - hstcal
- - htc_utils
- - imexam
- - jplephem
- - jwst
- - jwst_coronagraph_visibility
- - jwst_gtvt
- - jwxml
- - mosviz
- - namedlist
- - nictools
- - opuscoords
- - photutils
- - poppy
- - purge_path
- - py-expression-eval
- - pyds9
- - pyfftw
- - pymssql
- - pyobjc-core
- - pyobjc-framework-cocoa
- - pyobjc-framework-quartz
- - pyqtgraph
- - pyraf
- - pyregion
- - pysynphot
- - python-daemon
- - pytools
- - pywcs
- - reftools
- - relic
- - secretstorage
- - selenium
- - sextractor
- - shunit2
- - specutils
- - specviz
- - spherical-geometry
- - sphinx_rtd_theme
- - sphinxcontrib-programoutput
- - stginga
- - stistools
- - stsci
- - stsci-data-analysis
- - stsci-hst
- - stsci.convolve
- - stsci.distutils
- - stsci.image
- - stsci.imagemanip
- - stsci.imagestats
- - stsci.ndimage
- - stsci.numdisplay
- - stsci.skypac
- - stsci.sphere
- - stsci.sphinxext
- - stsci.stimage
- - stsci.tools
- - stsynphot
- - stwcs
- - synphot
- - verhawk
- - wcstools
- - webbpsf
- - webbpsf-data
- - wfc3tools
- - wfpc2tools
- - xpa
diff --git a/manifests/jwst.yaml b/manifests/jwst.yaml
deleted file mode 100644
index f5ecee5..0000000
--- a/manifests/jwst.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Recipe repository
-repository: 'https://github.com/rendinam/astroconda-dev'
-git_ref_spec: 'jwst_parameterized_rev'
-
-# Publication channel to consult when determining what packages already exist.
-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-dev'
-
-# conda environment spec file generation is only performed if this field
-# is populated. Allowed values are:
-# 'jwstdp' - JWST Data processing release
-# 'hstdp' - HST Data processing release
-specfile_type: 'jwstdp'
-
-# Output location for produced environment spec files
-specfile_output: '/eng/ssb/websites/ssbpublic/astroconda-releases-staging'
-
-packages:
- - jwst
diff --git a/manifests/public-test.yaml b/manifests/public-test.yaml
deleted file mode 100644
index 901c39e..0000000
--- a/manifests/public-test.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Recipe repository
-repository: 'https://github.com/astroconda/astroconda-contrib'
-git_ref_spec: 'master'
-
-# Publication channel to consult when determining what packages already exist.
-channel_URL: 'http://ssb.stsci.edu/astroconda'
-
-# publication_root path needs to be visible from the slave nodes.
-publication_root: '/eng/ssb/websites/ssbpublic/astroconda-j-pub-staging'
-packages:
- - asdf
diff --git a/manifests/public.yaml b/manifests/public.yaml
deleted file mode 100644
index fc73036..0000000
--- a/manifests/public.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Recipe repository
-repository: 'https://github.com/astroconda/astroconda-contrib'
-git_ref_spec: 'master'
-
-# Publication channel to consult when determining what packages already exist.
-channel_URL: 'http://ssb.stsci.edu/astroconda'
-
-# publication_root path needs to be visible from the slave nodes.
-publication_root: '/eng/ssb/websites/ssbpublic/astroconda'
-packages:
- - acstools
- - appdirs
- - aprio
- - asdf
- - asdf-standard
- - astroimtools
- - astroquery
- - asteval
- - asv
- - calcos
- - cfitsio
- - costools
- - crds
- - cubeviz
- - d2to1
- - dbus-glib
- - dbus-python
- - drizzle
- - drizzlepac
- - ds9
- - fftw
- - fitsblender
- - fitsverify
- - ginga
- - glue-core
- - glue-ginga
- - glue-vispy-viewers
- - glueviz
- - gwcs
- - hstcal
- - htc_utils
- - imexam
- - jwst_coronagraph_visibility
- - jwst_footprints
- - jwst_gtvt
- - jwxml
- - mosviz
- - nictools
- - opuscoords
- - photutils
- - poppy
- - purge_path
- - py-expression-eval
- - pyds9
- - pyfftw
- - pyobjc-core
- - pyobjc-framework-cocoa
- - pyobjc-framework-quartz
- - pyqtgraph
- - pyraf
- - pyregion
- - pysynphot
- - python-daemon
- - pytools
- - pywcs
- - reftools
- - relic
- - secretstorage
- - selenium
- - shunit2
- - specutils
- - specviz
- - sphere
- - spherical-geometry
- - sphinx_rtd_theme
- - sphinxcontrib-programoutput
- - stginga
- - stistools
- - stsci
- - stsci-data-analysis
- - stsci-hst
- - stsci.convolve
- - stsci.distutils
- - stsci.image
- - stsci.imagemanip
- - stsci.imagestats
- - stsci.ndimage
- - stsci.numdisplay
- - stsci.skypac
- - stsci.sphere
- - stsci.sphinxext
- - stsci.stimage
- - stsci.tools
- - stsci_sphinx_theme
- - stsynphot
- - stwcs
- - synphot
- - verhawk
- - wcstools
- - webbpsf
- - webbpsf-data
- - wfc3tools
- - wfpc2tools
- - xpa
diff --git a/manifests/test-fail.yaml b/manifests/test-fail.yaml
deleted file mode 100644
index 055ef8f..0000000
--- a/manifests/test-fail.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Recipe repository
-repository: 'https://github.com/astroconda/astroconda-contrib'
-git_ref_spec: 'master'
-
-# Publication channel to consult when determining what packages already exist.
-channel_URL: 'http://ssb.stsci.edu/astroconda'
-
-# publication_root path needs to be visible from the slave nodes.
-publication_root: '/eng/ssb/websites/ssbpublic/astroconda-j-pub-testing'
-packages:
- - verhawk
- - INTENTIONALLY_INVALID
-
diff --git a/manifests/test.yaml b/manifests/test.yaml
deleted file mode 100644
index 5bc0a71..0000000
--- a/manifests/test.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Recipe repository
-repository: 'https://github.com/astroconda/astroconda-contrib'
-git_ref_spec: 'master'
-
-# Publication channel to consult when determining what packages already exist.
-channel_URL: 'http://ssb.stsci.edu/astroconda'
-
-# publication_root path needs to be visible from the slave nodes.
-publication_root: '/eng/ssb/websites/ssbpublic/astroconda-j-pub-testing'
-packages:
- - costools
- - cfitsio
-# - ds9
-# - crds
-# - cube-tools
-# - sphinxcontrib-programoutput
-# - pyds9
-# - wcstools
-# - webbpsf
-#
-# - mosviz
-# - specutils
-# - glueviz
-# - glue-vispy-viewers
-# - glue-core
generated by cgit (git 2.34.1) at 2025-04-28 18:00:47 -0400