From f42ffe16d29f00cca38b7b53566e18d36edfc461 Mon Sep 17 00:00:00 2001
From: Matt Clay <mclay@redhat.com>
Date: Thu, 4 Nov 2021 17:20:17 -0700
Subject: [PATCH] ansible-test - Add Fedora 35 test container. (#76228)

* ansible-test - Add Fedora 35 test container.
* Added Fedora 35 to CI and removed Fedora 33 from CI.
* Fix dnf integration test.
* Fix connection_paramiko_ssh test.
---
 .azure-pipelines/azure-pipelines.yml                     | 8 ++++----
 changelogs/fragments/ansible-test-fedora35.yml           | 2 ++
 test/integration/targets/dnf/vars/Fedora-35.yml          | 2 ++
 .../setup_paramiko/install-Fedora-35-python-3.yml        | 9 +++++++++
 .../setup_paramiko/uninstall-Fedora-35-python-3.yml      | 7 +++++++
 test/lib/ansible_test/_data/completion/docker.txt        | 1 +
 6 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/fragments/ansible-test-fedora35.yml
 create mode 100644 test/integration/targets/dnf/vars/Fedora-35.yml
 create mode 100644 test/integration/targets/setup_paramiko/install-Fedora-35-python-3.yml
 create mode 100644 test/integration/targets/setup_paramiko/uninstall-Fedora-35-python-3.yml

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 6f779a2f523..817796b7882 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -119,10 +119,10 @@ stages:
               test: alpine3
             - name: CentOS 7
               test: centos7
-            - name: Fedora 33
-              test: fedora33
             - name: Fedora 34
               test: fedora34
+            - name: Fedora 35
+              test: fedora35
             - name: openSUSE 15 py2
               test: opensuse15py2
             - name: openSUSE 15 py3
@@ -191,10 +191,10 @@ stages:
           targets:
             - name: CentOS 7
               test: centos7
-            - name: Fedora 33
-              test: fedora33
             - name: Fedora 34
               test: fedora34
+            - name: Fedora 35
+              test: fedora35
             - name: openSUSE 15 py2
               test: opensuse15py2
             - name: openSUSE 15 py3
diff --git a/changelogs/fragments/ansible-test-fedora35.yml b/changelogs/fragments/ansible-test-fedora35.yml
new file mode 100644
index 00000000000..56ffab5d1ee
--- /dev/null
+++ b/changelogs/fragments/ansible-test-fedora35.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - ansible-test - Added the ``fedora35`` test container.
diff --git a/test/integration/targets/dnf/vars/Fedora-35.yml b/test/integration/targets/dnf/vars/Fedora-35.yml
new file mode 100644
index 00000000000..f99228fbafd
--- /dev/null
+++ b/test/integration/targets/dnf/vars/Fedora-35.yml
@@ -0,0 +1,2 @@
+astream_name: '@varnish:6.0/default'
+astream_name_no_stream: '@varnish/default'
diff --git a/test/integration/targets/setup_paramiko/install-Fedora-35-python-3.yml b/test/integration/targets/setup_paramiko/install-Fedora-35-python-3.yml
new file mode 100644
index 00000000000..bbe97a96392
--- /dev/null
+++ b/test/integration/targets/setup_paramiko/install-Fedora-35-python-3.yml
@@ -0,0 +1,9 @@
+- name: Install Paramiko and crypto policies scripts
+  dnf:
+    name:
+      - crypto-policies-scripts
+      - python3-paramiko
+    install_weak_deps: no
+
+- name: Drop the crypto-policy to LEGACY for these tests
+  command: update-crypto-policies --set LEGACY
diff --git a/test/integration/targets/setup_paramiko/uninstall-Fedora-35-python-3.yml b/test/integration/targets/setup_paramiko/uninstall-Fedora-35-python-3.yml
new file mode 100644
index 00000000000..aa3387bae17
--- /dev/null
+++ b/test/integration/targets/setup_paramiko/uninstall-Fedora-35-python-3.yml
@@ -0,0 +1,7 @@
+- name: Revert the crypto-policy back to DEFAULT
+  command: update-crypto-policies --set DEFAULT
+
+- name: Uninstall Paramiko and crypto policies scripts using dnf history undo
+  command: dnf history undo last --assumeyes
+  args:
+    warn: no
diff --git a/test/lib/ansible_test/_data/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt
index aead4325769..bcc2508b64a 100644
--- a/test/lib/ansible_test/_data/completion/docker.txt
+++ b/test/lib/ansible_test/_data/completion/docker.txt
@@ -6,6 +6,7 @@ centos7 image=quay.io/ansible/centos7-test-container:3.1.0 python=2.7 seccomp=un
 centos8 image=quay.io/ansible/centos8-test-container:3.1.0 python=3.6 seccomp=unconfined
 fedora33 image=quay.io/ansible/fedora33-test-container:3.1.0 python=3.9
 fedora34 image=quay.io/ansible/fedora34-test-container:3.1.0 python=3.9 seccomp=unconfined
+fedora35 image=quay.io/ansible/fedora35-test-container:3.2.0 python=3.10 seccomp=unconfined
 opensuse15py2 image=quay.io/ansible/opensuse15py2-test-container:3.1.0 python=2.7
 opensuse15 image=quay.io/ansible/opensuse15-test-container:3.1.0 python=3.6
 ubuntu1804 image=quay.io/ansible/ubuntu1804-test-container:3.1.0 python=3.6 seccomp=unconfined