diff --git a/roles/hostconfig-operator-run-script/tasks/main.yaml b/roles/hostconfig-operator-run-script/tasks/main.yaml index 9daccbf..f79db0d 100644 --- a/roles/hostconfig-operator-run-script/tasks/main.yaml +++ b/roles/hostconfig-operator-run-script/tasks/main.yaml @@ -19,3 +19,7 @@ environment: remote_work_dir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}" zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" + +- name: Reset ssh connection for docker group to reload + meta: reset_connection + ignore_errors: true diff --git a/tools/deployment/00_install_prerequsite.sh b/tools/deployment/00_install_prerequsite.sh index 1133450..1e8e644 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" diff --git a/tools/deployment/config_template.yaml b/tools/deployment/config_template.yaml index 2f63950..bcb349d 100644 --- a/tools/deployment/config_template.yaml +++ b/tools/deployment/config_template.yaml @@ -12,7 +12,7 @@ --- local_src_dir: "$HCO_WS" -ansible_user: root +ansible_user: "$USER" proxy: enabled: "$USE_PROXY" http: "$HTTP_PROXY" 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