Merge "Bump up to python3.10"
This commit is contained in:
commit
78b14ec3c1
46
.zuul.yaml
46
.zuul.yaml
|
@ -6,11 +6,11 @@
|
||||||
# need their python versions updated when these labels change to
|
# need their python versions updated when these labels change to
|
||||||
# a platform that uses a different python version.
|
# a platform that uses a different python version.
|
||||||
- name: controller
|
- name: controller
|
||||||
label: ubuntu-focal
|
label: ubuntu-jammy
|
||||||
- name: node1
|
- name: node1
|
||||||
label: ubuntu-focal
|
label: ubuntu-jammy
|
||||||
- name: node2
|
- name: node2
|
||||||
label: ubuntu-focal
|
label: ubuntu-jammy
|
||||||
groups:
|
groups:
|
||||||
- name: node
|
- name: node
|
||||||
nodes:
|
nodes:
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
description: |
|
description: |
|
||||||
Zuul unit tests with ZooKeeper running
|
Zuul unit tests with ZooKeeper running
|
||||||
parent: tox
|
parent: tox
|
||||||
nodeset: ubuntu-focal
|
nodeset: ubuntu-jammy
|
||||||
pre-run: playbooks/zuul-tox/pre.yaml
|
pre-run: playbooks/zuul-tox/pre.yaml
|
||||||
post-run: playbooks/zuul-tox/post-system-logs.yaml
|
post-run: playbooks/zuul-tox/post-system-logs.yaml
|
||||||
vars:
|
vars:
|
||||||
|
@ -73,6 +73,7 @@
|
||||||
- job:
|
- job:
|
||||||
name: zuul-tox-remote
|
name: zuul-tox-remote
|
||||||
parent: tox
|
parent: tox
|
||||||
|
nodeset: ubuntu-jammy
|
||||||
timeout: 2700 # 45 minutes
|
timeout: 2700 # 45 minutes
|
||||||
pre-run: playbooks/zuul-tox/pre.yaml
|
pre-run: playbooks/zuul-tox/pre.yaml
|
||||||
post-run: playbooks/zuul-tox/post-system-logs.yaml
|
post-run: playbooks/zuul-tox/post-system-logs.yaml
|
||||||
|
@ -99,12 +100,12 @@
|
||||||
tox_envlist: zuul_client
|
tox_envlist: zuul_client
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: zuul-tox-py39
|
name: zuul-tox-py310
|
||||||
parent: zuul-tox
|
parent: zuul-tox
|
||||||
timeout: 7200 # 120 minutes
|
timeout: 7200 # 120 minutes
|
||||||
vars:
|
vars:
|
||||||
tox_envlist: py39
|
tox_envlist: py310
|
||||||
python_version: 3.9
|
python_version: "3.10"
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: zuul-tox-py38
|
name: zuul-tox-py38
|
||||||
|
@ -112,11 +113,12 @@
|
||||||
timeout: 7200 # 120 minutes
|
timeout: 7200 # 120 minutes
|
||||||
vars:
|
vars:
|
||||||
tox_envlist: py38
|
tox_envlist: py38
|
||||||
python_version: 3.8
|
python_version: "3.8"
|
||||||
|
nodeset: ubuntu-focal
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: zuul-tox-py39-multi-scheduler
|
name: zuul-tox-py310-multi-scheduler
|
||||||
parent: zuul-tox-py39
|
parent: zuul-tox-py310
|
||||||
voting: false
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
tox_environment:
|
tox_environment:
|
||||||
|
@ -135,6 +137,7 @@
|
||||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||||
create_tarball_directory: build
|
create_tarball_directory: build
|
||||||
run: playbooks/dashboard/run.yaml
|
run: playbooks/dashboard/run.yaml
|
||||||
|
nodeset: ubuntu-jammy
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: zuul-build-dashboard-openstack-whitelabel
|
name: zuul-build-dashboard-openstack-whitelabel
|
||||||
|
@ -183,6 +186,7 @@
|
||||||
post-run: playbooks/tutorial/post.yaml
|
post-run: playbooks/tutorial/post.yaml
|
||||||
required-projects:
|
required-projects:
|
||||||
- zuul/zuul
|
- zuul/zuul
|
||||||
|
nodeset: ubuntu-jammy
|
||||||
|
|
||||||
# Image building jobs
|
# Image building jobs
|
||||||
- secret:
|
- secret:
|
||||||
|
@ -208,8 +212,8 @@
|
||||||
allowed-projects: zuul/zuul
|
allowed-projects: zuul/zuul
|
||||||
timeout: 2700 # 45 minutes
|
timeout: 2700 # 45 minutes
|
||||||
requires:
|
requires:
|
||||||
- python-builder-3.8-bullseye-container-image
|
- python-builder-3.10-bullseye-container-image
|
||||||
- python-base-3.8-bullseye-container-image
|
- python-base-3.10-bullseye-container-image
|
||||||
provides: zuul-container-image
|
provides: zuul-container-image
|
||||||
vars: &zuul_image_vars
|
vars: &zuul_image_vars
|
||||||
docker_images:
|
docker_images:
|
||||||
|
@ -247,8 +251,8 @@
|
||||||
description: Build Docker images and upload to Docker Hub.
|
description: Build Docker images and upload to Docker Hub.
|
||||||
allowed-projects: zuul/zuul
|
allowed-projects: zuul/zuul
|
||||||
requires:
|
requires:
|
||||||
- python-builder-3.8-bullseye-container-image
|
- python-builder-3.10-bullseye-container-image
|
||||||
- python-base-3.8-bullseye-container-image
|
- python-base-3.10-bullseye-container-image
|
||||||
provides: zuul-container-image
|
provides: zuul-container-image
|
||||||
secrets:
|
secrets:
|
||||||
name: docker_credentials
|
name: docker_credentials
|
||||||
|
@ -273,11 +277,13 @@
|
||||||
name: zuul-build-python-release
|
name: zuul-build-python-release
|
||||||
parent: build-python-release
|
parent: build-python-release
|
||||||
pre-run: playbooks/release/pre.yaml
|
pre-run: playbooks/release/pre.yaml
|
||||||
|
nodeset: ubuntu-jammy
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: zuul-release-python
|
name: zuul-release-python
|
||||||
parent: opendev-release-python
|
parent: opendev-release-python
|
||||||
pre-run: playbooks/release/pre.yaml
|
pre-run: playbooks/release/pre.yaml
|
||||||
|
nodeset: ubuntu-jammy
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
vars:
|
vars:
|
||||||
|
@ -290,20 +296,23 @@
|
||||||
- tox-linters:
|
- tox-linters:
|
||||||
vars:
|
vars:
|
||||||
tox_install_bindep: false
|
tox_install_bindep: false
|
||||||
|
nodeset: ubuntu-jammy
|
||||||
- zuul-tox-py38
|
- zuul-tox-py38
|
||||||
- zuul-tox-py39
|
- zuul-tox-py310
|
||||||
- zuul-tox-py39-multi-scheduler
|
- zuul-tox-py310-multi-scheduler
|
||||||
- zuul-build-dashboard-openstack-whitelabel
|
- zuul-build-dashboard-openstack-whitelabel
|
||||||
- zuul-build-dashboard-software-factory
|
- zuul-build-dashboard-software-factory
|
||||||
- zuul-build-dashboard-opendev
|
- zuul-build-dashboard-opendev
|
||||||
- nodejs-run-lint:
|
- nodejs-run-lint:
|
||||||
vars:
|
vars:
|
||||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||||
|
nodeset: ubuntu-jammy
|
||||||
- nodejs-run-test:
|
- nodejs-run-test:
|
||||||
vars:
|
vars:
|
||||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||||
files:
|
files:
|
||||||
- web/.*
|
- web/.*
|
||||||
|
nodeset: ubuntu-jammy
|
||||||
- zuul-stream-functional-2.8
|
- zuul-stream-functional-2.8
|
||||||
- zuul-stream-functional-2.9
|
- zuul-stream-functional-2.9
|
||||||
- zuul-stream-functional-5
|
- zuul-stream-functional-5
|
||||||
|
@ -320,17 +329,20 @@
|
||||||
- tox-linters:
|
- tox-linters:
|
||||||
vars:
|
vars:
|
||||||
tox_install_bindep: false
|
tox_install_bindep: false
|
||||||
|
nodeset: ubuntu-jammy
|
||||||
- zuul-tox-py38
|
- zuul-tox-py38
|
||||||
- zuul-tox-py39
|
- zuul-tox-py310
|
||||||
- zuul-build-dashboard
|
- zuul-build-dashboard
|
||||||
- nodejs-run-lint:
|
- nodejs-run-lint:
|
||||||
vars:
|
vars:
|
||||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||||
|
nodeset: ubuntu-jammy
|
||||||
- nodejs-run-test:
|
- nodejs-run-test:
|
||||||
vars:
|
vars:
|
||||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||||
files:
|
files:
|
||||||
- web/.*
|
- web/.*
|
||||||
|
nodeset: ubuntu-jammy
|
||||||
- zuul-stream-functional-2.8
|
- zuul-stream-functional-2.8
|
||||||
- zuul-stream-functional-2.9
|
- zuul-stream-functional-2.9
|
||||||
- zuul-stream-functional-5
|
- zuul-stream-functional-5
|
||||||
|
|
|
@ -19,7 +19,7 @@ COPY web /tmp/src
|
||||||
# Explicitly run the Javascript build
|
# Explicitly run the Javascript build
|
||||||
RUN cd /tmp/src && yarn install -d && yarn build
|
RUN cd /tmp/src && yarn install -d && yarn build
|
||||||
|
|
||||||
FROM docker.io/opendevorg/python-builder:3.8-bullseye as builder
|
FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
# Optional location of Zuul API endpoint.
|
# Optional location of Zuul API endpoint.
|
||||||
|
@ -48,7 +48,7 @@ RUN /output/install-from-bindep \
|
||||||
&& echo $OPENSHIFT_SHA /tmp/openshift-install/openshift-client.tgz | sha256sum --check \
|
&& echo $OPENSHIFT_SHA /tmp/openshift-install/openshift-client.tgz | sha256sum --check \
|
||||||
&& tar xvfz openshift-client.tgz --strip-components=1 -C /tmp/openshift-install
|
&& tar xvfz openshift-client.tgz --strip-components=1 -C /tmp/openshift-install
|
||||||
|
|
||||||
FROM docker.io/opendevorg/python-base:3.8-bullseye as zuul
|
FROM docker.io/opendevorg/python-base:3.10-bullseye as zuul
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
COPY --from=builder /output/ /output
|
COPY --from=builder /output/ /output
|
||||||
|
|
|
@ -25,8 +25,9 @@ libssl1.1 [platform:debian platform:ubuntu-bionic]
|
||||||
libssl1.0.0 [platform:ubuntu-xenial]
|
libssl1.0.0 [platform:ubuntu-xenial]
|
||||||
libffi-dev [compile test platform:dpkg platform:apk]
|
libffi-dev [compile test platform:dpkg platform:apk]
|
||||||
libffi [platform:apk]
|
libffi [platform:apk]
|
||||||
|
libffi8 [platform:ubuntu-jammy]
|
||||||
libffi7 [platform:ubuntu-focal platform:debian-bullseye]
|
libffi7 [platform:ubuntu-focal platform:debian-bullseye]
|
||||||
libffi6 [platform:dpkg !platform:ubuntu-focal !platform:debian-bullseye]
|
libffi6 [platform:dpkg !platform:ubuntu-focal !platform:ubuntu-jammy !platform:debian-bullseye]
|
||||||
libffi-devel [compile test platform:rpm]
|
libffi-devel [compile test platform:rpm]
|
||||||
libyaml-0-2 [platform:dpkg platform:suse]
|
libyaml-0-2 [platform:dpkg platform:suse]
|
||||||
libyaml [platform:redhat]
|
libyaml [platform:redhat]
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# This value is used by Ansible to find the zuul.ansible code
|
# This value is used by Ansible to find the zuul.ansible code
|
||||||
# that Zuul's ansible plugins consume. It must be updated when
|
# that Zuul's ansible plugins consume. It must be updated when
|
||||||
# the python version of the platform is changed.
|
# the python version of the platform is changed.
|
||||||
python_path: "/usr/local/lib/python3.8/dist-packages"
|
python_path: "/usr/local/lib/python3.10/dist-packages"
|
||||||
|
|
||||||
- name: Run ansible that should succeed
|
- name: Run ansible that should succeed
|
||||||
command: >
|
command: >
|
||||||
|
|
|
@ -28,6 +28,13 @@
|
||||||
- name: Install managed ansible versions
|
- name: Install managed ansible versions
|
||||||
command: /usr/local/bin/zuul-manage-ansible -v
|
command: /usr/local/bin/zuul-manage-ansible -v
|
||||||
become: yes
|
become: yes
|
||||||
|
environment:
|
||||||
|
# This appears to be necessary because without it the virtualenvs
|
||||||
|
# that virtualenv creates are not actually virtualenvs. They are just
|
||||||
|
# aliases for the root python installation instead. Then we try to
|
||||||
|
# install multiple ansible versions to the root (via multiple fake
|
||||||
|
# venvs) and the installation fails due to conflicts.
|
||||||
|
SETUPTOOLS_USE_DISTUTILS: stdlib
|
||||||
|
|
||||||
- name: Copy inventory
|
- name: Copy inventory
|
||||||
copy:
|
copy:
|
||||||
|
|
|
@ -16,6 +16,7 @@ classifier =
|
||||||
Programming Language :: Python :: 3
|
Programming Language :: Python :: 3
|
||||||
Programming Language :: Python :: 3.8
|
Programming Language :: Python :: 3.8
|
||||||
Programming Language :: Python :: 3.9
|
Programming Language :: Python :: 3.9
|
||||||
|
Programming Language :: Python :: 3.10
|
||||||
|
|
||||||
[pbr]
|
[pbr]
|
||||||
warnerrors = True
|
warnerrors = True
|
||||||
|
|
|
@ -44,8 +44,8 @@ mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e "
|
||||||
CREATE DATABASE openstack_citest CHARACTER SET utf8;"
|
CREATE DATABASE openstack_citest CHARACTER SET utf8;"
|
||||||
|
|
||||||
# setup postgres user and database
|
# setup postgres user and database
|
||||||
sudo -u postgres psql -c "CREATE ROLE $DB_USER WITH LOGIN SUPERUSER PASSWORD '$DB_PW';"
|
sudo -Hi -u postgres psql -c "CREATE ROLE $DB_USER WITH LOGIN SUPERUSER PASSWORD '$DB_PW';"
|
||||||
sudo -u postgres psql -c "CREATE DATABASE openstack_citest OWNER $DB_USER TEMPLATE template0 ENCODING 'UTF8';"
|
sudo -Hi -u postgres psql -c "CREATE DATABASE openstack_citest OWNER $DB_USER TEMPLATE template0 ENCODING 'UTF8';"
|
||||||
|
|
||||||
LSBDISTCODENAME=$(lsb_release -cs)
|
LSBDISTCODENAME=$(lsb_release -cs)
|
||||||
if [ $LSBDISTCODENAME == 'xenial' ]; then
|
if [ $LSBDISTCODENAME == 'xenial' ]; then
|
||||||
|
|
Loading…
Reference in New Issue