diff --git a/tools/deployment/00_install_prerequsite.sh b/tools/deployment/00_install_prerequsite.sh index 1133450..6f74694 100755 --- a/tools/deployment/00_install_prerequsite.sh +++ b/tools/deployment/00_install_prerequsite.sh @@ -33,7 +33,10 @@ pkg_check() { done } -pkg_check curl wget python3-pip python3-setuptools ca-certificates make +pkg_check curl wget ca-certificates make + +echo "Installing pip and dependencies" +curl -s https://bootstrap.pypa.io/get-pip.py | python3 echo "Installing Kind Version $KIND_VERSION" sudo wget -O /usr/local/bin/kind ${KIND_URL} @@ -51,9 +54,9 @@ envsubst <"${HCO_WS}/tools/deployment/config_template.yaml" > "$PLAYBOOK_CONFIG" PACKAGES="ansible netaddr" if [[ -z "${http_proxy}" ]]; then - sudo pip3 install $PACKAGES + sudo python3 -m pip install $PACKAGES else - sudo pip3 --proxy "${http_proxy}" install $PACKAGES + sudo python3 -m pip --proxy "${http_proxy}" install $PACKAGES fi echo "primary ansible_host=localhost ansible_connection=local ansible_python_interpreter=/usr/bin/python3" > "$ANSIBLE_HOSTS" @@ -62,3 +65,9 @@ printf "[defaults]\nroles_path = %s/roles\n" "$HCO_WS" > "$ANSIBLE_CFG" ansible-playbook -i "$ANSIBLE_HOSTS" \ playbooks/airship-hostconfig-operator-deploy-docker.yaml \ -e @"$PLAYBOOK_CONFIG" + +echo "Add docker permission to users" +sudo usermod -aG docker $USER +sudo chmod 666 /var/run/docker.sock +sudo chown :docker /var/run/docker.sock +sudo newgrp docker diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index aef6280..0d78af8 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -29,7 +29,6 @@ - ./tools/deployment/51_test_hostconfig_cr_reconcile.sh - ./tools/deployment/52_test_hostconfig_cr_failure.sh - ./tools/deployment/53_test_packges.sh - voting: false - job: name: airship-hostconfig-operator-build-image