From 0ff8becc6323991db7cd3ea2c1ac967877144050 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Mon, 23 Mar 2020 17:09:12 -0700
Subject: [PATCH] install conntrack everywhere, check for vm-driver in tests

---
 .github/workflows/main.yml | 24 ++++++++++++++----------
 test/integration/main.go   |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d03af3365..379b82f12 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -93,6 +93,10 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get -qq -y install liblz4-tool
+    - name: Install conntrack
+      shell: bash
+      run: |
+        sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash
       run: |
@@ -160,6 +164,10 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get -qq -y install liblz4-tool
+    - name: Install conntrack
+      shell: bash
+      run: |
+        sudo apt-get -qq -y install conntrack
     - name: Docker Info
       shell: bash
       run: |
@@ -228,14 +236,10 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-16.04
     steps:
-    - name: Install lz4
-      shell: bash
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get -qq -y install liblz4-tool
     - name: Install conntrack
       shell: bash
       run: |
+        sudo apt-get update -qq
         sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash
@@ -299,14 +303,10 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-18.04
     steps:
-    - name: Install lz4
-      shell: bash
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get -qq -y install liblz4-tool
     - name: Install conntrack
       shell: bash
       run: |
+        sudo apt-get update -qq
         sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash
@@ -375,6 +375,10 @@ jobs:
         run: |
           sudo apt-get update -qq
           sudo apt-get -qq -y install liblz4-tool
+      - name: Install conntrack
+        shell: bash
+        run: |
+          sudo apt-get -qq -y install conntrack
       - name: Install podman
         shell: bash
         run: |
diff --git a/test/integration/main.go b/test/integration/main.go
index 3c159a6e4..04c22da30 100644
--- a/test/integration/main.go
+++ b/test/integration/main.go
@@ -60,12 +60,12 @@ func Target() string {
 
 // NoneDriver returns whether or not this test is using the none driver
 func NoneDriver() bool {
-	return strings.Contains(*startArgs, "--driver=none")
+	return strings.Contains(*startArgs, "--driver=none") || strings.Contains(*startArgs, "--vm-driver=none")
 }
 
 // HyperVDriver returns whether or not this test is using the Hyper-V driver
 func HyperVDriver() bool {
-	return strings.Contains(*startArgs, "--driver=hyperv")
+	return strings.Contains(*startArgs, "--driver=hyperv") || strings.Contains(*startArgs, "--vm-driver=hyperv")
 }
 
 // CanCleanup returns if cleanup is allowed
-- 
GitLab