[ansible-test] Add Fedora 33 support and drop F31

Change:
- Changes to make F33 work with current tests
- Add F33 to docker.txt
- Add F33 to AZP config

Test Plan:
- ci_complete

Signed-off-by: Rick Elrod <rick@elrod.me>

.azure-pipelines/azure-pipelines.yml

@@ -118,10 +118,10 @@ stages:
               test: centos7
             - name: CentOS 8
               test: centos8
-            - name: Fedora 31
-              test: fedora31
             - name: Fedora 32
               test: fedora32
+            - name: Fedora 33
+              test: fedora33
             - name: openSUSE 15 py2
               test: opensuse15py2
             - name: openSUSE 15 py3
@@ -188,10 +188,10 @@ stages:
               test: centos7
             - name: CentOS 8
               test: centos8
-            - name: Fedora 31
-              test: fedora31
             - name: Fedora 32
               test: fedora32
+            - name: Fedora 33
+              test: fedora33
             - name: openSUSE 15 py2
               test: opensuse15py2
             - name: openSUSE 15 py3

changelogs/fragments/ansible-test-fedora33.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - ansible-test - Add support for running tests on Fedora 33 (https://github.com/ansible/ansible/pull/72861).

test/integration/targets/dnf/tasks/dnf.yml

@@ -112,8 +112,8 @@
         - "not dnf_result.changed"
 
 # Multiple packages
-- name: uninstall sos and pciutils
+- name: uninstall sos and dos2unix
-  dnf: name=sos,pciutils state=removed
+  dnf: name=sos,dos2unix state=removed
   register: dnf_result
 
 - name: check sos with rpm
@@ -121,19 +121,19 @@
   failed_when: False
   register: rpm_sos_result
 
-- name: check pciutils with rpm
+- name: check dos2unix with rpm
-  shell: rpm -q pciutils
+  shell: rpm -q dos2unix
   failed_when: False
-  register: rpm_pciutils_result
+  register: rpm_dos2unix_result
 
 - name: verify packages installed
   assert:
     that:
         - "rpm_sos_result.rc != 0"
-        - "rpm_pciutils_result.rc != 0"
+        - "rpm_dos2unix_result.rc != 0"
 
-- name: install sos and pciutils as comma separated
+- name: install sos and dos2unix as comma separated
-  dnf: name=sos,pciutils state=present
+  dnf: name=sos,dos2unix state=present
   register: dnf_result
 
 - name: check sos with rpm
@@ -141,10 +141,10 @@
   failed_when: False
   register: rpm_sos_result
 
-- name: check pciutils with rpm
+- name: check dos2unix with rpm
-  shell: rpm -q pciutils
+  shell: rpm -q dos2unix
   failed_when: False
-  register: rpm_pciutils_result
+  register: rpm_dos2unix_result
 
 - name: verify packages installed
   assert:
@@ -152,17 +152,17 @@
         - "not dnf_result.failed | default(False)"
         - "dnf_result.changed"
         - "rpm_sos_result.rc == 0"
-        - "rpm_pciutils_result.rc == 0"
+        - "rpm_dos2unix_result.rc == 0"
 
-- name: uninstall sos and pciutils
+- name: uninstall sos and dos2unix
-  dnf: name=sos,pciutils state=removed
+  dnf: name=sos,dos2unix state=removed
   register: dnf_result
 
-- name: install sos and pciutils as list
+- name: install sos and dos2unix as list
   dnf:
     name:
       - sos
-      - pciutils
+      - dos2unix
     state: present
   register: dnf_result
 
@@ -171,10 +171,10 @@
   failed_when: False
   register: rpm_sos_result
 
-- name: check pciutils with rpm
+- name: check dos2unix with rpm
-  shell: rpm -q pciutils
+  shell: rpm -q dos2unix
   failed_when: False
-  register: rpm_pciutils_result
+  register: rpm_dos2unix_result
 
 - name: verify packages installed
   assert:
@@ -182,17 +182,17 @@
         - "not dnf_result.failed | default(False)"
         - "dnf_result.changed"
         - "rpm_sos_result.rc == 0"
-        - "rpm_pciutils_result.rc == 0"
+        - "rpm_dos2unix_result.rc == 0"
 
-- name: uninstall sos and pciutils
+- name: uninstall sos and dos2unix
   dnf:
-    name: "sos,pciutils"
+    name: "sos,dos2unix"
     state: removed
   register: dnf_result
 
-- name: install sos and pciutils as comma separated with spaces
+- name: install sos and dos2unix as comma separated with spaces
   dnf:
-    name: "sos, pciutils"
+    name: "sos, dos2unix"
     state: present
   register: dnf_result
 
@@ -202,9 +202,9 @@
   register: rpm_sos_result
 
 - name: check sos with rpm
-  shell: rpm -q pciutils
+  shell: rpm -q dos2unix
   failed_when: False
-  register: rpm_pciutils_result
+  register: rpm_dos2unix_result
 
 - name: verify packages installed
   assert:
@@ -212,13 +212,13 @@
         - "not dnf_result.failed | default(False)"
         - "dnf_result.changed"
         - "rpm_sos_result.rc == 0"
-        - "rpm_pciutils_result.rc == 0"
+        - "rpm_dos2unix_result.rc == 0"
 
-- name: uninstall sos and pciutils (check_mode)
+- name: uninstall sos and dos2unix (check_mode)
   dnf:
     name:
       - sos
-      - pciutils
+      - dos2unix
     state: removed
   check_mode: True
   register: dnf_result
@@ -230,11 +230,11 @@
       - "dnf_result.results[0].startswith('Removed: ')"
       - "dnf_result.results[1].startswith('Removed: ')"
 
-- name: uninstall sos and pciutils
+- name: uninstall sos and dos2unix
   dnf:
     name:
       - sos
-      - pciutils
+      - dos2unix
     state: removed
   register: dnf_result
 

test/integration/targets/dnf/tasks/main.yml

@@ -61,6 +61,8 @@
   when: (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('31', '>=')) or
         (ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_major_version is version('8', '>='))
 
+# TODO: Construct our own instance where 'nobest' applies, so we can stop using
+#       a third-party repo to test this behavior.
 - include_tasks: nobest.yml
   when: (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('24', '>=')) or
         (ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_major_version is version('8', '>='))

test/integration/targets/dnf/tasks/modularity.yml

@@ -1,6 +1,11 @@
 # FUTURE - look at including AppStream support in our local repo
 - name: Include distribution specific variables
-  include_vars: "{{ ansible_facts.distribution }}.yml"
+  include_vars: "{{ item }}"
+  with_first_found:
+    - files:
+        - "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_major_version }}.yml"
+        - "{{ ansible_facts.distribution }}.yml"
+      paths: ../vars
 
 - name: install "{{ astream_name }}" module
   dnf:

test/integration/targets/dnf/vars/Fedora-33.yml

@@ -0,0 +1,2 @@
+astream_name: '@httpd:2.4/common'
+astream_name_no_stream: '@httpd/common'

test/lib/ansible_test/_data/completion/docker.txt

@@ -7,6 +7,7 @@ centos8 name=quay.io/ansible/centos8-test-container:1.21.0 python=3.6 seccomp=un
 fedora30 name=quay.io/ansible/fedora30-test-container:1.17.0 python=3.7
 fedora31 name=quay.io/ansible/fedora31-test-container:1.17.0 python=3.7
 fedora32 name=quay.io/ansible/fedora32-test-container:1.17.0 python=3.8
+fedora33 name=quay.io/ansible/fedora33-test-container:1.26.0 python=3.9
 opensuse15py2 name=quay.io/ansible/opensuse15py2-test-container:1.21.0 python=2.7
 opensuse15 name=quay.io/ansible/opensuse15-test-container:1.21.0 python=3.6
 ubuntu1604 name=quay.io/ansible/ubuntu1604-test-container:1.21.0 python=2.7 seccomp=unconfined