05d3ff4f5a
When zuul executes jobs it adds all the post plays together and executes them in the inherited sequence. This is causing some confusion in our cross-repo testing where the logs are trying to be collected twice as the cross-repo test is based on the standard functional test. Instead of defining two sets of plays we can consolidate them into a single set, eliminating the confusion and repetition. At the same time we also do not try to collect logs if the script to prepare them was not able to execute, and we fix the conditional for the ARA report generation so that it works properly with the value being given it by zuul which is a boolean word. To make sure it still works outside of Zuul we leave the conditional which uses the standard success return code of 0. Change-Id: Id5027415f33a7a41650332a983cb87fab7ba2a4a
36 lines
1.1 KiB
YAML
36 lines
1.1 KiB
YAML
---
|
|
# Copyright 2017, Rackspace US, Inc.
|
|
#
|
|
# 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: all
|
|
tasks:
|
|
- name: Set current test repo (cross-repo)
|
|
set_fact:
|
|
current_test_repo: "git.openstack.org/{{ osa_test_repo }}"
|
|
when:
|
|
- osa_test_repo is defined
|
|
|
|
- name: Set current test repo (non-cross-repo)
|
|
set_fact:
|
|
current_test_repo: "{{ zuul.project.canonical_name }}"
|
|
when:
|
|
- osa_test_repo is not defined
|
|
|
|
- name: Run testing script
|
|
shell: |
|
|
./run_tests.sh {{ tox_env }}
|
|
args:
|
|
executable: "/bin/bash"
|
|
chdir: "{{ ansible_user_dir }}/src/{{ current_test_repo }}"
|