Merge pull request #7236 from medyagh/socat_install

install socat
pull/7219/head^2
Medya Ghazizadeh 2020-03-25 16:00:49 -07:00 committed by GitHub
commit f4f00bb2eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions

View File

@ -233,11 +233,13 @@ 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
sudo apt-get -qq -y install conntrack
sudo apt-get -qq -y install socat
- name: Install gopogh
shell: bash
run: |
@ -303,11 +305,13 @@ 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
sudo apt-get -qq -y install conntrack
sudo apt-get -qq -y install socat
- name: Install gopogh
shell: bash
run: |

View File

@ -53,11 +53,17 @@ sudo systemctl is-active --quiet kubelet \
# conntrack is required for kubernetes 1.18 and higher for none driver
if ! conntrack --version &>/dev/null; then
echo "WARNING: No contrack is not installed"
echo "WARNING: contrack is not installed. will try to install."
sudo apt-get update -qq
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: socat is not installed. will try to install."
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"