Use containers-prepare-parameters in upgrades/updates jobs.

The output from the containers image prepare
step is not the containers-default-parameters.yaml
file with the list of containers, but another file
named containers-prepare-parameters.yaml which
contains the ContainerImagePrepare parameter. This
parameter is used during deployment-steps to get
the list of containers.

Co-Authored-By: Quique Llorente <ellorent@redhat.com>

Closes-Bug: #1789881
Depends-On: If0c7786059f1d0d91d2279f45c67525908633378
Depends-On: I96109c2452d7568da4a9374661a8ba8b9ba71458
Change-Id: I9bd21b67a9bf9254458351e8ba784ed66f9949f4
This commit is contained in:
Jose Luis Franco Arza 2018-09-04 15:54:57 +02:00 committed by yatin
parent 87e7ab931f
commit 3fd28a0d78
6 changed files with 36 additions and 4 deletions

View File

@ -19,7 +19,11 @@ container_args: >-
{% if release in ['pike','queens'] -%}
-e {{ overcloud_templates_path }}/environments/docker.yaml
{%- endif -%}
{% if release in ['ocata', 'pike', 'queens', 'rocky'] %}
-e {{ working_dir }}/containers-default-parameters.yaml
{% else %}
-e {{ working_dir }}/containers-prepare-parameter.yaml
{% endif %}
-e {{ overcloud_templates_path }}/environments/kubernetes.yaml
config_download_args: >-

View File

@ -26,7 +26,11 @@ container_args: >-
{% if release in ['pike','queens'] -%}
-e {{ overcloud_templates_path }}/environments/docker.yaml
{%- endif -%}
{% if release in ['ocata', 'pike', 'queens', 'rocky'] %}
-e {{ working_dir }}/containers-default-parameters.yaml
{% else %}
-e {{ working_dir }}/containers-prepare-parameter.yaml
{% endif %}
-e {{ overcloud_templates_path }}/environments/openshift.yaml
docker_openshift_etcd_namespace: docker.io/{{ docker_registry_namespace }}

View File

@ -54,7 +54,13 @@ use_oooq: true
# Run prep container before upgrade.
prep_container_upgrade_run: true
containerized_overcloud_upgrade: true
container_registry_file: "containers-default-parameters.yaml"
# Need to update once stein is released
container_registry_file: >-
{% if release not in ['ocata','pike','queens','rocky'] -%}
containers-prepare-parameter.yaml
{%- else -%}
containers-default-parameters.yaml
{%- endif -%}
# Adjust user to CI
overcloud_ssh_user: "tripleo-admin"

View File

@ -12,7 +12,13 @@ overcloud_update: true
# updating the container images too. (This might have to be paired
# with some work on the image building side to get meaningful
# from-to combination of images.
container_registry_file: containers-default-parameters.yaml
# Need to update once stein is released
container_registry_file: >-
{% if release not in ['ocata','pike','queens','rocky'] -%}
containers-prepare-parameter.yaml
{%- else -%}
containers-default-parameters.yaml
{%- endif -%}
tripleo_upgrade_validations_non_fatal: true
tripleo_upgrade_debug: true
# Reduce CI wall time

View File

@ -33,7 +33,13 @@ overcloud_upgrade: true
create_docker_registry: false
use_local_docker_registry: false
create_container_images_download_script: false
container_registry_file: "containers-default-parameters.yaml"
# Need to update once stein is released
container_registry_file: >-
{% if release not in ['ocata','pike','queens','rocky'] -%}
containers-prepare-parameter.yaml
{%- else -%}
containers-default-parameters.yaml
{%- endif -%}
tripleo_ci: true
use_oooq: true
tripleo_upgrade_debug: true

View File

@ -37,7 +37,13 @@ overcloud_upgrade: true
create_docker_registry: false
use_local_docker_registry: false
create_container_images_download_script: false
container_registry_file: "containers-default-parameters.yaml"
# Need to update once stein is released
container_registry_file: >-
{% if release not in ['ocata','pike','queens','rocky'] -%}
containers-prepare-parameter.yaml
{%- else -%}
containers-default-parameters.yaml
{%- endif -%}
tripleo_ci: true
use_oooq: true
tripleo_upgrade_debug: true