From 1678577681566607d3dd8a0dffec6d044b1789a4 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Mon, 31 Aug 2020 18:24:00 -0500 Subject: [PATCH] [tests] fix fallout from dnf gpg fix (#71552) Change: - Missed needed gpg ignores Test Plan: - CI - ci_complete Signed-off-by: Rick Elrod --- test/integration/targets/setup_epel/tasks/main.yml | 1 + test/integration/targets/yum/tasks/repo.yml | 10 ++++++++++ test/integration/targets/yum/tasks/yum.yml | 3 +++ 3 files changed, 14 insertions(+) diff --git a/test/integration/targets/setup_epel/tasks/main.yml b/test/integration/targets/setup_epel/tasks/main.yml index 668603787f0..c279810e6ce 100644 --- a/test/integration/targets/setup_epel/tasks/main.yml +++ b/test/integration/targets/setup_epel/tasks/main.yml @@ -1,4 +1,5 @@ - name: Install EPEL yum: name: https://s3.amazonaws.com/ansible-ci-files/test/integration/targets/setup_epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm + disable_gpg_check: true when: ansible_facts.distribution in ['RedHat', 'CentOS'] diff --git a/test/integration/targets/yum/tasks/repo.yml b/test/integration/targets/yum/tasks/repo.yml index 630659d4a92..c1a7a016543 100644 --- a/test/integration/targets/yum/tasks/repo.yml +++ b/test/integration/targets/yum/tasks/repo.yml @@ -152,6 +152,7 @@ yum: name: "{{ repodir }}/dinginessentail-1.0-1.{{ ansible_architecture }}.rpm" state: present + disable_gpg_check: true register: yum_result - name: Check dinginessentail with rpm @@ -175,6 +176,7 @@ yum: name: "{{ repodir }}/dinginessentail-1.0-1.{{ ansible_architecture }}.rpm" state: present + disable_gpg_check: true register: yum_result - name: Check dinginessentail with rpm @@ -198,6 +200,7 @@ yum: name: "{{ repodir }}/dinginessentail-1.0-2.{{ ansible_architecture }}.rpm" state: present + disable_gpg_check: true register: yum_result - name: Check dinginessentail with rpm @@ -221,6 +224,7 @@ yum: name: "{{ repodir }}/dinginessentail-1.0-2.{{ ansible_architecture }}.rpm" state: present + disable_gpg_check: true register: yum_result - name: Check dinginessentail with rpm @@ -358,6 +362,7 @@ name: "{{ repodir }}/dinginessentail-1.0-1.{{ ansible_architecture }}.rpm" state: present allow_downgrade: yes + disable_gpg_check: yes register: yum_result - name: Check dinginessentail with rpm @@ -387,6 +392,7 @@ yum: name: "{{ pkgs }}" state: present + disable_gpg_check: true vars: pkgs: - "{{ repodir }}/dinginessentail-1.1-1.x86_64.rpm" @@ -427,6 +433,7 @@ yum: name: "{{ pkgs }}" state: present + disable_gpg_check: true vars: pkgs: - "{{ repodir }}/dinginessentail-1.0-1.x86_64.rpm" @@ -436,6 +443,7 @@ yum: name: "{{ repodir }}/dinginessentail-1.1-1.x86_64.rpm,{{ repodir_i686 }}/dinginessentail-1.1-1.i686.rpm" state: present + disable_gpg_check: yes register: yum_result - name: check dinginessentail with rpm @@ -471,6 +479,7 @@ yum: name: "1:dinginessentail-1.0-2.{{ ansible_architecture }}" state: present + disable_gpg_check: true register: yum_result - name: Check dinginessentail with rpm @@ -511,6 +520,7 @@ yum: name: "dinginessentail-1.0-2.{{ ansible_architecture }}" state: present + disable_gpg_check: true register: yum_result - name: Check dinginessentail with rpm diff --git a/test/integration/targets/yum/tasks/yum.yml b/test/integration/targets/yum/tasks/yum.yml index e4cfbc65e1f..2431e9aa5c7 100644 --- a/test/integration/targets/yum/tasks/yum.yml +++ b/test/integration/targets/yum/tasks/yum.yml @@ -638,6 +638,7 @@ yum: name: "/tmp/{{ pkg_name }}.rpm" state: present + disable_gpg_check: true register: yum_result - name: verify installation @@ -683,6 +684,7 @@ yum: name: "{{ pkg_url }}" state: present + disable_gpg_check: true register: yum_result - name: verify installation @@ -846,6 +848,7 @@ name: - https://ansible-ci-files.s3.amazonaws.com/test/integration/targets/yum/test-package-that-provides-toaster-1.3.3.7-1.el7.noarch.rpm - https://ansible-ci-files.s3.amazonaws.com/test/integration/targets/yum/toaster-1.2.3.4-1.el7.noarch.rpm + disable_gpg_check: true register: install - name: Remove toaster