From 0ff2af8b65205d0b65d5592b459bbdae494ef0b4 Mon Sep 17 00:00:00 2001
From: Max <xamrennerb@gmail.com>
Date: Wed, 23 Feb 2022 17:02:27 +0100
Subject: [PATCH] make sure testing ns is cleaned up (#401)

Signed-off-by: Max Brenner <xamrennerb@gmail.com>
---
 .github/workflows/interop.yml | 48 +++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/.github/workflows/interop.yml b/.github/workflows/interop.yml
index bf40aebcb..e40a2ce91 100644
--- a/.github/workflows/interop.yml
+++ b/.github/workflows/interop.yml
@@ -76,6 +76,12 @@ jobs:
           additional_args: "-o model-android='Galaxy S9' -o 'jobName=Github-Interop-galaxy-s9' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
           allure_results_artifact_name: allure-results-galaxy-s9
 
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-galaxy-s9
+
   test-iphone-12:
     runs-on: ubuntu-latest
     needs: [vars, test-galaxy-s9]
@@ -97,6 +103,12 @@ jobs:
           additional_args: "-o model-iOS='iPhone-12' -o 'jobName=Github-Interop-iphone-12' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
           allure_results_artifact_name: allure-results-iphone-12
 
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-iphone-12
+
   # interop-02
   test-galaxy-s10:
     runs-on: ubuntu-latest
@@ -119,6 +131,12 @@ jobs:
           additional_args: "-o model-android='Galaxy S10.*' -o 'jobName=Github-Interop-galaxy-s10' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
           allure_results_artifact_name: allure-results-galaxy-s10
 
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-galaxy-s10
+
   test-iphone-7:
     runs-on: ubuntu-latest
     needs: [vars, test-galaxy-s10]
@@ -140,6 +158,12 @@ jobs:
           additional_args: "-o model-iOS='iPhone-7' -o 'jobName=Github-Interop-iphone-7' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
           allure_results_artifact_name: allure-results-iphone-7
 
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-iphone-7
+
   # interop-03
   test-galaxy-s20:
     runs-on: ubuntu-latest
@@ -162,6 +186,12 @@ jobs:
           additional_args: "-o model-android='Galaxy S20' -o 'jobName=Github-Interop-galaxy-s20' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
           allure_results_artifact_name: allure-results-galaxy-s20
 
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-galaxy-s20
+
   test-iphone-xr:
     runs-on: ubuntu-latest
     needs: [vars, test-galaxy-s20]
@@ -183,6 +213,12 @@ jobs:
           additional_args: "-o model-iOS='iPhone-XR' -o 'jobName=Github-Interop-iphone-xr' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
           allure_results_artifact_name: allure-results-iphone-xr
 
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-iphone-xr
+
   #interop-04
   test-pixel-4:
     runs-on: ubuntu-latest
@@ -205,6 +241,12 @@ jobs:
           additional_args: "-o model-android='Pixel 4' -o 'jobName=Github-Interop-pixel-4' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
           allure_results_artifact_name: allure-results-pixel-4
 
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-pixel-4
+
   test-iphone-11:
     runs-on: ubuntu-latest
     needs: [vars, test-pixel-4]
@@ -226,6 +268,12 @@ jobs:
           additional_args: "-o model-iOS='iPhone-11' -o 'jobName=Github-Interop-iphone-11' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
           allure_results_artifact_name: allure-results-iphone-11
 
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-iphone-11
+
   report:
     needs: [vars, test-iphone-11, test-iphone-xr, test-iphone-12, test-iphone-7]
     if: "!cancelled()"