From edfa53813fc828cfefcc4c85369ec0012ee9454c Mon Sep 17 00:00:00 2001
From: Noopur <noopur@intel.com>
Date: Mon, 3 Feb 2025 19:54:22 +0530
Subject: [PATCH] TaskRunner E2E - Fix artifact issue for  nested model
 structure (#1332)

Signed-off-by: noopur <noopur@intel.com>
---
 .github/actions/tr_post_test_run/action.yml   |  5 ++++-
 .github/workflows/task_runner_fedeval_e2e.yml | 11 ++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/actions/tr_post_test_run/action.yml b/.github/actions/tr_post_test_run/action.yml
index f5c8849283..c7ce11a8e1 100644
--- a/.github/actions/tr_post_test_run/action.yml
+++ b/.github/actions/tr_post_test_run/action.yml
@@ -25,6 +25,9 @@ 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
@@ -32,5 +35,5 @@ runs:
       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
index 21841c3527..4e10f1d4c7 100644
--- 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"
\ No newline at end of file
+          test_type: "tr_no_client_auth"