From 36fadbd4cf3bf35e9a5acf2e40dbbefd1023c66f Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Fri, 22 Jul 2022 10:13:48 -0400 Subject: [PATCH] [train-only] Update train CI Updates: - install cinder from train-em tag instead of master - install os-brick from final train release instead of master - use train upper constraints file - remove cinderlib-lvm-functional job (see change If039438a8e84) - remove cinderlib-ceph-functional job (I think the problem is a python 2/3 compatability issue with ansible) This leaves the stable/train CI running only unit tests and pep8, which is the bare minimum before a branch must go EOL. Change-Id: Ibd9f425e2cb7fa1fb9d4e5461ea7379093534638 --- .zuul.yaml | 6 ------ tox.ini | 7 ++++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 603c96f..d2dcf0e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -9,9 +9,6 @@ - cinderlib-tox-py27 - cinderlib-tox-py36 - cinderlib-tox-py37 - - - cinderlib-lvm-functional - - cinderlib-ceph-functional gate: queue: integrated jobs: @@ -19,9 +16,6 @@ - cinderlib-tox-py27 - cinderlib-tox-py36 - cinderlib-tox-py37 - - - cinderlib-lvm-functional - - cinderlib-ceph-functional post: jobs: - publish-openstack-python-branch-tarball diff --git a/tox.ini b/tox.ini index f29f78d..6402277 100644 --- a/tox.ini +++ b/tox.ini @@ -15,9 +15,10 @@ install_command = pip install {opts} {packages} # overwrite the package installed by Zuul on jobs supporting cross-project # dependencies (include Cinder in required-projects). This allows us to also # run local tests against master. -deps= -r{toxinidir}/test-requirements.txt - git+https://opendev.org/openstack/os-brick#egg=os-brick - git+https://opendev.org/openstack/cinder#egg=cinder +deps= -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} + -r{toxinidir}/test-requirements.txt + os-brick==2.10.7 + git+https://opendev.org/openstack/cinder@train-em#egg=cinder commands = find . -ignore_readdir_race -type f -name "*.pyc" -delete