blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-14 08:53:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

ensure pipenv uses python 3.11 on AL2023

Browse Source
This commit is contained in:
Lee Goolsbee
2023-05-17 15:43:42 -05:00
parent fd4d9b6469
commit 293dddcd2d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/ansible-with-atl-env
View File

@@ -20,6 +20,7 @@ set +a
pipenv run \ pipenv run \
ansible-playbook -v \ ansible-playbook -v \
$ATL_DEPLOYMENT_REPOSITORY_CUSTOM_PARAMS \ $ATL_DEPLOYMENT_REPOSITORY_CUSTOM_PARAMS \
-e "ansible_python_interpreter=$(pipenv --venv)/bin/python" \
-e "${PLAYBOOK_INVOCATION_EXTRA_PARAMS}" \ -e "${PLAYBOOK_INVOCATION_EXTRA_PARAMS}" \
-i $INV \ -i $INV \
$PLAYBOOK \ $PLAYBOOK \

4
bin/install-ansible
View File

@@ -3,6 +3,7 @@
set -e set -e
PIP_BIN="pip3" PIP_BIN="pip3"
PIPENV_PYTHON="3"
source /etc/os-release source /etc/os-release
if [[ $ID = "amzn" ]] && [[ $VERSION = "2" ]]; then if [[ $ID = "amzn" ]] && [[ $VERSION = "2" ]]; then
@@ -19,6 +20,7 @@ elif [[ $ID = "amzn" ]] && [[ $VERSION = "2023" ]]; then
python3.11-pip \ python3.11-pip \
python3.11-devel python3.11-devel
PIP_BIN="pip3.11" PIP_BIN="pip3.11"
PIPENV_PYTHON="3.11"
else else
# FIXME: Currently assumes Debian-based # FIXME: Currently assumes Debian-based
apt-get update && \ apt-get update && \
@@ -33,7 +35,7 @@ echo "Installing pipenv..."
$PIP_BIN install pipenv $PIP_BIN install pipenv
echo "Installing ansible and dependencies..." echo "Installing ansible and dependencies..."
PIPENV_NOSPIN=1 PIPENV_HIDE_EMOJIS=1 pipenv sync 2>&1 | iconv -c -f utf-8 -t ascii PIPENV_NOSPIN=1 PIPENV_HIDE_EMOJIS=1 pipenv --python $PIPENV_PYTHON sync 2>&1 | iconv -c -f utf-8 -t ascii
if [[ $1 == "--dev" ]]; then if [[ $1 == "--dev" ]]; then
pipenv sync --dev pipenv sync --dev