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.

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

don't use crds sync for CRDS caching, and also consolidate CI jobs #7444

Closed

Conversation

zacharyburnett
Copy link
Collaborator

@zacharyburnett zacharyburnett commented Jan 30, 2023

This PR addresses the issue brought up in #7414 (comment), where the CRDS caching is broken due to not caching the correct files. Additionally, consolidates CI jobs to reduce duplicate configuration in ci.yml. Altogether this should be a simple change to simplify the CI.

image

Checklist for maintainers

  • added entry in CHANGES.rst within the relevant release section
  • updated or added relevant tests
  • updated relevant documentation
  • added relevant milestone
  • added relevant label(s)
  • ran regression tests, post a link to the Jenkins job below.
    How to run regression tests on a PR
  • Make sure the JIRA ticket is resolved properly

@zacharyburnett zacharyburnett self-assigned this Jan 30, 2023
@github-actions github-actions bot added automation Continuous Integration (CI) and testing automation tools testing labels Jan 30, 2023
Comment on lines 70 to 85
- run: >
echo "pmap=$(
curl -s -X POST -d '{"jsonrpc": "1.0", "method": "get_default_context", "params": ["jwst"], "id": 1}' ${{ env.CRDS_SERVER_URL }}/json/ |
python -c "import sys, json; print(json.load(sys.stdin)['result'])"
)" >> $GITHUB_OUTPUT
# Get default CRDS_CONTEXT without installing crds client
# See https://hst-crds.stsci.edu/static/users_guide/web_services.html#generic-request
id: crds-context
if: ${{ contains(matrix.toxenv, 'test') && !contains(matrix.toxenv, 'opencv') }}
- run: echo "CRDS CONTEXT ${{ steps.crds-context.outputs.pmap }}"
if: ${{ contains(matrix.toxenv, 'test') && !contains(matrix.toxenv, 'opencv') }}
- uses: actions/cache@v3
with:
path: ${{ env.CRDS_PATH }}
key: crds-${{ needs.cache_crds.outputs.crds-context }}
key: crds-${{ steps.crds-context.outputs.pmap }}
if: ${{ contains(matrix.toxenv, 'test') && !contains(matrix.toxenv, 'opencv') }}
Copy link
Collaborator Author

@zacharyburnett zacharyburnett Jan 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only cache CRDS for test job if it does not have the opencv factor

@codecov
Copy link

codecov bot commented Jan 30, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (4285c4e) 77.58% compared to head (d8b42f1) 77.58%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #7444   +/-   ##
=======================================
  Coverage   77.58%   77.58%           
=======================================
  Files         449      449           
  Lines       36029    36029           
=======================================
  Hits        27952    27952           
  Misses       8077     8077           
Flag Coverage Δ *Carryforward flag
nightly 77.58% <ø> (ø) Carriedforward from 4285c4e
unit 49.57% <ø> (ø)

*This pull request uses carry forward flags. Click here to find out more.

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@zacharyburnett zacharyburnett marked this pull request as ready for review January 31, 2023 12:57
@zacharyburnett zacharyburnett changed the title don't use crds sync for CRDS caching don't use crds sync for CRDS caching and consolidate jobs Feb 7, 2023
@zacharyburnett zacharyburnett changed the title don't use crds sync for CRDS caching and consolidate jobs don't use crds sync for CRDS caching, and also consolidate CI jobs Feb 14, 2023
@zacharyburnett zacharyburnett requested a review from a team as a code owner April 7, 2023 17:50
@zacharyburnett
Copy link
Collaborator Author

zacharyburnett commented Apr 7, 2023

superseded by #7498

@zacharyburnett zacharyburnett deleted the cache_crds branch April 7, 2023 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation Continuous Integration (CI) and testing automation tools no-changelog-entry-needed testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant