From 6f50b27a2045f90f41f31bb0bd06a421435095a4 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 23 Mar 2020 15:38:17 -0700 Subject: [PATCH 1/6] install conntrack for none tests --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a2daefe32d..a6146b5b5a 100644 --- a/.github/workflows/main.yml +++ b/.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 @@ -228,11 +228,11 @@ jobs: SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 runs-on: ubuntu-16.04 steps: - - name: install lz4 + - 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 +295,11 @@ jobs: SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 runs-on: ubuntu-18.04 steps: - - name: install lz4 + - 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: | From 61c3e2d6a087942fc6cd803f082cfa12b6682258 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 23 Mar 2020 15:46:45 -0700 Subject: [PATCH 2/6] formatting --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a6146b5b5a..3ade2e60d5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -362,12 +362,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 From 2a2b3428fdb96bccea17f96e0dc6be7eaa1aa4fd Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 23 Mar 2020 16:42:39 -0700 Subject: [PATCH 3/6] add lz4 back --- .github/workflows/main.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ade2e60d5..d03af33653 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -228,10 +228,14 @@ jobs: SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 runs-on: ubuntu-16.04 steps: - - name: Install conntrack + - 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 -qq -y install conntrack - name: Install gopogh shell: bash @@ -295,10 +299,14 @@ jobs: SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 runs-on: ubuntu-18.04 steps: - - name: Install conntrack + - 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 -qq -y install conntrack - name: Install gopogh shell: bash From 0ff8becc6323991db7cd3ea2c1ac967877144050 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 23 Mar 2020 17:09:12 -0700 Subject: [PATCH 4/6] 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 d03af33653..379b82f120 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 3c159a6e42..04c22da305 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 From a42d1c40c13c0b130b41442d20730e3d605228d5 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 23 Mar 2020 17:21:44 -0700 Subject: [PATCH 5/6] conntrack only needed for none --- .github/workflows/main.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 379b82f120..1304c3634c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -93,10 +93,6 @@ 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: | @@ -164,10 +160,6 @@ 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: | @@ -236,6 +228,7 @@ jobs: SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 runs-on: ubuntu-16.04 steps: + # conntrack is required for kubernetes 1.18 and highter - name: Install conntrack shell: bash run: | @@ -303,6 +296,7 @@ jobs: SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 runs-on: ubuntu-18.04 steps: + # conntrack is required for kubernetes 1.18 and highter - name: Install conntrack shell: bash run: | @@ -375,10 +369,6 @@ 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: | From 1273d4f8e756ac5eca89d94c449450fb2da21a5a Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 23 Mar 2020 17:22:47 -0700 Subject: [PATCH 6/6] typo --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1304c3634c..fda40cd7f1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -228,7 +228,7 @@ jobs: SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 runs-on: ubuntu-16.04 steps: - # conntrack is required for kubernetes 1.18 and highter + # conntrack is required for kubernetes 1.18 and higher - name: Install conntrack shell: bash run: | @@ -296,7 +296,7 @@ jobs: SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 runs-on: ubuntu-18.04 steps: - # conntrack is required for kubernetes 1.18 and highter + # conntrack is required for kubernetes 1.18 and higher - name: Install conntrack shell: bash run: |