From 3aeb7c1132d5ee89e153c1e30fceaed51594506a Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Thu, 21 Jul 2022 11:18:22 +0200 Subject: [PATCH] Update OpenStack jobs - Add OpenStack Zed jobs - Remove lower-constrains job Change-Id: Id20d140a49f3fed18c7f0c9c3ee4497314862456 --- .pre-commit-config.yaml | 1 - Dockerfile | 5 ----- bindep.txt | 1 - docker-compose.yml | 9 --------- tox.ini | 8 -------- zuul.d/docker.yaml | 23 ----------------------- zuul.d/project.yaml | 3 ++- 7 files changed, 2 insertions(+), 48 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5e7641267..9d423c269 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,6 @@ repos: - extra-requirements.txt - infrared_plugin/requirements.txt - linters-requirements.txt - - lower-constraints.txt - requirements.txt - test-requirements.txt - upper-constraints.txt diff --git a/Dockerfile b/Dockerfile index 6f54e4ac8..9c27f1b90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,11 +16,6 @@ ENV INSTALL_PACKAGES_GROUP="dnf groupinstall -y" ENV PYTHON_VERSION=3.10 -FROM py39 as lower-constraints - -ENV CONSTRAINS_FILE=lower-constraints.txt - - FROM ${base_image} as base ENV TOBIKO_DIR=/tobiko diff --git a/bindep.txt b/bindep.txt index cc79a7f3b..813d83dbd 100644 --- a/bindep.txt +++ b/bindep.txt @@ -33,6 +33,5 @@ libffi-dev [platform:dpkg] libguestfs-tools [platform:dpkg] libssl-dev [platform:dpkg] make [platform:dpkg] -python-docutils [platform:ubuntu] python3 [platform:dpkg] python3-dev [platform:dpkg] diff --git a/docker-compose.yml b/docker-compose.yml index ccae7dca6..ef9569ba3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,15 +15,6 @@ services: - .:/tobiko - ~/.ssh:/root/.ssh - lower-constraints: - extends: - service: py3 - build: - args: - base_image: lower-constraints - environment: - TOBIKO_REPORT_NAME: tobiko_results_lower_constraints - py39: extends: service: py3 diff --git a/tox.ini b/tox.ini index 811da7fe6..6a4ce1df8 100644 --- a/tox.ini +++ b/tox.ini @@ -416,11 +416,3 @@ skip_install = true deps = bindep commands = bindep {posargs:test} commands_pre = - -# --- project requirements ---------------------------------------------------- - -[testenv:lower-constraints] - -setenv = - {[testenv]setenv} - TOX_CONSTRAINTS = -c{toxinidir}/lower-constraints.txt diff --git a/zuul.d/docker.yaml b/zuul.d/docker.yaml index 47901f02d..5c6eeabd4 100644 --- a/zuul.d/docker.yaml +++ b/zuul.d/docker.yaml @@ -9,13 +9,11 @@ - tobiko-docker-functional - tobiko-docker-infrared - tobiko-docker-linters - - tobiko-docker-lower-constraints - tobiko-docker-py39 - tobiko-docker-py310 check-arm64: jobs: - tobiko-docker-functional-arm64 - - tobiko-docker-lower-constraints-arm64 - tobiko-docker-py3-arm64 - tobiko-docker-py310-arm64 gate: @@ -50,17 +48,6 @@ - ^tobiko/tests/scenario/ -- job: - name: tobiko-docker-lower-constraints - description: | - Run functional tests for an OpenStack Python project inside a Docker container - with lower-constraints.txt Pip constraints file. - voting: true - parent: tobiko-docker-py3 - vars: - docker_compose_service: lower-constraints - - - job: name: tobiko-docker-py39 description: | @@ -137,16 +124,6 @@ nodeset: ubuntu-focal-arm64 -- job: - name: tobiko-docker-lower-constraints-arm64 - description: | - Run unit tests for an OpenStack Python project inside a Docker container on top - of arm64 architecture - voting: true - parent: tobiko-docker-lower-constraints - nodeset: ubuntu-focal-arm64 - - - job: name: tobiko-docker-functional-arm64 description: | diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 516dc7337..c6d17304a 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -16,9 +16,10 @@ - devstack-tobiko-storage - docs-on-readthedocs - openstack-cover-jobs - - openstack-lower-constraints-jobs - openstack-python3-yoga-jobs - openstack-python3-yoga-jobs-arm64 + - openstack-python3-zed-jobs + - openstack-python3-zed-jobs-arm64 - publish-to-pypi - tobiko-docker - tobiko-infrared