From 3fd28a0d789e2dc6c9b245b09a0a70376d947b27 Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Tue, 4 Sep 2018 15:54:57 +0200 Subject: [PATCH] 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 Closes-Bug: #1789881 Depends-On: If0c7786059f1d0d91d2279f45c67525908633378 Depends-On: I96109c2452d7568da4a9374661a8ba8b9ba71458 Change-Id: I9bd21b67a9bf9254458351e8ba784ed66f9949f4 --- config/general_config/featureset026.yml | 4 ++++ config/general_config/featureset033.yml | 4 ++++ config/general_config/featureset036.yml | 8 +++++++- config/general_config/featureset037.yml | 8 +++++++- config/general_config/featureset040.yml | 8 +++++++- config/general_config/featureset051.yml | 8 +++++++- 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/config/general_config/featureset026.yml b/config/general_config/featureset026.yml index 71af7bb2a..20af93440 100644 --- a/config/general_config/featureset026.yml +++ b/config/general_config/featureset026.yml @@ -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: >- diff --git a/config/general_config/featureset033.yml b/config/general_config/featureset033.yml index eceb4ad65..2264d3004 100644 --- a/config/general_config/featureset033.yml +++ b/config/general_config/featureset033.yml @@ -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 }} diff --git a/config/general_config/featureset036.yml b/config/general_config/featureset036.yml index 21a568fcd..dddd35cef 100644 --- a/config/general_config/featureset036.yml +++ b/config/general_config/featureset036.yml @@ -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" diff --git a/config/general_config/featureset037.yml b/config/general_config/featureset037.yml index ad9ff4e97..7904a4e29 100644 --- a/config/general_config/featureset037.yml +++ b/config/general_config/featureset037.yml @@ -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 diff --git a/config/general_config/featureset040.yml b/config/general_config/featureset040.yml index 767b17a6e..b4abfc58c 100644 --- a/config/general_config/featureset040.yml +++ b/config/general_config/featureset040.yml @@ -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 diff --git a/config/general_config/featureset051.yml b/config/general_config/featureset051.yml index 5a769ddb6..3edc0004d 100644 --- a/config/general_config/featureset051.yml +++ b/config/general_config/featureset051.yml @@ -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