Use custom rpm repo script for dnf testing (#32737)

* Use custom rpm repo script for dnf testing

* Switch to a jinja2 test

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

@@ -1,2 +1,3 @@
 dependencies:
   - prepare_tests
+  - setup_rpm_repo

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

@@ -1,4 +1,4 @@
-# test code for the yum module
+# test code for the dnf module
 # (c) 2014, James Tanner <tanner.jc@gmail.com>
 
 # This file is part of Ansible
@@ -20,7 +20,16 @@
 # We want to test that for people who don't want to upgrade their systems.
 
 - include: 'dnf.yml'
-  when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and False) or (ansible_distribution in ['Fedora'] and ansible_distribution_major_version|int >= 23)
+  when:
+    - ansible_distribution == 'Fedora'
+    - ansible_distribution_major_version|int >= 23
+
+- include: 'repo.yml'
+  when:
+    - ansible_distribution == 'Fedora'
+    - ansible_distribution_major_version|int >= 23
 
 - include: 'dnfinstallroot.yml'
-  when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and False) or (ansible_distribution in ['Fedora'] and ansible_distribution_major_version|int >= 23)
+  when:
+    - ansible_distribution == 'Fedora'
+    - ansible_distribution_major_version|int >= 23

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

@@ -0,0 +1,214 @@
+- block:
+    - name: Install foo-1.0-1
+      dnf:
+        name: foo-1.0-1
+        state: present
+      register: dnf_result
+
+    - name: Check foo with rpm
+      shell: rpm -q foo
+      register: rpm_result
+
+    - name: Verify installation
+      assert:
+        that:
+            - "dnf_result.changed"
+            - "rpm_result.stdout.startswith('foo-1.0-1')"
+
+    - name: Verify dnf module outputs
+      assert:
+        that:
+            - "'results' in dnf_result"
+    # ============================================================================
+    - name: Install foo-1.0-1 again
+      dnf:
+        name: foo-1.0-1
+        state: present
+      register: dnf_result
+
+    - name: Check foo with rpm
+      shell: rpm -q foo
+      register: rpm_result
+
+    - name: Verify installation
+      assert:
+        that:
+            - "not dnf_result.changed"
+            - "rpm_result.stdout.startswith('foo-1.0-1')"
+
+    - name: Verify dnf module outputs
+      assert:
+        that:
+            - "'msg' in dnf_result"
+    # ============================================================================
+    - name: Install foo-1:1.0-2
+      dnf:
+        name: "foo-1:1.0-2.{{ ansible_architecture }}"
+        state: present
+      register: dnf_result
+
+    - name: Check foo with rpm
+      shell: rpm -q foo
+      register: rpm_result
+
+    - name: Verify installation
+      assert:
+        that:
+            - "dnf_result.changed"
+            - "rpm_result.stdout.startswith('foo-1.0-2')"
+
+    - name: Verify dnf module outputs
+      assert:
+        that:
+            - "'results' in dnf_result"
+    # ============================================================================
+    - name: Update to the latest foo
+      dnf:
+        name: foo
+        state: latest
+      register: dnf_result
+
+    - name: Check foo with rpm
+      shell: rpm -q foo
+      register: rpm_result
+
+    - name: Verify installation
+      assert:
+        that:
+            - "dnf_result.changed"
+            - "rpm_result.stdout.startswith('foo-1.1-1')"
+
+    - name: Verify dnf module outputs
+      assert:
+        that:
+            - "'results' in dnf_result"
+    # ============================================================================
+    - name: Install foo-1.0-1 from a file (downgrade)
+      dnf:
+        name: "{{ repodir }}/foo-1.0-1.{{ ansible_architecture }}.rpm"
+        state: present
+      register: dnf_result
+
+    - name: Check foo with rpm
+      shell: rpm -q foo
+      register: rpm_result
+
+    - name: Verify installation
+      assert:
+        that:
+            - "dnf_result.changed"
+            - "rpm_result.stdout.startswith('foo-1.0-1')"
+
+    - name: Verify dnf module outputs
+      assert:
+        that:
+            - "'results' in dnf_result"
+
+    - name: Remove foo
+      dnf:
+        name: foo
+        state: absent
+    # ============================================================================
+    - name: Install foo-1.0-1 from a file
+      dnf:
+        name: "{{ repodir }}/foo-1.0-1.{{ ansible_architecture }}.rpm"
+        state: present
+      register: dnf_result
+
+    - name: Check foo with rpm
+      shell: rpm -q foo
+      register: rpm_result
+
+    - name: Verify installation
+      assert:
+        that:
+            - "dnf_result.changed"
+            - "rpm_result.stdout.startswith('foo-1.0-1')"
+
+    - name: Verify dnf module outputs
+      assert:
+        that:
+            - "'results' in dnf_result"
+    # ============================================================================
+    - name: Install foo-1.0-1 from a file again
+      dnf:
+        name: "{{ repodir }}/foo-1.0-1.{{ ansible_architecture }}.rpm"
+        state: present
+      register: dnf_result
+
+    - name: Check foo with rpm
+      shell: rpm -q foo
+      register: rpm_result
+
+    - name: Verify installation
+      assert:
+        that:
+            - "not dnf_result.changed"
+            - "rpm_result.stdout.startswith('foo-1.0-1')"
+    # ============================================================================
+    - name: Install foo-1.0-2 from a file
+      dnf:
+        name: "{{ repodir }}/foo-1.0-2.{{ ansible_architecture }}.rpm"
+        state: present
+      register: dnf_result
+
+    - name: Check foo with rpm
+      shell: rpm -q foo
+      register: rpm_result
+
+    - name: Verify installation
+      assert:
+        that:
+            - "dnf_result.changed"
+            - "rpm_result.stdout.startswith('foo-1.0-2')"
+
+    - name: Verify dnf module outputs
+      assert:
+        that:
+            - "'results' in dnf_result"
+    # ============================================================================
+    - name: Install foo-1.0-2 from a file again
+      dnf:
+        name: "{{ repodir }}/foo-1.0-2.{{ ansible_architecture }}.rpm"
+        state: present
+      register: dnf_result
+
+    - name: Check foo with rpm
+      shell: rpm -q foo
+      register: rpm_result
+
+    - name: Verify installation
+      assert:
+        that:
+            - "not dnf_result.changed"
+            - "rpm_result.stdout.startswith('foo-1.0-2')"
+    # ============================================================================
+    - name: Remove foo
+      dnf:
+        name: foo
+        state: absent
+
+    - name: Try to install incompatible arch
+      dnf:
+        name: "{{ repodir_ppc64 }}/foo-1.0-1.ppc64.rpm"
+        state: present
+      register: dnf_result
+      ignore_errors: yes
+
+    - name: Check foo with rpm
+      shell: rpm -q foo
+      register: rpm_result
+      ignore_errors: yes
+
+    - name: Verify installation
+      assert:
+        that:
+            - "rpm_result.rc == 1"
+            - "not dnf_result.changed"
+            - "dnf_result is failed"
+    # ============================================================================
+  always:
+    - name: Clean up
+      yum:
+        name: foo
+        state: absent

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

@@ -0,0 +1,63 @@
+- block:
+  - name: Install epel repo which is missing on rhel-7 and is needed for rpmfluff
+    package:
+      name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+    when:
+      - ansible_distribution in ['RedHat']
+
+  - name: Install rpmfluff and deps
+    package:
+      name: "{{ item }}"
+    with_items:
+      - python-rpmfluff
+      - createrepo_c
+      - createrepo  # used by el6 version of rpmfluff
+
+  - name: Copy script for creating a repo
+    copy:
+      src: create-repo.py
+      dest: /tmp/create-repo.py
+      mode: 0755
+
+  - name: Create RPMs and put them into a repo
+    shell: "python /tmp/create-repo.py {{ ansible_architecture }}"
+    register: repo
+
+  - set_fact:
+      repodir: "{{ repo.stdout_lines[-1] }}"
+
+  - name: Install the repo
+    yum_repository:
+      name: "fake-{{ ansible_architecture }}"
+      description: "fake-{{ ansible_architecture }}"
+      baseurl: "file://{{ repodir }}"
+      gpgcheck: no
+
+  - name: Create RPMs and put them into a repo (i686)
+    shell: "python /tmp/create-repo.py i686"
+    register: repo_i686
+
+  - set_fact:
+      repodir_i686: "{{ repo_i686.stdout_lines[-1] }}"
+
+  - name: Install the repo (i686)
+    yum_repository:
+      name: "fake-i686"
+      description: "fake-i686"
+      baseurl: "file://{{ repodir_i686 }}"
+      gpgcheck: no
+
+  - name: Create RPMs and put them into a repo (ppc64)
+    shell: "python /tmp/create-repo.py ppc64"
+    register: repo_ppc64
+
+  - set_fact:
+      repodir_ppc64: "{{ repo_ppc64.stdout_lines[-1] }}"
+
+  - name: Install the repo (ppc64)
+    yum_repository:
+      name: "fake-ppc64"
+      description: "fake-ppc64"
+      baseurl: "file://{{ repodir_ppc64 }}"
+      gpgcheck: no
+  when: ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux', 'Fedora']

test/integration/targets/yum/aliases

@@ -1,2 +1,4 @@
 destructive
 posix/ci/group1
+skip/freebsd
+skip/osx

test/integration/targets/yum/meta/main.yml

@@ -1,2 +1,3 @@
 dependencies:
   - prepare_tests
+  - setup_rpm_repo

test/integration/targets/yum/tasks/repo.yml

@@ -1,65 +1,4 @@
-- name: Install epel repo which is missing on rhel-7 and is needed for rpmfluff
-  yum:
-    name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-  when:
-    - ansible_distribution in ['RedHat']
-
-- name: Install rpmfluff and deps
-  yum:
-    name: "{{ item }}"
-  with_items:
-    - python-rpmfluff
-    - createrepo_c
-    - createrepo  # used by el6 version of rpmfluff
-
-- name: Copy script for creating a repo
-  copy:
-    src: create-repo.py
-    dest: /tmp/create-repo.py
-    mode: 0755
-
-- name: Create RPMs and put them into a repo
-  shell: "python /tmp/create-repo.py {{ ansible_architecture }}"
-  register: repo
-
-- set_fact:
-    repodir: "{{ repo.stdout_lines[-1] }}"
-
-- name: Install the repo
-  yum_repository:
-    name: "fake-{{ ansible_architecture }}"
-    description: "fake-{{ ansible_architecture }}"
-    baseurl: "file://{{ repodir }}"
-    gpgcheck: no
-
-- name: Create RPMs and put them into a repo (i686)
-  shell: "python /tmp/create-repo.py i686"
-  register: repo_i686
-
-- set_fact:
-    repodir_i686: "{{ repo_i686.stdout_lines[-1] }}"
-
-- name: Install the repo (i686)
-  yum_repository:
-    name: "fake-i686"
-    description: "fake-i686"
-    baseurl: "file://{{ repodir_i686 }}"
-    gpgcheck: no
-
-- name: Create RPMs and put them into a repo (ppc64)
-  shell: "python /tmp/create-repo.py ppc64"
-  register: repo_ppc64
-
-- set_fact:
-    repodir_ppc64: "{{ repo_ppc64.stdout_lines[-1] }}"
-
-- name: Install the repo (ppc64)
-  yum_repository:
-    name: "fake-ppc64"
-    description: "fake-ppc64"
-    baseurl: "file://{{ repodir_ppc64 }}"
-    gpgcheck: no
-# ============================================================================
+- block:
     - name: Install foo-1.0-1
       yum:
         name: foo-1.0-1
@@ -73,16 +12,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.0-1')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -100,16 +35,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "not yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.0-1')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -127,16 +58,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.0-2')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -159,16 +86,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.0-2')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -186,16 +109,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "not yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.0-2')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -213,16 +132,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.1-1')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -240,16 +155,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "not yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.1-1')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -272,16 +183,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.0-1')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -299,16 +206,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "not yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.0-1')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -326,16 +229,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.0-2')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -353,16 +252,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "not yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.0-2')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -381,16 +276,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "not yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.0-2')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -409,16 +300,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.0-1')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -437,16 +324,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.1-1')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -475,12 +358,11 @@
             - "rpm_result.rc == 1"
             - "yum_result.rc == 0"
             - "not yum_result.changed"
-        - "not yum_result|failed"
+            - "not yum_result is failed"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -503,12 +385,11 @@
             - "rpm_result.rc == 1"
             - "yum_result.rc == 1"
             - "not yum_result.changed"
-        - "yum_result|failed"
+            - "yum_result is failed"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -532,16 +413,12 @@
     - name: Verify installation
       assert:
         that:
-        - "rpm_result.rc == 0"
-        - "yum_result.rc == 0"
             - "yum_result.changed"
-        - "not yum_result|failed"
             - "rpm_result.stdout.startswith('foo-1.0-1')"
 
     - name: Verify yum module outputs
       assert:
         that:
-        - "'changed' in yum_result"
             - "'msg' in yum_result"
             - "'rc' in yum_result"
             - "'results' in yum_result"
@@ -573,17 +450,13 @@
       - name: verify installation
         assert:
           that:
-          - "rpm_result.rc == 0"
-          - "yum_result.rc == 0"
               - "not yum_result.changed"
-          - "not yum_result|failed"
               - "rpm_result.stdout_lines[0].startswith('foo-1.1-1')"
               - "rpm_result.stdout_lines[1].startswith('foo-1.1-1')"
 
       - name: verify yum module outputs
         assert:
           that:
-          - "'changed' in yum_result"
               - "'msg' in yum_result"
               - "'rc' in yum_result"
               - "'results' in yum_result"
@@ -616,19 +489,20 @@
       - name: verify installation
         assert:
           that:
-          - "rpm_result.rc == 0"
-          - "yum_result.rc == 0"
               - "yum_result.changed"
-          - "not yum_result|failed"
               - "rpm_result.stdout_lines[0].startswith('foo-1.1-1')"
               - "rpm_result.stdout_lines[1].startswith('foo-1.1-1')"
 
       - name: verify yum module outputs
         assert:
           that:
-          - "'changed' in yum_result"
               - "'msg' in yum_result"
               - "'rc' in yum_result"
               - "'results' in yum_result"
       when: ansible_architecture == "x86_64"
     # ============================================================================
+  always:
+    - name: Clean up
+      yum:
+        name: foo
+        state: absent