apt: disable ubuntu repos to not change test env

(cherry picked from commit 0c86df33a4)

test/integration/targets/apt/defaults/main.yml

@@ -1,2 +1 @@
 apt_foreign_arch: i386
-hello_old_version: 2.6-1

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

@@ -16,16 +16,6 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 - block:
-  - block:
-      - include: 'repo.yml'
-    always:
-      - apt_repository:
-          repo: "deb file:{{ repodir }} ./"
-          state: absent
-      - file:
-          name: "{{ repodir }}"
-          state: absent
-
   - include: 'apt.yml'
 
   - include: 'apt-multiarch.yml'
@@ -34,44 +24,15 @@
 
   - include: 'apt-builddep.yml'
 
-  - include: "upgrade.yml aptitude_present={{ True | bool }} upgrade_type=dist force_apt_get={{ False | bool }}"
-
-  - name: Check if aptitude is installed
-    command: dpkg-query --show --showformat='${db:Status-Abbrev}' aptitude
-    register: aptitude_status
-
-  - name: Remove aptitude, if installed, to test fall-back to apt-get
-    apt:
-      pkg: aptitude
+  - block:
+      - include: 'repo.yml'
+    always:
+      - apt_repository:
+          repo: "deb file:{{ repodir }} ./"
           state: absent
-    when:
-      - aptitude_status.stdout.find('ii') != -1
-
-  - include: "upgrade.yml aptitude_present={{ False | bool }} upgrade_type={{ item.upgrade_type }} force_apt_get={{ item.force_apt_get }}"
-    with_items:
-      - { upgrade_type: safe, force_apt_get: False }
-      - { upgrade_type: full, force_apt_get: False }
-      - { upgrade_type: safe, force_apt_get: True }
-      - { upgrade_type: full, force_apt_get: True }
-
-  - name: (Re-)Install aptitude, run same tests again
-    apt:
-      pkg: aptitude
-      state: present
-
-  - include: "upgrade.yml aptitude_present={{ True | bool }} upgrade_type={{ item.upgrade_type }} force_apt_get={{ item.force_apt_get }}"
-    with_items:
-      - { upgrade_type: safe, force_apt_get: False }
-      - { upgrade_type: full, force_apt_get: False }
-      - { upgrade_type: safe, force_apt_get: True }
-      - { upgrade_type: full, force_apt_get: True }
-
-  - name: Remove aptitude if not originally present
-    apt:
-      pkg: aptitude
+      - file:
+          name: "{{ repodir }}"
           state: absent
-    when:
-      - aptitude_status.stdout.find('ii') == -1
 
   when:
     - ansible_distribution in ('Ubuntu', 'Debian')

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

@@ -33,12 +33,64 @@
         - "apt_result is success"
         - "dpkg_result is success"
         - "'1.0.1' in dpkg_result.stdout"
+  always:
+    - name: Clean up
+      apt:
+        name: foo
+        state: absent
+        allow_unauthenticated: yes
 
-  # https://github.com/ansible/ansible/issues/35900
+
+# https://github.com/ansible/ansible/issues/30638
+- block:
+  - name: Fail to install foo=1.0.1 since foo is not installed and only_upgrade is set
+    apt:
+      name: foo=1.0.1
+      state: installed
+      only_upgrade: yes
+      allow_unauthenticated: yes
+    ignore_errors: yes
+    register: apt_result
+
+  - name: Check that foo was not upgraded
+    assert:
+      that:
+        - "apt_result is not changed"
+
+  - apt:
+      name: foo=1.0.0
+      allow_unauthenticated: yes
+
+  - name: Upgrade foo to 1.0.1
+    apt:
+      name: foo=1.0.1
+      state: installed
+      only_upgrade: yes
+      allow_unauthenticated: yes
+    register: apt_result
+
+  - name: Check install with dpkg
+    shell: dpkg-query -l foo
+    register: dpkg_result
+
+  - name: Check if install was successful
+    assert:
+      that:
+        - "apt_result is success"
+        - "dpkg_result is success"
+        - "'1.0.1' in dpkg_result.stdout"
+  always:
     - name: Clean up
       apt:
         name: foo
         state: absent
+        allow_unauthenticated: yes
+
+
+# https://github.com/ansible/ansible/issues/35900
+- block:
+  - name: Disable ubuntu repos so system packages are not upgraded and do not change testing env
+    command: mv /etc/apt/sources.list /etc/apt/sources.list.backup
 
   - name: Install foobar, installs foo as a dependency
     apt:
@@ -61,14 +113,21 @@
       that:
         - "dpkg_result is failed"
 
-  # https://github.com/ansible/ansible/issues/26298
+  always:
     - name: Clean up
       apt:
-      name: "{{ item }}"
+        pkg: foo,foobar
         state: absent
-    with_items:
-      - foo
-      - foobar
+        autoclean: yes
+
+    - name: Restore ubuntu repos
+      command: mv /etc/apt/sources.list.backup /etc/apt/sources.list
+
+
+# https://github.com/ansible/ansible/issues/26298
+- block:
+  - name: Disable ubuntu repos so system packages are not upgraded and do not change testing env
+    command: mv /etc/apt/sources.list /etc/apt/sources.list.backup
 
   - name: Install foobar, installs foo as a dependency
     apt:
@@ -141,50 +200,54 @@
       that:
         - "autoclean_result is not changed"
 
-  # https://github.com/ansible/ansible/issues/30638
-  - name: Fail to install foo=1.0.1 since foo is not installed and only_upgrade is set
+  always:
+    - name: Clean up
       apt:
-      name: foo=1.0.1
-      state: installed
-      only_upgrade: yes
-      allow_unauthenticated: yes
-    ignore_errors: yes
-    register: apt_result
+        pkg: foo,foobar
+        state: absent
+        autoclean: yes
 
-  - name: Check that foo was not upgraded
-    assert:
-      that:
-        - "apt_result is not changed"
+    - name: Restore ubuntu repos
+      command: mv /etc/apt/sources.list.backup /etc/apt/sources.list
 
-  - apt:
-      name: foo=1.0.0
-      allow_unauthenticated: yes
 
-  - name: Upgrade foo to 1.0.1
+- name: Upgrades
+  block:
+    - include: "upgrade.yml aptitude_present={{ True | bool }} upgrade_type=dist force_apt_get={{ False | bool }}"
+
+    - name: Check if aptitude is installed
+      command: dpkg-query --show --showformat='${db:Status-Abbrev}' aptitude
+      register: aptitude_status
+
+    - name: Remove aptitude, if installed, to test fall-back to apt-get
       apt:
-      name: foo=1.0.1
-      state: installed
-      only_upgrade: yes
-      allow_unauthenticated: yes
-    register: apt_result
+        pkg: aptitude
+        state: absent
+      when:
+        - aptitude_status.stdout.find('ii') != -1
 
-  - name: Check install with dpkg
-    shell: dpkg-query -l foo
-    register: dpkg_result
+    - include: "upgrade.yml aptitude_present={{ False | bool }} upgrade_type={{ item.upgrade_type }} force_apt_get={{ item.force_apt_get }}"
+      with_items:
+        - { upgrade_type: safe, force_apt_get: False }
+        - { upgrade_type: full, force_apt_get: False }
+        - { upgrade_type: safe, force_apt_get: True }
+        - { upgrade_type: full, force_apt_get: True }
 
-  - name: Check if install was successful
-    assert:
-      that:
-        - "apt_result is success"
-        - "dpkg_result is success"
-        - "'1.0.1' in dpkg_result.stdout"
+    - name: (Re-)Install aptitude, run same tests again
+      apt:
+        pkg: aptitude
+        state: present
 
-  always:
-    - name: Clean up
+    - include: "upgrade.yml aptitude_present={{ True | bool }} upgrade_type={{ item.upgrade_type }} force_apt_get={{ item.force_apt_get }}"
+      with_items:
+        - { upgrade_type: safe, force_apt_get: False }
+        - { upgrade_type: full, force_apt_get: False }
+        - { upgrade_type: safe, force_apt_get: True }
+        - { upgrade_type: full, force_apt_get: True }
+
+    - name: Remove aptitude if not originally present
       apt:
-        name: "{{ item }}"
+        pkg: aptitude
         state: absent
-        allow_unauthenticated: yes
-      with_items:
-        - foo
-        - foobar
+      when:
+        - aptitude_status.stdout.find('ii') == -1

test/integration/targets/apt/tasks/upgrade.yml

@@ -1,26 +1,32 @@
----
-#### Tests for upgrade/download functions in modules/packaging/os/apt.py ####
-- name: download and install old version of hello
-  apt: "deb=https://s3.amazonaws.com/ansible-ci-files/test/integration/targets/apt/hello_{{ hello_old_version }}_amd64.deb"
+- block:
+  - name: Disable ubuntu repos so system packages are not upgraded and do not change testing env
+    command: mv /etc/apt/sources.list /etc/apt/sources.list.backup
 
-- name: check hello version
-  shell: dpkg -s hello | grep Version | awk '{print $2}'
-  register: hello_version
+  - name: install foo-1.0.0
+    apt:
+      name: foo=1.0.0
+      state: present
+      allow_unauthenticated: yes
+
+  - name: check foo version
+    shell: dpkg -s foo | grep Version | awk '{print $2}'
+    register: foo_version
 
-- name: ensure the correct version of hello has been installed
+  - name: ensure the correct version of foo has been installed
     assert:
       that:
-      - "{{ hello_version.stdout }}=={{ hello_old_version }}"
+        - "'1.0.0' in foo_version.stdout"
 
   - name: "(upgrade type: {{upgrade_type}}) upgrade packages to latest version, force_apt_get: {{force_apt_get}}"
     apt:
       upgrade: "{{ upgrade_type }}"
       force_apt_get: "{{ force_apt_get }}"
+      force: yes
     register: upgrade_result
 
-- name: check hello version
-  shell: dpkg -s hello | grep Version | awk '{print $2}'
-  register: hello_version
+  - name: check foo version
+    shell: dpkg -s foo | grep Version | awk '{print $2}'
+    register: foo_version
 
   - name: check that warning is not given when force_apt_get set
     assert:
@@ -40,13 +46,14 @@
   - name: check that old version upgraded correctly
     assert:
       that:
-      - "{{ hello_version.stdout }}!={{ hello_old_version }}"
-      - "{{ hello_version.changed }}"
+        - "'1.0.0' not in foo_version.stdout"
+        - "{{ foo_version.changed }}"
 
   - name: "(upgrade type: {{upgrade_type}}) upgrade packages to latest version (Idempotant)"
     apt:
       upgrade: "{{ upgrade_type }}"
       force_apt_get: "{{ force_apt_get }}"
+      force: yes
     register: second_upgrade_result
 
   - name: check that nothing has changed (Idempotant)
@@ -54,8 +61,12 @@
       that:
         - "second_upgrade_result.changed == false"
 
-- name: remove hello
+  always:
+    - name: Clean up
       apt:
-    pkg: hello
+        pkg: foo,foobar
         state: absent
         autoclean: yes
+
+    - name: Restore ubuntu repos
+      command: mv /etc/apt/sources.list.backup /etc/apt/sources.list