From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: crosa@redhat.com
Subject: [PATCH 5/5] scripts/ci: bump CentOS Python to 3.8
Date: Thu, 19 Jan 2023 16:41:45 +0100 [thread overview]
Message-ID: <20230119154145.471156-6-pbonzini@redhat.com> (raw)
In-Reply-To: <20230119154145.471156-1-pbonzini@redhat.com>
In preparation for bumping the minimum requirement for the Python
runtime in QEMU 8.0, use the Python 3.8 package in the CentOS Stream 8
build environments. To cover all bases, the "generic" playbook sets up
alternatives so that /usr/bin/python3 points to Python 3.8, while the
custom runner uses the --python option to configure. The latter is
probably more suitable for the task of building an RPM file.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.../ci/org.centos/stream/8/build-environment.yml | 2 +-
scripts/ci/org.centos/stream/8/x86_64/configure | 1 +
scripts/ci/setup/build-environment.yml | 14 +++++++++++++-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml b/scripts/ci/org.centos/stream/8/build-environment.yml
index b1768d18afac..0d094d70c3b3 100644
--- a/scripts/ci/org.centos/stream/8/build-environment.yml
+++ b/scripts/ci/org.centos/stream/8/build-environment.yml
@@ -65,7 +65,7 @@
- nmap-ncat
- numactl-devel
- pixman-devel
- - python36
+ - python38
- python3-sphinx
- rdma-core-devel
- redhat-rpm-config
diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure
index 75882faa9ca5..65eacf3c56bb 100755
--- a/scripts/ci/org.centos/stream/8/x86_64/configure
+++ b/scripts/ci/org.centos/stream/8/x86_64/configure
@@ -16,6 +16,7 @@
# that patches adding downstream specific devices are not available.
#
../configure \
+--python=/usr/bin/python3.8 \
--prefix="/usr" \
--libdir="/usr/lib64" \
--datadir="/usr/share" \
diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
index 2274f736f7de..78b1021cd420 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -191,7 +191,7 @@
- nmap-ncat
- numactl-devel
- pixman-devel
- - python36
+ - python38
- python3-sphinx
- rdma-core-devel
- redhat-rpm-config
@@ -217,3 +217,15 @@
- ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
- ansible_facts['distribution_version'] == '8'
- ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64'
+
+ - name: Check whether the Python runtime version is managed by alternatives
+ stat:
+ path: /etc/alternatives/python3
+ register: python3
+
+ - name: Set default Python runtime to 3.8 on EL8
+ command: alternatives --set python3 /usr/bin/python3.8
+ when:
+ - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
+ - ansible_facts['distribution_version'] == '8'
+ - python3.stat.islnk and python3.stat.lnk_target != '/usr/bin/python3.8'
--
2.38.1
prev parent reply other threads:[~2023-01-19 15:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 15:41 [PATCH 0/5] scripts/ci: update build environment playbooks Paolo Bonzini
2023-01-19 15:41 ` [PATCH 1/5] scripts/ci: remove unnecessary checks from CentOS playbook Paolo Bonzini
2023-01-19 15:41 ` [PATCH 2/5] scripts/ci: support CentOS Stream 8 in build-environment.yaml Paolo Bonzini
2023-01-19 15:41 ` [PATCH 3/5] scripts/ci: add capstone development packages Paolo Bonzini
2023-01-19 15:41 ` [PATCH 4/5] scripts/ci: unify package lists for CentOS in build-environment files Paolo Bonzini
2023-01-19 15:41 ` Paolo Bonzini [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230119154145.471156-6-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=crosa@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).