Merge "Upgrade from Victoria"

ansible/group_vars/all.yml

@@ -523,7 +523,7 @@ openstack_logging_debug: "False"
 openstack_region_name: "RegionOne"
 
 # Variable defined the pin_release_version, apply for rolling upgrade process
-openstack_previous_release_name: "ussuri"
+openstack_previous_release_name: "victoria"
 
 # A list of policy file formats that are supported by Oslo.policy
 supported_policy_format_list:

tests/templates/globals-default.j2

@@ -61,9 +61,6 @@ openstack_tag_suffix: "{{ docker_image_tag_suffix }}"
 # of docker systemd command only once
 docker_custom_option: "--insecure-registry primary:4000"
 {% endif %}
-{% if is_previous_release %}
-openstack_release: "{{ previous_release }}"
-{% endif %}
 {% endif %}
 
 {% if scenario == "zun" %}

zuul.d/base.yaml

@@ -27,7 +27,7 @@
       - ^kolla_ansible/tests/
       - ^zuul\.d/
     vars:
-      previous_release: ussuri
+      previous_release: victoria
       scenario: core
       virt_type: qemu
       is_upgrade: no