Remove model-name input from generate-checksums.yml/test-repro.yml,…

… infer via repo name
ACCESS-NRI · Jun 18, 2024 · 59da225 · 59da225
1 parent 0b39406
commit 59da225
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/config-pr-1-ci.yml b/.github/workflows/config-pr-1-ci.yml
@@ -180,7 +180,6 @@ jobs:
     if: needs.commit-check.outputs.authorship != vars.GH_ACTIONS_BOT_GIT_USER_NAME && needs.branch-check.result == 'success'
     uses: access-nri/model-config-tests/.github/workflows/test-repro.yml@main
     with:
-      model-name: access-om2
       environment-name: Gadi
       config-tag: ${{ github.head_ref }}
       test-markers: ${{ needs.config.outputs.repro-markers }}

diff --git a/.github/workflows/config-schedule-2-start.yml b/.github/workflows/config-schedule-2-start.yml
@@ -43,7 +43,6 @@ jobs:
       - config
     uses: access-nri/model-config-tests/.github/workflows/test-repro.yml@main
     with:
-      model-name: access-om2
       environment-name: Gadi
       config-tag: ${{ inputs.config-tag }}
       test-markers: ${{ needs.config.outputs.markers }}

diff --git a/.github/workflows/generate-checksums.yml b/.github/workflows/generate-checksums.yml
@@ -2,10 +2,6 @@ name: Initial Checksums
 on:
   workflow_call:
     inputs:
-      model-name:
-        type: string
-        required: true
-        description: Name of the model that is having it's checksums generated.
       config-branch-name:
         type: string
         required: true
@@ -50,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: ${{ inputs.environment-name }}
     env:
-      EXPERIMENT_LOCATION: ${{ vars.EXPERIMENTS_LOCATION }}/${{ inputs.model-name }}/${{ inputs.config-branch-name }}
+      EXPERIMENT_LOCATION: ${{ vars.EXPERIMENTS_LOCATION }}/${{ github.event.repository.name }}/${{ inputs.config-branch-name }}
     outputs:
       artifact-name: ${{ steps.artifact.outputs.name }}
       checksum-location: ${{ steps.run.outputs.checksum-location }}
@@ -122,7 +118,7 @@ jobs:
 
       - name: Generate Output Artifact Name
         id: artifact
-        run: echo "name=${{ inputs.model-name }}-${{ inputs.config-branch-name }}" >> $GITHUB_OUTPUT
+        run: echo "name=${{ github.event.repository.name }}-${{ inputs.config-branch-name }}" >> $GITHUB_OUTPUT
 
       - name: Upload Output
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/test-repro.yml b/.github/workflows/test-repro.yml
@@ -2,10 +2,6 @@ name: Repro Checks
 on:
   workflow_call:
     inputs:
-      model-name:
-        type: string
-        required: true
-        description: The name of the model to check for reproducibility
       config-tag:
         type: string
         required: true
@@ -46,7 +42,7 @@ jobs:
       artifact-name: ${{ steps.artifact.outputs.name }}
       experiment-location: ${{ steps.run.outputs.experiment-location }}
     env:
-      EXPERIMENT_LOCATION: ${{ vars.EXPERIMENTS_LOCATION }}/${{ inputs.model-name }}/${{ inputs.config-tag }}
+      EXPERIMENT_LOCATION: ${{ vars.EXPERIMENTS_LOCATION }}/${{ github.event.repository.name }}/${{ inputs.config-tag }}
     steps:
       - name: Setup SSH
         id: ssh
@@ -94,14 +90,14 @@ jobs:
           model-config-tests -s -m "${{ inputs.test-markers }}" \
             --output-path ${{ env.EXPERIMENT_LOCATION }} \
             --junitxml=${{ env.EXPERIMENT_LOCATION }}/checksum/test_report.xml
-          
+
           # Deactivate and remove the test virtual environment
           deactivate
           rm -rf ${{ env.TEST_VENV_LOCATION }}
 
           # We want the exit code post-`pytest` to be 0 so the overall `ssh` call succeeeds
           # after a potential `pytest` error.
-          exit 0          
+          exit 0
           EOT
           echo "experiment-location=${{ env.EXPERIMENT_LOCATION }}" >> $GITHUB_OUTPUT
 
@@ -113,7 +109,7 @@ jobs:
 
       - name: Generate Test Output Artifact Name
         id: artifact
-        run: echo "name=${{ inputs.model-name }}-${{ inputs.config-tag }}" >> $GITHUB_OUTPUT
+        run: echo "name=${{ github.event.repository.name }}-${{ inputs.config-tag }}" >> $GITHUB_OUTPUT
 
       - name: Upload Test Output
         uses: actions/upload-artifact@v3