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

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"

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

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

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