Browse Source

Merge "use python-pip3"

Jenkins 1 year ago
parent
commit
23cbc59845
1 changed files with 2 additions and 3 deletions
  1. 2
    3
      utils/jenkins/kargo_deploy.sh

+ 2
- 3
utils/jenkins/kargo_deploy.sh View File

@@ -273,9 +273,8 @@ if ! admin_node_command type ansible 2>&1 > /dev/null; then
273 273
     if [[ "$ANSIBLE_INSTALL_SOURCE" == "apt" ]]; then
274 274
         with_retries admin_node_command -- sudo apt-get install -y ansible python-netaddr
275 275
     elif [[ "$ANSIBLE_INSTALL_SOURCE" == "pip" ]]; then
276
-        with_retries admin_node_command -- sudo apt-get install -y python-netaddr libssl-dev python-pip
277
-        with_retries admin_node_command -- sudo easy_install --upgrade --user pyasn1
278
-        with_retries admin_node_command -- sudo pip install --upgrade ansible==$required_ansible_version
276
+        with_retries admin_node_command -- sudo apt-get install -y python-netaddr libssl-dev python3-pip
277
+        with_retries admin_node_command -- sudo pip3 install --upgrade ansible==$required_ansible_version
279 278
     else
280 279
          echo "ERROR: Unknown Ansible install source: ${ANSIBLE_INSTALL_SOURCE}"
281 280
          exit 1

Loading…
Cancel
Save