Gate: Simpler multiple distro/over-ride support

This PS indroduces a simpler way to incorp over-rides into gate
runs, and also ensures that they are scoped to a single chart, rather
than all of the charts deployed within a gate run.

Change-Id: Iba80f645f33c6d5847fbbb28ce66ee3d23e4fce8
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2019-06-22 07:44:11 -05:00
parent 3d3f74de69
commit 2bb0dcb5b0
2 changed files with 21 additions and 6 deletions

View File

@ -0,0 +1,17 @@
# 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.
osh_params:
openstack_release: newton
container_distro_name: ubuntu
container_distro_version: xenial
#feature_gates:

View File

@ -19,11 +19,9 @@
environment:
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
OSH_VALUES_OVERRIDES_HELM_ARGS: >
{% if values_overrides is defined %}
{% for value_override in values_overrides %}
--values={{ value_override }}
{% endfor %}
{% endif %}
OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}"
OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm-infra/') }}"
OPENSTACK_RELEASE: "{{ osh_params.openstack_release }}"
CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name }}"
CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version }}"
FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}"