diff --git a/JenkinsfileRT b/JenkinsfileRT index 0ed2dc318..82c214621 100644 --- a/JenkinsfileRT +++ b/JenkinsfileRT @@ -7,6 +7,8 @@ if (env.ARTIFACTORY_ENV) { artifactory_env = env.ARTIFACTORY_ENV } +codecov_install = "curl -Os https://uploader.codecov.io/latest/linux/codecov && chmod +x codecov" + // Allow modification of the job configuration, affects all relevant // build configs. // Pass this object in the argument list to the`run()` function below @@ -28,11 +30,12 @@ bc1.nodetype = 'linux' bc1.env_vars = ['TEST_BIGDATA=https://bytesalad.stsci.edu/artifactory'] bc1.name = '3.10' bc1.conda_packages = ['python=3.10'] -bc1.build_cmds = ["pip install numpy astropy codecov pytest-cov ci-watson", +bc1.build_cmds = ["pip install numpy astropy pytest-cov ci-watson", "pip install --upgrade -e '.[test]'", "pip freeze"] bc1.test_cmds = ["pytest --env=${artifactory_env} --cov=./ --basetemp=tests_output --junitxml=results.xml --bigdata", - "codecov"] + "${codecov_install}", + "./codecov"] bc1.test_configs = [data_config] bc1.failedFailureThresh = 0 @@ -41,11 +44,12 @@ bc2.name = '3.10-dev' bc2.nodetype = 'linux' bc2.env_vars = ['TEST_BIGDATA=https://bytesalad.stsci.edu/artifactory'] bc2.conda_packages = ['python=3.10'] -bc2.build_cmds = ["pip install numpy astropy codecov pytest-cov ci-watson || true", +bc2.build_cmds = ["pip install numpy astropy pytest-cov ci-watson || true", "pip install -r requirements-dev.txt --upgrade -e '.[test]' || true", "pip freeze || true"] bc2.test_cmds = ["pytest --env=${artifactory_env} --cov=./ --basetemp=tests_output --junitxml=results.xml --bigdata || true", - "codecov || true"] + "${codecov_install}", + "./codecov || true"] bc2.test_configs = [data_config] // Apply a large failure threshold to prevent marking the pipeline job failed // when xunit ingests any test results @@ -60,6 +64,9 @@ bc3.conda_packages = ['python=3.11'] bc3.build_cmds = ["pip install numpy astropy ci-watson", "pip install --upgrade -e '.[test]'", "pip freeze"] +bc3.test_cmds = ["pytest --env=${artifactory_env} --cov=./ --basetemp=tests_output --junitxml=results.xml --bigdata", + "${codecov_install}", + "./codecov"] bc3.test_configs = [data_config] // bc4 = utils.copy(bc3)