From 64cbe4de7d14edeae192c89ab09e5283fe281b26 Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Tue, 21 Mar 2023 12:31:02 -0400 Subject: [PATCH 1/2] copy commands to MacOS jobs --- JenkinsfileRT | 15 +++++++++++++-- JenkinsfileRT_dev | 13 +++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/JenkinsfileRT b/JenkinsfileRT index 69439ce44..aab746eee 100644 --- a/JenkinsfileRT +++ b/JenkinsfileRT @@ -106,9 +106,20 @@ bc0.failedFailureThresh = 0 bc1 = utils.copy(bc0) bc1.nodetype = 'macos' bc1.name = 'macos-stable-deps' -bc1.build_cmds = ["pip install -e ."] +bc1.build_cmds = [ + "pip install -e .[test,ephem]", + "pip install pytest-xdist pytest-sugar ddtrace", + "pip freeze", + 'echo "CRDS_CONTEXT = $(crds list --contexts $CRDS_CONTEXT --mappings | grep pmap)"', +] bc1.build_cmds = PipInject(env.OVERRIDE_REQUIREMENTS) + bc1.build_cmds -bc1.test_cmds = [] +bc1.test_cmds = [ + "pytest --cov-report=xml --cov=./ -r sxf -n auto --bigdata --slow \ + --ddtrace \ + --basetemp=${pytest_basetemp} --junit-xml=results.xml --dist=loadscope \ + --env=${artifactoryenv} ${pytest_args}", + 'codecov --token=${codecov_token} -F nightly', +] bc1.test_configs = [] utils.run([jobconfig, bc0, bc1]) diff --git a/JenkinsfileRT_dev b/JenkinsfileRT_dev index 8c58db7d4..c807479cb 100644 --- a/JenkinsfileRT_dev +++ b/JenkinsfileRT_dev @@ -102,9 +102,18 @@ bc0.failedFailureThresh = 0 bc1 = utils.copy(bc0) bc1.nodetype = 'macos' bc1.name = 'macos-unstable-deps' -bc1.build_cmds = ["pip install -e ."] +bc1.build_cmds = [ + "pip install -e .[test,ephem]", + "pip install pytest-xdist pytest-sugar", + "pip freeze", + 'echo "CRDS_CONTEXT = $(crds list --contexts $CRDS_CONTEXT --mappings | grep pmap)"', +] bc1.build_cmds = PipInject(env.OVERRIDE_REQUIREMENTS) + bc1.build_cmds -bc1.test_cmds = [] +bc1.test_cmds = [ + "pytest -r sxf -n auto --bigdata --slow \ + --basetemp=${pytest_basetemp} --junit-xml=results.xml --dist=loadscope \ + --env=${artifactoryenv} ${pytest_args}", +] bc1.test_configs = [] utils.run([jobconfig, bc0, bc1]) From 00c186ad7eb62fc4d69691a0617d80d16e1db92f Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Wed, 22 Mar 2023 09:00:52 -0400 Subject: [PATCH 2/2] install requirements-dev.txt --- JenkinsfileRT_dev | 1 + 1 file changed, 1 insertion(+) diff --git a/JenkinsfileRT_dev b/JenkinsfileRT_dev index c807479cb..217f65524 100644 --- a/JenkinsfileRT_dev +++ b/JenkinsfileRT_dev @@ -102,6 +102,7 @@ bc0.failedFailureThresh = 0 bc1 = utils.copy(bc0) bc1.nodetype = 'macos' bc1.name = 'macos-unstable-deps' +bc1.pip_reqs_files = ['requirements-dev.txt'] bc1.build_cmds = [ "pip install -e .[test,ephem]", "pip install pytest-xdist pytest-sugar",