diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 79a9f0982e..44df941563 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -233,7 +233,8 @@ jobs: runs-on: ubuntu-16.04 steps: # conntrack is required for kubernetes 1.18 and higher - - name: Install conntrack + # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon + - name: Install tools for none shell: bash run: | sudo apt-get update -qq @@ -303,7 +304,8 @@ jobs: runs-on: ubuntu-18.04 steps: # conntrack is required for kubernetes 1.18 and higher - - name: Install conntrack + # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon + - name: Install tools for none shell: bash run: | sudo apt-get update -qq diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 9f45f2ad54..d6c99722c6 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -58,6 +58,12 @@ if ! conntrack --version &>/dev/null; then sudo apt-get -qq -y install conntrack fi + # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon +if ! which socat &>/dev/null; then + echo "WARNING: No socat is not installed" + sudo apt-get update -qq + sudo apt-get -qq -y install socat +fi mkdir -p cron && gsutil -m rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES" sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"