From 753d4d64e109dffaa7fac334282623c49158a9af Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Mon, 5 Jun 2023 10:11:10 -0400 Subject: [PATCH] Add a `pip list` step after the overrides are injected Currently the pip freeze happens after the initial dependency install, but before the OVERRIDE_REQUIREMENTS option is handled by Jenkins. This makes it difficult to see if Jenkins has successfully installed an overriden requirement for the test run. --- JenkinsfileRT | 4 +++- JenkinsfileRT_dev | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/JenkinsfileRT b/JenkinsfileRT index 8c84a002d..31c11a308 100644 --- a/JenkinsfileRT +++ b/JenkinsfileRT @@ -86,10 +86,12 @@ bc0.pip_reqs_files = ['requirements-sdp.txt'] bc0.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)"', ] bc0.build_cmds = bc0.build_cmds + PipInject(env.OVERRIDE_REQUIREMENTS) +bc0.build_cmds = bc0.build_cmds + [ + "pip list" +] bc0.test_cmds = [ "pytest --cov-report=xml:coverage.xml --cov=./ -r sxf -n auto --bigdata --slow \ --ddtrace \ diff --git a/JenkinsfileRT_dev b/JenkinsfileRT_dev index 3d5d90175..7aced5844 100644 --- a/JenkinsfileRT_dev +++ b/JenkinsfileRT_dev @@ -84,10 +84,12 @@ bc0.pip_reqs_files = ['requirements-dev.txt'] bc0.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)"', ] bc0.build_cmds = bc0.build_cmds + PipInject(env.OVERRIDE_REQUIREMENTS) +bc0.build_cmds = bc0.build_cmds + [ + "pip list" +] bc0.test_cmds = [ "pytest -r sxf -n auto --bigdata --slow \ --basetemp=${pytest_basetemp} --junit-xml=results.xml --dist=loadscope \