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.

Sign up for GitHub

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

move run results directory on Artifactory to regression-tests/runs/ #8924

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

move run results directory on Artifactory to regression-tests/runs/ #8924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68fc2d5
move run results upload to subdir of Artifactory repo
zacharyburnett Oct 25, 2024
b82a4e8
change log entry
zacharyburnett Oct 28, 2024
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
1 change: 1 addition & 0 deletions changes/8924.general.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
move regression test run directories on Artifactory to ``regression-tests/runs/``
2 changes: 1 addition & 1 deletion jwst/regtest/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
results_root = pytestconfig.getini('results_root')
# see not above about inputs_root
if not results_root:
results_root = "jwst-pipeline-results"
results_root = "jwst-pipeline-results/regression-tests/runs/"

Check warning on line 40 in jwst/regtest/conftest.py

View check run for this annotation

Codecov / codecov/patch

jwst/regtest/conftest.py#L40 

Added line #L40 was not covered by tests
else:
results_root = results_root[0]
return inputs_root, results_root
Expand Down
2 changes: 1 addition & 1 deletion jwst/regtest/regtestdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class RegtestData:
"""Defines data paths on Artifactory and data retrieval methods"""

def __init__(self, env="dev", inputs_root="jwst-pipeline",
results_root="jwst-pipeline-results", docopy=True,
results_root="jwst-pipeline-results/regression-tests/runs/", docopy=True,
input=None, input_remote=None, output=None, truth=None,
truth_remote=None, remote_results_path=None, test_name=None,
traceback=None, okify_op='file_copy', **kwargs):
Expand Down
4 changes: 2 additions & 2 deletions jwst/scripts/okify_regtests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import readchar
from colorama import Fore

ARTIFACTORY_REPO = 'jwst-pipeline-results'
ARTIFACTORY_REPO = 'jwst-pipeline-results/regression-tests/runs/'
SPECFILE_SUFFIX = '_okify.json'
RTDATA_SUFFIX = '_rtdata.asdf'
TERMINAL_WIDTH = shutil.get_terminal_size((80, 20)).columns
Expand Down Expand Up @@ -103,7 +103,7 @@ def artifactory_get_breadcrumbs(build_number, suffix):

An example search for build 586 would be:

jfrog rt search jwst-pipeline-results/*_GITHUB_CI_*-586/*_okify.json
jfrog rt search jwst-pipeline-results/regression-tests/runs/*_GITHUB_CI_*-586/*_okify.json
"""

# Retrieve all the okify specfiles for failed tests.
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ norecursedirs = [
]
junit_family = "xunit2"
inputs_root = "jwst-pipeline"
results_root = "jwst-pipeline-results"
results_root = "jwst-pipeline-results/regression-tests/runs/"
text_file_format = "rst"
doctest_plus = "enabled"
doctest_rst = "enabled"
Expand Down
Loading