Skip to content

Commit 1ec5e0e

Browse files
committed
prepare for ubuntu 26.04
1 parent 0d6410f commit 1ec5e0e

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

tools/ansible.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ PY_FLAG=$1
1313
IS_TRUSTY() { [ "${CODENAME}" == "trusty" ]; }
1414
IS_XENIAL() { [ "${CODENAME}" == "xenial" ]; }
1515
IS_BIONIC() { [ "${CODENAME}" == "bionic" ]; }
16-
IS_JAMMY() { [ "${CODENAME}" == "jammy" ]; }
16+
IS_JAMMY() { [ "${CODENAME}" == "jammy" ]; } # 22.04
17+
IS_RESOLUTE() { [ "${CODENAME}" == "resolute" ]; } # 26.04
1718
USE_PYTHON3() { [ "${PY_FLAG}" == "python3" ]; }
1819

1920
do_cmd()
@@ -65,6 +66,10 @@ if IS_JAMMY; then
6566
ansible --version | grep -q '2.10' 2> /dev/null
6667
is_ansible_right=$?
6768
fi
69+
if IS_RESOLUTE; then
70+
ansible --version | grep -q '2.20' 2> /dev/null
71+
is_ansible_right=$?
72+
fi
6873

6974
if [ $is_ansible_right -ne 0 ]; then
7075
do_cmd sudo apt-get update
@@ -86,6 +91,10 @@ if [ $is_ansible_right -ne 0 ]; then
8691
if IS_JAMMY; then
8792
do_cmd sudo apt update
8893
do_cmd sudo apt install -y ansible
94+
fi
95+
if IS_RESOLUTE; then
96+
do_cmd sudo apt update
97+
do_cmd sudo apt install -y ansible
8998
else
9099
do_cmd sudo dpkg -i /tmp/ansible.deb
91100
do_cmd sudo rm /tmp/ansible.deb
@@ -96,7 +105,7 @@ download_playbook
96105

97106
do_cmd sudo apt-get update
98107

99-
if USE_PYTHON3 || IS_JAMMY; then
108+
if USE_PYTHON3 || IS_JAMMY || IS_RESOLUTE; then
100109
sudo ansible-playbook -v "${COOKBOOK_PATH}/install_software-${BRANCH}/$0/playbook.yaml" -e 'ansible_python_interpreter=/usr/bin/python3'
101110
elif IS_TRUSTY; then
102111
sudo ansible-playbook -v "${COOKBOOK_PATH}/install_software-${BRANCH}/$0/playbook.yaml"

0 commit comments

Comments
 (0)