From df22046b1cb3bddf0ac7265032ea6d16f4f2e4fd Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 2 Oct 2023 12:59:48 -0400 Subject: [PATCH] use webbpsf data from grp in jenkins runs --- JenkinsfileRT | 6 ++---- JenkinsfileRT_dev | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/JenkinsfileRT b/JenkinsfileRT index bd1042a88..0d3a00e2a 100644 --- a/JenkinsfileRT +++ b/JenkinsfileRT @@ -57,7 +57,8 @@ env_vars = [ 'CRDS_PATH=/grp/crds/roman/test/', 'DD_ENV=ci', 'DD_SERVICE=romancal', - 'WEBBPSF_PATH=data/webbpsf-data' + 'WEBBPSF_PATH=/grp/jwst/ote/webbpsf-data', + 'PYSYN_CDBS=/grp/hst/cdbs', ] if (env.ENV_VARS) { env_vars.addAll(MultiLineToArray(env.ENV_VARS)) @@ -88,9 +89,6 @@ bc0.build_cmds = [ "pip install -e .[test]", "pip install pytest-xdist pytest-sugar ddtrace", 'echo "CRDS_CONTEXT = $(crds list --contexts $CRDS_CONTEXT --mappings | grep pmap)"', - "mkdir data", - "curl -L https://stsci.box.com/shared/static/0ojjfg3cieqdpd18vl1bjnpe63r82dx8.gz -o data/webbpsf-data.tar.gz", - "tar -xzvf data/webbpsf-data.tar.gz -C data", ] bc0.build_cmds = bc0.build_cmds + PipInject(env.OVERRIDE_REQUIREMENTS) bc0.build_cmds = bc0.build_cmds + [ diff --git a/JenkinsfileRT_dev b/JenkinsfileRT_dev index 7c8b3d11c..efd80e2dc 100644 --- a/JenkinsfileRT_dev +++ b/JenkinsfileRT_dev @@ -55,6 +55,8 @@ env_vars = [ "CRDS_CONTEXT=roman_0051.pmap", "CRDS_SERVER_URL=https://serverless", 'CRDS_PATH=/grp/crds/roman/test/', + 'WEBBPSF_PATH=/grp/jwst/ote/webbpsf-data', + 'PYSYN_CDBS=/grp/hst/cdbs', ] if (env.ENV_VARS) { env_vars.addAll(MultiLineToArray(env.ENV_VARS))