summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Savineau <dsavinea@redhat.com>2019-02-12 11:19:04 -0500
committerDimitri Savineau <dsavinea@redhat.com>2019-02-12 11:19:04 -0500
commit0d1619cf82feadd6705a342e61fbf48450ccc662 (patch)
treecbe401ddb23aac538e6a624af7e2da55a1072c3c
parent364df84d1d04e5952477676b6cd18bd7eb0cb1d6 (diff)
Fix yaml syntax
Change-Id: If6f519d14d37a07e1e34306a8d3131978ba22163
-rw-r--r--defaults/main.yml4
-rw-r--r--infrared_plugin/main.yml2
-rw-r--r--meta/main.yml7
-rw-r--r--tasks/main.yml54
-rw-r--r--tasks/prepare.yml6
5 files changed, 37 insertions, 36 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index 7a6acf5..b2290ce 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -167,8 +167,8 @@ openstack_certification_supported_apis_and_extensions:
- plugins
# openstack_certification_tempest_conf_path: /home/stack/tempest/etc/tempest.conf
-openstack_certification_tempest_conf_path_is_remote: Yes
-openstack_certification_enable_rhsm_repo: Yes
+openstack_certification_tempest_conf_path_is_remote: true
+openstack_certification_enable_rhsm_repo: true
openstack_certification_install_rpms: >-
[ 'redhat-certification',
{% if 'baremetal' in openstack_certification_tags + openstack_certification_tests + openstack_certification_programs %}
diff --git a/infrared_plugin/main.yml b/infrared_plugin/main.yml
index 064e24f..d6b3544 100644
--- a/infrared_plugin/main.yml
+++ b/infrared_plugin/main.yml
@@ -3,7 +3,7 @@
- hosts: undercloud
remote_user: stack
- become: yes
+ become: true
roles:
- ansible-role-openstack-certification
diff --git a/meta/main.yml b/meta/main.yml
index d8eddf4..9e0116f 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,3 +1,4 @@
+---
galaxy_info:
author: Distributed-CI Team
description: An Ansible role to run the Red Hat OpenStack certification test suite
@@ -5,9 +6,9 @@ galaxy_info:
license: license (Apache)
min_ansible_version: 2.0
platforms:
- - name: EL
- versions:
- - 7
+ - name: EL
+ versions:
+ - 7
galaxy_tags: []
diff --git a/tasks/main.yml b/tasks/main.yml
index eafaf79..56367d4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -8,7 +8,7 @@
register: rhosp_status
- name: Install rhosp-release
- become: True
+ become: true
package:
name: rhosp-release
state: latest
@@ -40,13 +40,13 @@
register: admin_project_name
- name: Create the test_config.json file
- become: True
+ become: true
template:
src: test_config.json.j2
dest: /etc/redhat-certification-openstack/test_config.json
- name: copy the tempest configuration file
- become: True
+ become: true
copy:
src: '{{ openstack_certification_tempest_conf_path }}'
dest: /etc/redhat-certification-openstack
@@ -55,67 +55,67 @@
when: "'baremetal' not in all_certification_types"
- name: Create the baremetal.json file
- become: True
+ become: true
template:
src: baremetal.json
dest: /etc/redhat-certification-openstack/baremetal.json
when: "'baremetal' in all_certification_types"
- name: Run certification test suite with tag argument
- become: True
+ become: true
shell: >
set -x
rhcert-ci clean all && rhcert-ci run --tag {{ item }} && rhcert-ci save
with_items: "{{ openstack_certification_tags }}"
- ignore_errors: True
+ ignore_errors: true
when: openstack_certification_test_type == "tag"
- name: Run certification test suite with program argument
- become: True
+ become: true
shell: >
set -x
rhcert-ci clean all && rhcert-ci run --program {{ item }} && rhcert-ci save
with_items: "{{ openstack_certification_programs }}"
- ignore_errors: True
+ ignore_errors: true
when: openstack_certification_test_type == "program"
- name: Run certification test suite with test argument
- become: True
+ become: true
shell: >
set -x
rhcert-ci clean all && rhcert-ci run --test {{" --test ".join(openstack_certification_tests)}} && rhcert-ci save
- ignore_errors: True
+ ignore_errors: true
when: openstack_certification_test_type != "tag" and openstack_certification_test_type != "program"
- name: Retrieve certification test results
- become: True
+ become: true
shell: rhcert-ci print --format {{ openstack_certification_output_format }} | tail -n +2 | tee {{ openstack_certification_output_filename }}
- name: Download output file
- become: True
+ become: true
fetch:
src: '{{ openstack_certification_output_filename }}'
dest: "{{ openstack_certification_dest_dir }}/{{ openstack_certification_output_filename }}"
- flat: yes
+ flat: true
- block:
- - name: Compress results file
- become: True
- archive:
- path: /var/rhcert/results.xml
- dest: /home/stack/certification.xml.gz
- format: gz
-
- - name: Download results file
- become: True
- fetch:
- src: 'certification.xml.gz'
- dest: "{{ openstack_certification_dest_dir }}/certification.xml.gz"
- flat: yes
+ - name: Compress results file
+ become: true
+ archive:
+ path: /var/rhcert/results.xml
+ dest: /home/stack/certification.xml.gz
+ format: gz
+
+ - name: Download results file
+ become: true
+ fetch:
+ src: 'certification.xml.gz'
+ dest: "{{ openstack_certification_dest_dir }}/certification.xml.gz"
+ flat: true
when: openstack_certification_results_download|bool
- name: Tempest cleanup
- become: True
+ become: true
file:
path: /tmp/tempest-lock
state: absent
diff --git a/tasks/prepare.yml b/tasks/prepare.yml
index 2a04e65..6e65fe8 100644
--- a/tasks/prepare.yml
+++ b/tasks/prepare.yml
@@ -1,6 +1,6 @@
---
- name: Subscribe to rhel-7-server-cert-rpms
- become: True
+ become: true
shell: subscription-manager repos --enable=rhel-7-server-cert-rpms
register: rhsm
until: rhsm.rc == 0
@@ -9,14 +9,14 @@
when: openstack_certification_enable_rhsm_repo
- name: Copy an openstack certification repository
- become: True
+ become: true
copy:
src: "{{ openstack_certification_repo_file }}"
dest: /etc/yum.repos.d/{{ openstack_certification_repo_file | basename }}
when: openstack_certification_repo_file is defined
- name: Install Red Hat certification packages
- become: True
+ become: true
package:
name: "{{ openstack_certification_install_rpms }}"
state: present