File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -820,13 +820,13 @@ jobs:
820820 dockerfile : ubi
821821 image : registry.access.redhat.com/ubi8/ubi:8.4
822822 artifact : rpm-ubi8-${{ arch.value }}
823- python_package : python39
823+ python_package : python3.12
824824 pool : ${{ arch.pool }}
825825 Red Hat Universal Base Image 9 ${{ arch.name }} :
826826 dockerfile : ubi
827827 image : registry.access.redhat.com/ubi9/ubi:9.0.0
828828 artifact : rpm-ubi9-${{ arch.value }}
829- python_package : python3.9
829+ python_package : python3.12
830830 pool : ${{ arch.pool }}
831831 steps :
832832 - bash : ./scripts/ci/install_docker.sh
@@ -869,17 +869,17 @@ jobs:
869869 artifact : rpm-ubi8-${{ arch.value }}
870870 distro : el8
871871 image : registry.access.redhat.com/ubi8/ubi:8.4
872- python_package : python39
873- python_cmd : python3.9
874- pip_cmd : pip3.9
872+ python_package : python3.12
873+ python_cmd : python3.12
874+ pip_cmd : pip3.12
875875 pool : ${{ arch.pool }}
876876 Red Hat Universal Base Image 9 ${{ arch.name }} :
877877 artifact : rpm-ubi9-${{ arch.value }}
878878 distro : el9
879879 image : registry.access.redhat.com/ubi9/ubi:9.0.0
880- python_package : python3.9
881- python_cmd : python3.9
882- pip_cmd : pip3.9
880+ python_package : python3.12
881+ python_cmd : python3.12
882+ pip_cmd : pip3.12
883883 pool : ${{ arch.pool }}
884884 steps :
885885 - task : DownloadPipelineArtifact@1
Original file line number Diff line number Diff line change @@ -58,6 +58,7 @@ deactivate
5858
5959# Fix up %{buildroot} appearing in some files...
6060for d in %{buildroot }%{cli_lib_dir }/bin/*; do perl -p -i -e "s#%{buildroot}##g" $d; done;
61+ rm %{buildroot }%{cli_lib_dir }/pyvenv.cfg
6162
6263# Create executable (entry script)
6364
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ export USERNAME=azureuser
77
88dnf --nogpgcheck install /mnt/rpm/$RPM_NAME -y
99
10- dnf install git gcc $PYTHON_PACKAGE -devel findutils -y
10+ dnf install git findutils $PYTHON_PACKAGE -pip -y
1111
1212ln -s -f /usr/bin/$PYTHON_CMD /usr/bin/python
1313ln -s -f /usr/bin/$PIP_CMD /usr/bin/pip
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ ARG image=registry.access.redhat.com/ubi8/ubi:8.4
55
66FROM ${image} AS build-env
77ARG cli_version=dev
8- ARG python_package=python39
8+ ARG python_package=python3.12
99
1010RUN yum update -y
1111RUN yum install -y wget rpm-build gcc libffi-devel ${python_package}-devel openssl-devel make bash diffutils patch dos2unix perl
@@ -18,7 +18,7 @@ COPY . .
1818# We have to explicitly specify 'python39' to install Python 3.9.
1919RUN --mount=type=secret,id=PIP_INDEX_URL export PIP_INDEX_URL=$(cat /run/secrets/PIP_INDEX_URL) && \
2020 dos2unix ./scripts/release/rpm/azure-cli.spec && \
21- REPO_PATH=$(pwd) CLI_VERSION=$cli_version PYTHON_PACKAGE=$python_package PYTHON_CMD=python3.9 \
21+ REPO_PATH=$(pwd) CLI_VERSION=$cli_version PYTHON_PACKAGE=$python_package PYTHON_CMD=$python_package \
2222 rpmbuild -v -bb --clean scripts/release/rpm/azure-cli.spec && \
2323 cp /root/rpmbuild/RPMS/*/azure-cli-${cli_version}-1.*.rpm /azure-cli-dev.rpm && \
2424 mkdir /out && cp /root/rpmbuild/RPMS/*/azure-cli-${cli_version}-1.*.rpm /out/
You can’t perform that action at this time.
0 commit comments