Leave container_registry_file to identify containers file in pre-rock…

…y jobs.

From rocky onwards, the file used to identify the containers parameters
passed to be containers-prepare-parameter.yaml. This file had a different
format than in previous releases. At that point, a new variable was
introuduced in tripleo-upgrade to identify this containers parameter file:
uc_containers_prepare_file. To allow a transition from pre-rocky jobs to
post-rocky, the container_registry_file parameter was left to know the
name of the old containers prepare file. This file was removed from the
appended overcloud_deploy.sh files to avoid issues during the upgrade/
update prepare step [0].

Updates/Upgrades jobs were still using the container_registry_file as
the parameter used to set up the containers, pointing at the post-rocky
file containers-prepare-parameter.yaml. The code in [0] then removed it
from the appended -e environmetn files, running the overcloud update
prepare without the right containers-prepare-parameter.yaml.

[0] - https://review.opendev.org/#/c/717698
Change-Id: I6816db7382e7db6d0ae644c9487b2c5ee595a441
Closes-Bug: #1887176

config/general_config/featureset036.yml

@@ -57,13 +57,10 @@ use_oooq: true
 # Run prep container before upgrade.
 prep_container_upgrade_run: true
 containerized_overcloud_upgrade: true
-# 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 -%}
+# container_registry_file is used pre-rocky, after rocky
+# is uc_containers_prepare_file the one used to identify
+# the containers file (defaults to: containers-prepare-parameter.yaml)
+container_registry_file: containers-default-parameters.yaml
 
 # Adjust user to CI
 overcloud_ssh_user: "zuul"

config/general_config/featureset037.yml

@@ -12,13 +12,10 @@ 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.
-# 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 -%}
+# container_registry_file is used pre-rocky, after rocky
+# is uc_containers_prepare_file the one used to identify
+# the containers file (defaults to: containers-prepare-parameter.yaml)
+container_registry_file: containers-default-parameters.yaml
 tripleo_upgrade_validations_non_fatal: true
 tripleo_upgrade_debug: true
 # Reduce CI wall time

config/general_config/featureset040.yml

@@ -37,13 +37,10 @@ create_container_images_download_script: false
 # do not run workload test
 launch_sanity_workload: false
 
-# 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 -%}
+# container_registry_file is used pre-rocky, after rocky
+# is uc_containers_prepare_file the one used to identify
+# the containers file (defaults to: containers-prepare-parameter.yaml)
+container_registry_file: containers-default-parameters.yaml
 tripleo_ci: true
 use_oooq: true
 tripleo_upgrade_debug: true

config/general_config/featureset051.yml

@@ -44,13 +44,10 @@ create_container_images_download_script: false
 # do not run workload test
 launch_sanity_workload: false
 
-# 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 -%}
+# container_registry_file is used pre-rocky, after rocky
+# is uc_containers_prepare_file the one used to identify
+# the containers file (defaults to: containers-prepare-parameter.yaml)
+container_registry_file: containers-default-parameters.yaml
 tripleo_ci: true
 use_oooq: true
 tripleo_upgrade_debug: true