From 16c32e366bfffcffe559c19d6687d641d3fbf61c Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Fri, 15 Nov 2019 17:45:06 +0100 Subject: [PATCH] Restore TripleO CI jobs using new Tobiko role Run faults and scenario test cases using Tobiko role Change-Id: I551969bdea7cdebbc1914c5f1753c4fd9ae1dfad --- playbooks/tripleo/post.yaml | 10 ++++++ playbooks/tripleo/pre.yaml | 21 ++++++++++++ playbooks/tripleo/run.yaml | 26 +++++++++++++++ zuul.d/project.yaml | 4 +++ zuul.d/tobiko-tripleo.yaml | 66 +++++++++++++++++++++---------------- 5 files changed, 99 insertions(+), 28 deletions(-) create mode 100644 playbooks/tripleo/post.yaml create mode 100644 playbooks/tripleo/pre.yaml create mode 100644 playbooks/tripleo/run.yaml diff --git a/playbooks/tripleo/post.yaml b/playbooks/tripleo/post.yaml new file mode 100644 index 000000000..0517d8c15 --- /dev/null +++ b/playbooks/tripleo/post.yaml @@ -0,0 +1,10 @@ +--- + +- hosts: all + roles: + - name: collect tobiko test case results + role: tobiko + vars: + tobiko_pre_run: false + tobiko_run: false + tobiko_post_run: true diff --git a/playbooks/tripleo/pre.yaml b/playbooks/tripleo/pre.yaml new file mode 100644 index 000000000..31122849c --- /dev/null +++ b/playbooks/tripleo/pre.yaml @@ -0,0 +1,21 @@ +--- + +- hosts: + - primary + + roles: + - name: install python3-devel and other requirements + role: bindep + + - name: import tripleo-ci common role + role: common + + - name: install tripleo + role: run-test + + - name: prepare environment to run Tobiko test cases + role: tobiko + vars: + tobiko_pre_run: true + tobiko_run: false + tobiko_post_run: false diff --git a/playbooks/tripleo/run.yaml b/playbooks/tripleo/run.yaml new file mode 100644 index 000000000..38c63d5b8 --- /dev/null +++ b/playbooks/tripleo/run.yaml @@ -0,0 +1,26 @@ +# Copyright 2020 Red Hat +# +# 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 + + roles: + - name: run Tobiko test cases + role: tobiko + vars: + tobiko_pre_run: false + tobiko_run: true + tobiko_post_run: false diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 29de961d1..d7df05a9f 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -21,9 +21,13 @@ - tobiko-devstack-faults-centos-7 - tobiko-devstack-faults-ubuntu-bionic - tobiko-tox-infrared-centos-7 + - tobiko-tripleo-functional + - tobiko-tripleo-faults + gate: jobs: - tobiko-devstack-functional + - tobiko-tripleo-functional experimental: jobs: diff --git a/zuul.d/tobiko-tripleo.yaml b/zuul.d/tobiko-tripleo.yaml index b71020368..9d88dfb6e 100644 --- a/zuul.d/tobiko-tripleo.yaml +++ b/zuul.d/tobiko-tripleo.yaml @@ -2,27 +2,51 @@ name: tobiko-tripleo abstract: true description: Base Tobiko TripleO job - parent: tripleo-ci-base-standalone - nodeset: single-centos-7-node + parent: tripleo-ci-centos-7-standalone required-projects: - - opendev.org/x/tobiko - voting: false - branches: ^(?!stable/(newton|ocata|pike|queens)).*$ + - openstack/tripleo-ci + - x/tobiko + + pre-run: playbooks/tripleo/pre.yaml + run: playbooks/tripleo/run.yaml + post-run: playbooks/tripleo/post.yaml vars: + tobiko_conf: + keystone: + cloud_name: standalone featureset: '052' featureset_override: run_tempest: false - # Tempest variable to provide cloud name is also used by - # Tobiko's playbook - tempest_cloud_name: "standalone" + use_os_tempest: false standalone_environment_files: - 'environments/low-memory-usage.yaml' - 'ci/environments/scenario002-standalone.yaml' playbooks: - quickstart.yml - multinode-standalone.yml - - tobiko.yml - + run_test_role_vars: + build_test_packages: false + artg_skipped_projects: + - openstack/puppet-openstack-integration + - openstack/puppet-watcher + - openstack/tripleo-quickstart + - openstack/tripleo-quickstart-extras + - openstack/tripleo-upgrade + - x/browbeat + - openstack/tripleo-ha-utils + - openstack/grenade + - openstack/project-config + - openstack/tripleo-ci + - zuul/zuul-jobs + - openstack/openstack-virtual-baremetal + - openstack/openstack-ansible-os_tempest + - openstack/ansible-role-python_venv_build + - openstack/ansible-config_template + - openstack/ansible-role-collect-logs + - openstack/tripleo-ci-internal-jobs + - openstack/tripleo-ci-internal-config + - tripleo-environments + - x/tobiko - job: name: tobiko-tripleo-functional @@ -37,29 +61,15 @@ name: tobiko-tripleo-scenario description: Scenario testing Tobiko TripleO job parent: tobiko-tripleo - voting: true + abstract: true vars: tox_envlist: scenario - job: - name: tobiko-tripleo-upgrade - description: Scenario testing Tobiko TripleO upgrade job + name: tobiko-tripleo-faults + description: OS faults and scenario testing Tobiko TripleO job parent: tobiko-tripleo-scenario voting: false vars: - playbooks: - - quickstart.yml - - multinode-standalone.yml - - tobiko.yml - - multinode-standalone-upgrade.yml - - tobiko.yml - - -- job: - name: tobiko-tripleo-faults - description: OS faults and scenario testing Tobiko TripleO job - parent: tobiko-tripleo - voting: false - vars: - tox_envlist: scenario,faults + tobiko_run_faults: true