From 924eaaf4790430d1df409e5362acacc07236814d Mon Sep 17 00:00:00 2001
From: Mike Kolesnik <mkolesni@redhat.com>
Date: Wed, 19 May 2021 11:30:04 +0300
Subject: [PATCH] Test OVN on deploy job

E2E testing in this repo simply only that the E2E script functions as
expected by running basic E2E tests that dont necessarily test
connectivity.

Since OVN is relevant at deployment stage for this repo, it should be
tested with the rest of deployment checks.

Also added a disk space clearing since OVN takes much more space and can
exhaust the disk space and fail the job.

Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
---
 .github/workflows/scripts.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/scripts.yml b/.github/workflows/scripts.yml
index c8b7b8012..058ffd168 100644
--- a/.github/workflows/scripts.yml
+++ b/.github/workflows/scripts.yml
@@ -48,20 +48,28 @@ jobs:
         globalnet: ['', 'globalnet']
         deploytool: ['operator', 'helm']
         lighthouse: ['']
+        ovn: ['']
         include:
+          - ovn: ovn
           - deploytool: operator
             lighthouse: lighthouse
           - deploytool: helm
             lighthouse: lighthouse
     steps:
+      - name: Reclaim space on GHA host (if the job needs it)
+        if: ${{ matrix.ovn != '' }}
+        run: rm -rf /usr/share/dotnet
+
       - name: Check out the repository
         uses: actions/checkout@v2
+        with:
+          submodules: true
 
       - name: Deploy clusters and Submariner
         env:
           CLUSTERS_ARGS: --timeout 1m
           DEPLOY_ARGS: --timeout 2m
-        run: make deploy using="${{ matrix.globalnet }} ${{ matrix.deploytool }} ${{ matrix.lighthouse }}"
+        run: make deploy using="${{ matrix.globalnet }} ${{ matrix.deploytool }} ${{ matrix.lighthouse }} ${{ matrix.ovn }}"
 
       - name: Post mortem
         if: failure()
@@ -74,17 +82,12 @@ jobs:
     name: E2E
     timeout-minutes: 30
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ovn: ['', 'ovn']
     steps:
       - name: Check out the repository
         uses: actions/checkout@v2
-        with:
-          submodules: true
 
       - name: Run E2E deployment and tests
-        run: make e2e using="${{ matrix.ovn }}"
+        run: make e2e
 
       - name: Post mortem
         if: failure()