Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TST: JenkinsfileRT will open issue on failure, remove stsci.convolve from Jenkins #195

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ for (numpy_ver in matrix_numpy) {
'sphinx',
'sphinx_rtd_theme',
'stsci_rtd_theme',
'stsci.convolve',
'stsci.image',
'stsci.imagemanip',
'stsci.imagestats',
Expand All @@ -48,7 +47,7 @@ for (numpy_ver in matrix_numpy) {
'stsci.stimage',
'setuptools',
// test dependencies
'pytest=3.8.2',
'pytest',
'pytest-remotedata',
'crds']
// Dependencies that change based on build matrix entry.
Expand All @@ -58,7 +57,7 @@ for (numpy_ver in matrix_numpy) {
bc.build_cmds = ["python setup.py install"]
bc.test_cmds = ["pytest --basetemp=tests_output --junitxml results.xml --bigdata --remote-data=any"]
bc.test_configs = [data_config]
matrix += bc
matrix += bc
matrix_id++
}}}

Expand Down
15 changes: 9 additions & 6 deletions JenkinsfileRT
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
// Obtain files from source control system.
if (utils.scm_checkout()) return

// Allow modification of the job configuration, affects all relevant build configs.
// Pass this object in the argument list to the`run()` function below to apply these settings to the job's execution.
jobconfig = new JobConfig()
jobconfig.post_test_summary = true

def test_env = [
'PATH=./miniconda-bconf0/bin:$PATH',
'HOME=./',
'TEST_BIGDATA=https://bytesalad.stsci.edu/artifactory'
]


// Configure artifactory ingest
data_config = new DataConfig()
data_config.server_id = 'bytesalad'
data_config.root = 'tests_output'
data_config.match_prefix = '(.*)_result' // .json is appended automatically


bc = new BuildConfig()
bc.nodetype = 'linux'
bc.env_vars = test_env
Expand All @@ -27,15 +29,14 @@ bc.conda_packages = ['numpy',
'nictools',
'numpydoc',
'pyregion',
'pytest=3.8.2',
'pytest',
'pytest-remotedata',
'crds',
'scipy',
'spherical-geometry',
'sphinx',
'sphinx_rtd_theme',
'stsci_rtd_theme',
'stsci.convolve',
'stsci.image',
'stsci.imagemanip',
'stsci.imagestats',
Expand All @@ -50,5 +51,7 @@ bc.build_cmds = ["conda install -q astropy stwcs -c http://ssb.stsci.edu/astroco
bc.test_cmds = ["pytest --basetemp=tests_output --junitxml results.xml --bigdata --remote-data=any"]
bc.test_configs = [data_config]

utils.run([bc])

// Iterate over configurations that define the (distributed) build matrix.
// Spawn a host (or workdir) for each combination and run in parallel.
// Also apply the job configuration defined in `jobconfig` above.
utils.run([bc, jobconfig])