diff --git a/.zuul.yaml b/.zuul.yaml index 571500c..e571868 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -11,7 +11,7 @@ - cinderlib-lvm-functional - cinderlib-ceph-functional - - cinder-tempest-plugin-lvm-lio-barbican + - os-brick-src-tempest-lvm-lio-barbican gate: queue: integrated jobs: @@ -21,7 +21,7 @@ - cinderlib-lvm-functional - cinderlib-ceph-functional - - cinder-tempest-plugin-lvm-lio-barbican + - os-brick-src-tempest-lvm-lio-barbican post: jobs: - publish-openstack-python-branch-tarball @@ -41,11 +41,19 @@ - openstack/cinder - job: - name: cinderlib-lvm-functional + name: cinderlib-functional parent: openstack-tox-functional-with-sudo required-projects: - openstack/os-brick - openstack/cinder + pre-run: playbooks/required-projects-bindeps.yaml + irrelevant-files: + - ^.*\.rst$ + - ^doc/.*$ + - ^releasenotes/.*$ +- job: + name: cinderlib-lvm-functional + parent: cinderlib-functional pre-run: playbooks/setup-lvm.yaml nodeset: centos-8 vars: @@ -57,18 +65,11 @@ NOSE_WITH_HTML_OUTPUT: 1 NOSE_HTML_OUT_FILE: nose_results.html NOSE_WITH_XUNIT: 1 - irrelevant-files: &documentation-files - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ # The Ceph job tests cinderlib without unnecessary libraries - job: name: cinderlib-ceph-functional - parent: openstack-tox-functional-with-sudo - required-projects: - - openstack/os-brick - - openstack/cinder + parent: cinderlib-functional pre-run: playbooks/setup-ceph.yaml # TODO: move back to centos-8 as soon as Ceph packages are available nodeset: ubuntu-bionic @@ -80,4 +81,3 @@ NOSE_WITH_HTML_OUTPUT: 1 NOSE_HTML_OUT_FILE: nose_results.html NOSE_WITH_XUNIT: 1 - irrelevant-files: *documentation-files diff --git a/playbooks/required-projects-bindeps.yaml b/playbooks/required-projects-bindeps.yaml new file mode 100644 index 0000000..b0366fb --- /dev/null +++ b/playbooks/required-projects-bindeps.yaml @@ -0,0 +1,27 @@ +# Copyright (c) 2020, Red Hat, Inc. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# +--- +#------------------------------------------------------------------------------ +# Install OS-Brick bindeps for jobs that use them in required-projects. +# We don't install Cinder bindeps because for now we don't need them, as they +# include things like mariadb, postgresql, and mysql-server. +#------------------------------------------------------------------------------ +- hosts: all + roles: + - role: bindep + vars: + bindep_dir: "{{ zuul.projects['opendev.org/openstack/os-brick'].src_dir }}" diff --git a/tox.ini b/tox.ini index 750b482..4eeb27d 100644 --- a/tox.ini +++ b/tox.ini @@ -19,6 +19,7 @@ install_command = pip install {env:PIP_OPTIONS:} {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. +# NOTE: Functional tests may fail if host is missing bindeps from deps projects deps= -r{toxinidir}/test-requirements.txt git+https://opendev.org/openstack/os-brick#egg=os-brick git+https://opendev.org/openstack/cinder#egg=cinder