Merge pull request #7180 from sharifelgamal/conntrack

install conntrack for github action integration tests

.github/workflows/main.yml

@@ -88,7 +88,7 @@ jobs:
         docker info || true
         docker version || true
         docker ps || true
-    - name: install lz4
+    - name: Install lz4
       shell: bash
       run: |
         sudo apt-get update -qq
@@ -155,7 +155,7 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     needs: [build_minikube]
     steps:
-    - name: install lz4
+    - name: Install lz4
       shell: bash
       run: |
         sudo apt-get update -qq
@@ -228,11 +228,12 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-16.04
     steps:
-    - name: install lz4
+    # conntrack is required for kubernetes 1.18 and higher
+    - name: Install conntrack
       shell: bash
       run: |
         sudo apt-get update -qq
-        sudo apt-get -qq -y install liblz4-tool
+        sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash
       run: |
@@ -295,11 +296,12 @@ jobs:
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
     runs-on: ubuntu-18.04
     steps:
-    - name: install lz4
+    # conntrack is required for kubernetes 1.18 and higher
+    - name: Install conntrack
       shell: bash
       run: |
         sudo apt-get update -qq
-        sudo apt-get -qq -y install liblz4-tool
+        sudo apt-get -qq -y install conntrack
     - name: Install gopogh
       shell: bash
       run: |
@@ -362,12 +364,12 @@ jobs:
         SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
       runs-on: ubuntu-18.04
       steps:
-      - name: install lz4
+      - name: Install lz4
         shell: bash
         run: |
           sudo apt-get update -qq
           sudo apt-get -qq -y install liblz4-tool
-      - name: install podman
+      - name: Install podman
         shell: bash
         run: |
           . /etc/os-release

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