set default context to jwst-edit

spacetelescope · Nov 27, 2024 · b8da81d · b8da81d
1 parent 615714b
commit b8da81d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 72 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ on:
         type: string
         required: false
         default: ''
-      crds_server:
-        description: CRDS server
+      crds_server_url:
+        description: CRDS server URL
         type: string
         required: false
         default: https://jwst-crds.stsci.edu
@@ -46,28 +46,17 @@ jobs:
       envs: |
         - linux: check-dependencies
         - linux: check-types
-  latest_crds_contexts:
-    uses: ./.github/workflows/contexts.yml
-  crds_context:
-    needs: [ latest_crds_contexts ]
-    runs-on: ubuntu-latest
-    steps:
-      - id: context
-        run: echo context=${{ github.event_name == 'workflow_dispatch' && (inputs.crds_context != '' && inputs.crds_context || needs.latest_crds_contexts.outputs.jwst) || needs.latest_crds_contexts.outputs.jwst }} >> $GITHUB_OUTPUT
-    outputs:
-      context: ${{ steps.context.outputs.context }}
   test:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@924441154cf3053034c6513d5e06c69d262fb9a6  # v1.13.0
-    needs: [ crds_context ]
     with:
       setenv: |
         CRDS_PATH: /tmp/data/crds_cache
-        CRDS_SERVER_URL: ${{ github.event_name == 'workflow_dispatch' && inputs.crds_server || 'https://jwst-crds.stsci.edu' }}
-        CRDS_CONTEXT: ${{ needs.crds_context.outputs.context }}
+        CRDS_SERVER_URL: ${{ inputs.crds_server_url || 'https://jwst-crds.stsci.edu' }}
+        CRDS_CONTEXT: ${{ inputs.crds_context || 'jwst-edit' }}
         CRDS_CLIENT_RETRY_COUNT: 3
         CRDS_CLIENT_RETRY_DELAY_SECONDS: 20
       cache-path: /tmp/data/crds_cache
-      cache-key: crds-${{ needs.crds_context.outputs.context }}
+      cache-key: crds-${{ inputs.crds_context || 'jwst-edit' }}
       envs: |
         - linux: py310-oldestdeps-xdist-cov
           pytest-results-summary: true

diff --git a/.github/workflows/ci_cron.yml b/.github/workflows/ci_cron.yml
@@ -11,8 +11,8 @@ on:
         type: string
         required: false
         default: ''
-      crds_server:
-        description: CRDS server
+      crds_server_url:
+        description: CRDS server URL
         type: string
         required: false
         default: https://jwst-crds.stsci.edu
@@ -22,25 +22,14 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  latest_crds_contexts:
-    uses: ./.github/workflows/contexts.yml
-  crds_context:
-    needs: [ latest_crds_contexts ]
-    runs-on: ubuntu-latest
-    steps:
-      - id: context
-        run: echo context=${{ github.event_name == 'workflow_dispatch' && (inputs.crds_context != '' && inputs.crds_context || needs.latest_crds_contexts.outputs.jwst) || needs.latest_crds_contexts.outputs.jwst }} >> $GITHUB_OUTPUT
-    outputs:
-      context: ${{ steps.context.outputs.context }}
   test:
     if: (github.repository == 'spacetelescope/jwst' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run scheduled tests')))
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@924441154cf3053034c6513d5e06c69d262fb9a6  # v1.13.0
-    needs: [ crds_context ]
     with:
       setenv: |
         CRDS_PATH: /tmp/crds_cache
-        CRDS_SERVER_URL: ${{ github.event_name == 'workflow_dispatch' && inputs.crds_server || 'https://jwst-crds.stsci.edu' }}
-        CRDS_CONTEXT: ${{ needs.crds_context.outputs.context }}
+        CRDS_SERVER_URL: ${{ inputs.crds_server_url || 'https://jwst-crds.stsci.edu' }}
+        CRDS_CONTEXT: ${{ inputs.crds_context || 'jwst-edit' }}
         CRDS_CLIENT_RETRY_COUNT: 3
         CRDS_CLIENT_RETRY_DELAY_SECONDS: 20
       cache-path: /tmp/crds_cache

diff --git a/.github/workflows/contexts.yml b/.github/workflows/contexts.yml
diff --git a/.github/workflows/tests_devdeps.yml b/.github/workflows/tests_devdeps.yml
@@ -20,8 +20,8 @@ on:
         type: string
         required: false
         default: ''
-      crds_server:
-        description: CRDS server
+      crds_server_url:
+        description: CRDS server URL
         type: string
         required: false
         default: https://jwst-crds.stsci.edu
@@ -31,25 +31,14 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  latest_crds_contexts:
-    uses: ./.github/workflows/contexts.yml
-  crds_context:
-    needs: [ latest_crds_contexts ]
-    runs-on: ubuntu-latest
-    steps:
-      - id: context
-        run: echo context=${{ github.event_name == 'workflow_dispatch' && (inputs.crds_context != '' && inputs.crds_context || needs.latest_crds_contexts.outputs.jwst) || needs.latest_crds_contexts.outputs.jwst }} >> $GITHUB_OUTPUT
-    outputs:
-      context: ${{ steps.context.outputs.context }}
   test:
     if: (github.repository == 'spacetelescope/jwst' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run devdeps tests')))
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@924441154cf3053034c6513d5e06c69d262fb9a6  # v1.13.0
-    needs: [ crds_context ]
     with:
       setenv: |
         CRDS_PATH: /tmp/data/crds_cache
-        CRDS_SERVER_URL: ${{ github.event_name == 'workflow_dispatch' && inputs.crds_server || 'https://jwst-crds.stsci.edu' }}
-        CRDS_CONTEXT: ${{ needs.crds_context.outputs.context }}
+        CRDS_SERVER_URL: ${{ inputs.crds_server_url || 'https://jwst-crds.stsci.edu' }}
+        CRDS_CONTEXT: ${{ inputs.crds_context || 'jwst-edit' }}
         CRDS_CLIENT_RETRY_COUNT: 3
         CRDS_CLIENT_RETRY_DELAY_SECONDS: 20
       cache-path: /tmp/data/crds_cache