Merge "CI: Switch upgrades xena->yoga to yoga->master"

ansible/group_vars/all.yml

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

tests/run.yml

@@ -93,9 +93,6 @@
               echo "ansible-collection-kolla checked out to:"
               git log --pretty=oneline  -1
             chdir: "{{ ansible_collection_kolla_src_dir }}"
-          # TODO(mgoddard): Do this unconditionally when previous_release is
-          # yoga.
-          when: previous_release != 'xena'
 
         - name: checkout the previous kolla-ansible branch
           shell:
@@ -205,7 +202,6 @@
               dest: ironic-agent.kernel
       when: scenario == "ironic"
 
-    # TODO(mgoddard): Do this unconditionally when previous_release is yoga.
     - block:
         - name: slurp requirements.yml
           slurp:
@@ -223,7 +219,6 @@
               type: dir
             new_requirements:
               collections: "{{ (old_requirements.collections | rejectattr('name', 'search', 'ansible-collection-kolla') | list) + [new_requirement] }}"
-      when: not is_upgrade or previous_release != 'xena'
 
     - name: ensure /etc/ansible exists
       file:
@@ -252,11 +247,9 @@
         ansible{{ ansible_version_constraint }}
         ara<1.0.0
 
-    # TODO(mgoddard): do this unconditionally when previous release is Yoga.
     - name: install Ansible collections
       command: >-
         kolla-ansible install-deps
-      when: not is_upgrade or previous_release != 'xena'
 
     - name: get ARA callback plugin path
       command: "python3 -m ara.setup.callback_plugins"
@@ -577,9 +570,12 @@
               git log --pretty=oneline  -1
             chdir: "{{ ansible_collection_kolla_src_dir }}"
 
+        # NOTE(frickler): We modified requirements.yml, need to revert the
+        # changes in order for the branch checkout to succeed
         - name: checkout the current kolla-ansible branch
           shell:
             cmd: |
+              git checkout requirements.yml
               git checkout {{ zuul.branch }}
               echo "kolla-ansible checked out to:"
               git log --pretty=oneline  -1

tests/templates/globals-default.j2

@@ -148,8 +148,7 @@ openstack_cacert: "/etc/pki/tls/certs/ca-bundle.crt"
 {% endif %}
 kolla_admin_openrc_cacert: "{% raw %}{{ kolla_certificates_dir }}{% endraw %}/ca/root.crt"
 rabbitmq_enable_tls: "yes"
-# TODO(mgoddard): Set this to "yes" when previous release is Yoga.
-libvirt_tls: "{{ not is_upgrade or previous_release != 'xena' }}"
+libvirt_tls: "yes"
 {% endif %}
 
 {% if scenario == 'linuxbridge' %}

zuul.d/base.yaml

@@ -10,8 +10,7 @@
       - openstack/ansible-collection-kolla
       - openstack/kolla
       - openstack/kolla-ansible
-      - name: openstack/requirements
-        override-checkout: stable/yoga
+      - openstack/requirements
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*
@@ -27,7 +26,7 @@
       - ^kolla_ansible/tests/
       - ^zuul\.d/
     vars:
-      previous_release: xena
+      previous_release: yoga
       scenario: core
       virt_type: qemu
       is_upgrade: no
@@ -248,8 +247,7 @@
     run: tests/run-hashi-vault.yml
     required-projects:
       - openstack/kolla-ansible
-      - name: openstack/requirements
-        override-checkout: stable/yoga
+      - openstack/requirements
     voting: false
     irrelevant-files:
       - ^.*\.rst$

zuul.d/project.yaml

@@ -11,10 +11,10 @@
       - periodic-stable-jobs
     check:
       jobs:
-        # # - kolla-ansible-centos8s-source
+        # - kolla-ansible-centos8s-source
         - kolla-ansible-debian-source
-        - kolla-ansible-openeuler-source
-        - kolla-ansible-rocky8-source
+        # - kolla-ansible-openeuler-source
+        # - kolla-ansible-rocky8-source
         - kolla-ansible-ubuntu-source
         # - kolla-ansible-centos8s-source-kvm
         - kolla-ansible-ubuntu-source-kvm