TaskRunner E2E - Fix artifact issue for nested model structure (#1332)

Signed-off-by: noopur <[email protected]>
securefederatedai · Feb 3, 2025 · edfa538 · edfa538
1 parent 812808a
commit edfa538
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.github/actions/tr_post_test_run/action.yml b/.github/actions/tr_post_test_run/action.yml
@@ -25,12 +25,15 @@ runs:
       if: ${{ always() }}
       run: |
         tar -cvf result.tar --exclude="cert" --exclude="data" --exclude="__pycache__" $HOME/results
+        # Model name might contain forward slashes, convert them to underscore. 
+        tmp=${{ env.MODEL_NAME }}
+        echo "MODEL_NAME_MODIFIED=${tmp/\//_}" >> $GITHUB_ENV
       shell: bash
 
     - name: Upload Artifacts
       id: upload_artifacts
       uses: actions/upload-artifact@v4
       if: ${{ always() }}
       with:
-        name: ${{ inputs.test_type }}_${{ env.MODEL_NAME }}_python${{ env.PYTHON_VERSION }}_${{ github.run_id }}
+        name: ${{ inputs.test_type }}_${{ env.MODEL_NAME_MODIFIED }}_python${{ env.PYTHON_VERSION }}_${{ github.run_id }}
         path: result.tar
diff --git a/.github/workflows/task_runner_fedeval_e2e.yml b/.github/workflows/task_runner_fedeval_e2e.yml
@@ -30,6 +30,9 @@ env:
 jobs:
   test_with_tls:
     name: tr_tls
+    if: |
+      (github.event_name == 'schedule' && github.repository_owner == 'securefederatedai') ||
+      (github.event_name == 'workflow_dispatch')
     runs-on: ubuntu-22.04
     timeout-minutes: 30
     strategy:
@@ -73,6 +76,9 @@ jobs:
 
   test_with_non_tls:
     name: tr_non_tls
+    if: |
+      (github.event_name == 'schedule' && github.repository_owner == 'securefederatedai') ||
+      (github.event_name == 'workflow_dispatch')
     runs-on: ubuntu-22.04
     timeout-minutes: 30
     strategy:
@@ -116,6 +122,9 @@ jobs:
 
   test_with_no_client_auth:
     name: tr_no_client_auth
+    if: |
+      (github.event_name == 'schedule' && github.repository_owner == 'securefederatedai') ||
+      (github.event_name == 'workflow_dispatch')
     runs-on: ubuntu-22.04
     timeout-minutes: 30
     strategy:
@@ -155,4 +164,4 @@ jobs:
         uses: ./.github/actions/tr_post_test_run
         if: ${{ always() }}
         with:
-          test_type: "tr_no_client_auth"
+          test_type: "tr_no_client_auth"