CI improvements

Signed-off-by: shimritproj <[email protected]>
metallb · Nov 6, 2023 · 99510af · 99510af
1 parent da389cb
commit 99510af
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 33 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,6 +1,8 @@
 name: CI
 
 on:
+  push:
+    branches: [main]
   merge_group:
   pull_request:
     branches:
@@ -169,22 +171,10 @@ jobs:
         export KUBECONFIG=${HOME}/.kube/config
         make test-validation
         make test-e2e
-    - name: Archive E2E Tests logs
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: test_e2e_logs
-        path: /tmp/test_e2e_logs/
-    - name: Export kind logs
-      if: ${{ failure() }}
-      run: |
-        kind export logs /tmp/kind_logs
-    - name: Archive kind logs
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: kind_logs
-        path: /tmp/kind_logs
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Collect Logs
+      uses: ./.github/workflows/composite/collectlogs
 
     - name: Checkout Latest Metal LB Operator
       uses: actions/checkout@v2
@@ -221,22 +211,10 @@ jobs:
         export KUBECONFIG=${HOME}/.kube/config
         make test-validation
         make test-e2e
-    - name: Archive E2E Tests logs
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: test_e2e_logs
-        path: /tmp/test_e2e_logs/
-    - name: Export kind logs
-      if: ${{ failure() }}
-      run: |
-        kind export logs /tmp/kind_logs
-    - name: Archive kind logs
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: kind_logs
-        path: /tmp/kind_logs
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Collect Logs
+      uses: ./.github/workflows/composite/collectlogs
   metallb_e2e:
     runs-on: ubuntu-20.04
     env:

diff --git a/.github/workflows/composite/setup/action.yaml b/.github/workflows/composite/setup/action.yaml
@@ -1,5 +1,5 @@
 name: "install-deps"
-description: "Install deps required for metallb CI"
+description: "Install deps required for metallb-operator CI"
 
 runs:
   using: "composite"