From 6b0b93809ab4dbb9d60955bed7dd9c0859131034 Mon Sep 17 00:00:00 2001
From: Andrew Sun <asun@redhat.com>
Date: Thu, 13 Feb 2020 10:32:16 -0500
Subject: [PATCH] Don't clobber the log artifacts

---
 .github/workflow-templates/test.yml  | 10 +++++++++-
 .github/workflows/test_generated.yml | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.github/workflow-templates/test.yml b/.github/workflow-templates/test.yml
index 1a1f3adfd5f..2ce1f3311b4 100644
--- a/.github/workflow-templates/test.yml
+++ b/.github/workflow-templates/test.yml
@@ -83,6 +83,8 @@ jobs:
     name: e2e-kind-ovn-shard-n
     runs-on: ubuntu-latest
     needs: k8s
+    env:
+      JOB_NAME: "e2e-shard-n"
     steps:
     - *step_gosetup
     - *step_checkout
@@ -135,13 +137,15 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v1
       with:
-        name: kind-logs
+        name: kind-logs-${{ github.run_id }}-${{ env.JOB_NAME }}
         path: /tmp/kind/logs
 
   e2e-shard-np:
     name: e2e-kind-ovn-shard-np
     runs-on: ubuntu-latest
     needs: k8s
+    env:
+      JOB_NAME: "e2e-shard-np"
     steps:
     - *step_gosetup
     - *step_checkout
@@ -169,6 +173,8 @@ jobs:
     name: e2e-kind-ovn-shard-s
     runs-on: ubuntu-latest
     needs: k8s
+    env:
+      JOB_NAME: "e2e-shard-s"
     steps:
     - *step_gosetup
     - *step_checkout
@@ -195,6 +201,8 @@ jobs:
     name: e2e-kind-ovn-shard-other
     runs-on: ubuntu-latest
     needs: k8s
+    env:
+      JOB_NAME: "e2e-shard-other"
     steps:
     - *step_gosetup
     - *step_checkout
diff --git a/.github/workflows/test_generated.yml b/.github/workflows/test_generated.yml
index ab4591a2c11..9311a98a361 100644
--- a/.github/workflows/test_generated.yml
+++ b/.github/workflows/test_generated.yml
@@ -84,6 +84,8 @@ jobs:
     name: e2e-kind-ovn-shard-n
     runs-on: ubuntu-latest
     needs: k8s
+    env:
+      JOB_NAME: e2e-shard-n
     steps:
     - name: Set up Go 1.12
       uses: actions/setup-go@v1
@@ -155,12 +157,14 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v1
       with:
-        name: kind-logs
+        name: kind-logs-${{ github.run_id }}-${{ env.JOB_NAME }}
         path: "/tmp/kind/logs"
   e2e-shard-np:
     name: e2e-kind-ovn-shard-np
     runs-on: ubuntu-latest
     needs: k8s
+    env:
+      JOB_NAME: e2e-shard-np
     steps:
     - name: Set up Go 1.12
       uses: actions/setup-go@v1
@@ -231,12 +235,14 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v1
       with:
-        name: kind-logs
+        name: kind-logs-${{ github.run_id }}-${{ env.JOB_NAME }}
         path: "/tmp/kind/logs"
   e2e-shard-s:
     name: e2e-kind-ovn-shard-s
     runs-on: ubuntu-latest
     needs: k8s
+    env:
+      JOB_NAME: e2e-shard-s
     steps:
     - name: Set up Go 1.12
       uses: actions/setup-go@v1
@@ -306,12 +312,14 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v1
       with:
-        name: kind-logs
+        name: kind-logs-${{ github.run_id }}-${{ env.JOB_NAME }}
         path: "/tmp/kind/logs"
   e2e-shard-other:
     name: e2e-kind-ovn-shard-other
     runs-on: ubuntu-latest
     needs: k8s
+    env:
+      JOB_NAME: e2e-shard-other
     steps:
     - name: Set up Go 1.12
       uses: actions/setup-go@v1
@@ -381,5 +389,5 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v1
       with:
-        name: kind-logs
+        name: kind-logs-${{ github.run_id }}-${{ env.JOB_NAME }}
         path: "/tmp/kind/logs"