From d163850d7c24df3ed5cb80bf5a38937ca8e0fb4c Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Thu, 5 Oct 2023 11:01:35 +0200
Subject: [PATCH] Bump ansible-core to 2.12.8

On 30.09.2023, "old" ansible galaxy(galaxy.ansible.com) was replaced
with "galaxy ng"[1].
There was a bug [2][3][4] that was fixed only in a supported
ansible-core versions, so:
- v2.12.8
- v2.13.3
- v2.14.0 (and all newer versions)

All openstack-ansible versions up to Yoga are using older ansible-core
versions.
As a result, bootstrap-ansible.sh script fails with an error:

```
Skipping Galaxy server https://galaxy.ansible.com/api/. Got an
unexpected error when getting available versions of collection
ansible.netcommon:
'/api/v3/plugin/ansible/content/published/collections/index/ansible/netcommon/versions/'
```

This patch bumps ansible-core version to 2.12.8 that includes required
fix.

[1] https://www.ansible.com/blog/new-ansible-galaxy
[2] https://github.com/ansible/ansible/issues/81830
[3] https://github.com/ansible/ansible/issues/77911
[4] https://github.com/ansible/ansible/pull/78325

Change-Id: I2c15c220ca8c6b6f0cbedbf0da8e802b7c0f5e2d
---
 test-ansible-collection-requirements.yml | 4 ++--
 test-ansible-deps.txt                    | 2 +-
 test-vars.yml                            | 6 ++++++
 tox.ini                                  | 3 +++
 zuul.d/jobs.yaml                         | 4 ++--
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/test-ansible-collection-requirements.yml b/test-ansible-collection-requirements.yml
index ad5d256c..0fea1def 100644
--- a/test-ansible-collection-requirements.yml
+++ b/test-ansible-collection-requirements.yml
@@ -1,6 +1,6 @@
 collections:
   - name: https://opendev.org/openstack/ansible-collections-openstack
-    version: 1.5.2
+    version: 2.1.0
     type: git
   - name: https://opendev.org/openstack/ansible-config_template
     version: 1.2.1
@@ -15,7 +15,7 @@ collections:
     version: 2.3.1
     type: git
   - name: https://github.com/ansible-collections/community.crypto
-    version: 1.9.5
+    version: 2.11.1
     type: git
   - name: https://github.com/ansible-collections/ansible.posix
     version: 1.3.0
diff --git a/test-ansible-deps.txt b/test-ansible-deps.txt
index ec2a68b5..a5e2de7a 100644
--- a/test-ansible-deps.txt
+++ b/test-ansible-deps.txt
@@ -8,7 +8,7 @@
 # target configuration in each role.
 
 # The Ansible version used for testing
-ansible-core==2.12.6
+ansible-core==2.12.8
 
 # Used for the ip filter within ansible
 netaddr
diff --git a/test-vars.yml b/test-vars.yml
index 68157e8e..e822256a 100644
--- a/test-vars.yml
+++ b/test-vars.yml
@@ -385,7 +385,10 @@ tempest_service_available_nova: "{{ ((groups['nova_all'] is defined) and (groups
 tempest_service_available_swift: "{{ ((groups['swift_all'] is defined) and (groups['swift_all'] | length > 0)) }}"
 tempest_service_available_zaqar: "{{ ((groups['zaqar_all'] is defined) and (groups['zaqar_all'] | length > 0)) }}"
 tempest_use_tempestconf: false
+tempest_run_stackviz: False
 tempest_image_dir: "/opt/cache/files"
+tempest_test_includelist:
+  - smoke
 
 # openrc settings
 openrc_os_password: "{{ keystone_auth_admin_password }}"
@@ -454,6 +457,9 @@ requirements_git_install_branch: "{{ services_branch.split('/')[-1] }}"
 # to always fetch the latest get-pip.py script
 pip_get_pip_force: no
 
+# We do not have a repo container, thus we should not attempt to build wheels
+venv_wheel_build_enable: False
+
 # Test install options
 install_test_packages: True
 
diff --git a/tox.ini b/tox.ini
index a4468c06..fc744768 100644
--- a/tox.ini
+++ b/tox.ini
@@ -81,6 +81,9 @@ commands =
 [testenv:functional]
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
+setenv =
+     {[testenv]setenv}
+     ANSIBLE_OVERRIDES={toxinidir}/test-vars.yml
 
 [testenv:linters]
 commands =
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 39d2d6ac..59080744 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -75,7 +75,7 @@
       - name: openstack/openstack-ansible-nspawn_container_create
       - name: openstack/openstack-ansible-nspawn_hosts
       - name: openstack/requirements
-        override-checkout: stable/yoga
+        override-checkout: stable/2023.2
     pre-run: zuul.d/playbooks/pre-gate-cleanup.yml
     run: zuul.d/playbooks/run.yml
     post-run: zuul.d/playbooks/post.yml
@@ -99,7 +99,7 @@
     timeout: 5400 # 90 mins
     vars:
       tox_env: functional
-      services_branch: stable/yoga
+      services_branch: stable/2023.2
 
 - job:
     name: openstack-ansible-linters