diff --git a/.zuul.yaml b/.zuul.yaml index 7a87520e..635a24d5 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -12,20 +12,19 @@ - project: templates: + - openstack-python35-jobs - openstack-python36-jobs check: jobs: - openstack-tox-pep8 - airship-pegleg-linter - airship-pegleg-doc-build - - airship-pegleg-unit-py35 - airship-pegleg-docker-build-gate gate: jobs: - openstack-tox-pep8 - airship-pegleg-linter - airship-pegleg-doc-build - - airship-pegleg-unit-py35 - airship-pegleg-docker-build-gate post: jobs: @@ -44,20 +43,6 @@ run: tools/gate/playbooks/zuul-linter.yaml nodeset: airship-pegleg-single-node -- job: - name: airship-pegleg-unit-py35 - description: | - Executes unit tests under Python 3.5 - run: tools/gate/playbooks/unit-py35.yaml - timeout: 300 - nodeset: airship-pegleg-single-node - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - job: name: airship-pegleg-doc-build description: | diff --git a/tools/gate/playbooks/unit-py35.yaml b/tools/gate/playbooks/unit-py35.yaml deleted file mode 100644 index 4d00225f..00000000 --- a/tools/gate/playbooks/unit-py35.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# 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. - -- hosts: primary - tasks: - - name: Execute the make target for unit testing - make: - chdir: "{{ zuul.project.src_dir }}" - target: tests - register: result - failed_when: result.failed