Fix dumping variables when no featureset is defined

In some jobs we don't define featureset, like building images
and containers. In this case we need to set up variables with
option that featureset doesn't exist.
Add checks for featureset defined into common role.
Also add tripleo roles that are used in building containers job
for run condition for these jobs. Add playbooks to be gated as
well.

Change-Id: I24364bda1d47c21259333bc936101e203a1689ca
This commit is contained in:
Sagi Shnaidman 2019-08-17 16:56:05 +03:00
parent 3ef2836a23
commit 3085a886d4
2 changed files with 7 additions and 2 deletions

View File

@ -4,7 +4,9 @@ tripleo_ci_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/
tripleo_quickstart_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/tripleo-quickstart'].src_dir }}"
vxlan_vars: "-e toci_vxlan_networking='false' -e vxlan_networking='false'"
extra_vars: ""
job_featureset_file: "{{ tripleo_quickstart_dir }}/config/general_config/featureset{{ featureset }}.yml"
job_featureset_file: >-
{% if featureset is defined -%}
{{ tripleo_quickstart_dir }}/config/general_config/featureset{{ featureset }}.yml{% endif -%}
skip_tags_list: >-
{% if environment_type == 'baremetal' -%}
tripleo-validations
@ -15,7 +17,7 @@ skip_tags_list: >-
featureset_conf: >-
{% if common_featureset is defined -%}
--extra-vars @{{ tripleo_quickstart_dir }}/config/general_config/{{ common_featureset }} {% endif -%}
--extra-vars @{{ job_featureset_file }}
{% if job_featureset_file != '' -%}--extra-vars @{{ job_featureset_file }}{% endif -%}
# "force_non_periodic" - will force job to run as check job, no matter which pipeline it runs
# "force_periodic" - will force job to run as periodic (in terms of TripleO CI), no matter which pipeline it runs

View File

@ -232,8 +232,11 @@
- ^docker/.*$
- kolla.*$
# tripleo-ci
- ^playbooks/.*$
- ^(playbooks|roles)/tripleo-buildcontainers/.*$
- ^roles/build-containers/.*$
- ^roles/prepare-node/.*$
- ^roles/common/.*$
- ^(playbooks|roles)/tripleo-repos/.*$
- ^zuul.d/build-containers.yaml$
- ^zuul.d/base.yaml$