Merge pull request #6773 from sayboras/bugfix/non-test

Fix none-test integration test
pull/7116/head^2
Thomas Strömberg 2020-03-21 10:28:11 -07:00 committed by GitHub
commit 3022e9a773
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 1 deletions

View File

@ -88,6 +88,11 @@ jobs:
docker info || true
docker version || true
docker ps || true
- name: install lz4
shell: bash
run: |
sudo apt-get update -qq
sudo apt-get -qq -y install liblz4-tool
- name: Install gopogh
shell: bash
run: |
@ -150,6 +155,11 @@ jobs:
SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
needs: [build_minikube]
steps:
- name: install lz4
shell: bash
run: |
sudo apt-get update -qq
sudo apt-get -qq -y install liblz4-tool
- name: Docker Info
shell: bash
run: |
@ -218,6 +228,11 @@ 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 gopogh
shell: bash
run: |
@ -280,6 +295,11 @@ 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 gopogh
shell: bash
run: |
@ -342,6 +362,11 @@ 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 podman
shell: bash
run: |

View File

@ -77,7 +77,13 @@ func TestChangeNoneUser(t *testing.T) {
t.Errorf("Failed to convert uid to int: %v", err)
}
for _, p := range []string{localpath.MiniPath(), filepath.Join(u.HomeDir, ".kube/config")} {
// Retrieve the kube config from env
kubeConfig := os.Getenv("KUBECONFIG")
if kubeConfig == "" {
kubeConfig = filepath.Join(u.HomeDir, ".kube/config")
}
for _, p := range []string{localpath.MiniPath(), kubeConfig} {
info, err := os.Stat(p)
if err != nil {
t.Errorf("stat(%s): %v", p, err)