From daf8da3a6309b121de0ad93be17a9e24398a197f Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Fri, 16 May 2025 14:09:11 +0200 Subject: [PATCH] Build CS9 DIB IPA ramdisk with python 3.12 Change-Id: Id3da1c7bcd7aa68731eff4695e07e3f0f908a3d8 --- .../60-ironic-python-agent-ramdisk-install | 9 ++++++++- dib/ironic-python-agent-ramdisk/pkg-map | 12 ++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install b/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install index 1fc7f6f..c98c902 100755 --- a/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install +++ b/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install @@ -13,8 +13,15 @@ IPADIR=/tmp/ironic-python-agent UPPER_CONSTRAINTS=/tmp/requirements/upper-constraints.txt VENVDIR=/opt/ironic-python-agent +# define default python +PYTHON_BIN="python3" +if [[ "${DISTRO_NAME}${DIB_RELEASE}" =~ "centos9" ]]; then + PYTHON_BIN="python3.12" +fi + # create the virtual environment using the default python -python3 -m venv $VENVDIR +$PYTHON_BIN -m venv $VENVDIR + REQUIRED_PIP_STR="25.1.1" REQUIRED_PIP_TUPLE="(25, 1, 1)" diff --git a/dib/ironic-python-agent-ramdisk/pkg-map b/dib/ironic-python-agent-ramdisk/pkg-map index af22457..0bd2d24 100644 --- a/dib/ironic-python-agent-ramdisk/pkg-map +++ b/dib/ironic-python-agent-ramdisk/pkg-map @@ -1,15 +1,15 @@ { "release": { "rhel": { - "7": { - "python": "python", - "python-dev": "python-devel" + "9": { + "python": "python3.12", + "python-dev": "python3.12-devel" } }, "centos": { - "7": { - "python": "python", - "python-dev": "python-devel" + "9-stream": { + "python": "python3.12", + "python-dev": "python3.12-devel" } }, "debian": {