Revert "testnode: Add Apache Arrow repo"

This reverts commit 3f960fe1b6957bdfb551bd4e53ad275d0d446855.

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/roles/testnode/tasks/yum/gpg_keys.yml b/roles/testnode/tasks/yum/gpg_keys.yml
index 4455932f8921d08545e1181cb5e56e1f38ebadf4..5c216c984cdc0a8095509f52c1f89e1c706a3963 100644 (file)
--- a/roles/testnode/tasks/yum/gpg_keys.yml
+++ b/roles/testnode/tasks/yum/gpg_keys.yml
@@ -15,5 +15,4 @@
   with_items:
     - 'https://{{ key_host }}/keys/release.asc'
     - 'https://{{ key_host }}/keys/autobuild.asc'
-    - 'https://dist.apache.org/repos/dist/dev/arrow/KEYS'
   register: gpg_keys

diff --git a/roles/testnode/tasks/yum/repos.yml b/roles/testnode/tasks/yum/repos.yml
index da9877e8be9921aa802f83e03584a2c45d70b556..278d8d7f6ed0261d899bf7a61adc74d3b42429b8 100644 (file)
--- a/roles/testnode/tasks/yum/repos.yml
+++ b/roles/testnode/tasks/yum/repos.yml
@@ -39,6 +39,7 @@
     - copr_repos|length > 0
 
 - import_tasks: gpg_keys.yml
+  when: ansible_distribution == "Fedora"
   tags:
     - gpg-keys
 

diff --git a/roles/testnode/vars/centos_7.yml b/roles/testnode/vars/centos_7.yml
index dd4deaa89ac2c74f4301d981ac69026f525df8f1..e88310ca32a94a54bda11b4f73c4fbb47112d0e2 100644 (file)
--- a/roles/testnode/vars/centos_7.yml
+++ b/roles/testnode/vars/centos_7.yml
@@ -12,11 +12,6 @@ yum_repos:
     baseurl: "http://{{ mirror_host }}/lab-extras/centos7/"
     enabled: 1
     gpgcheck: 0
-  apache-arrow:
-    name: "Apache Arrow"
-    baseurl: "https://apache.jfrog.io/artifactory/arrow/centos/7/$basearch"
-    enabled: 1
-    gpgcheck: 1
 
 packages:
   - '@core'

diff --git a/roles/testnode/vars/centos_8.yml b/roles/testnode/vars/centos_8.yml
index 38fbf778752c83e02fb069aa12d52baef0c26904..f3cca0ec203cc24f3f72f4b0ecbb79e77c987054 100644 (file)
--- a/roles/testnode/vars/centos_8.yml
+++ b/roles/testnode/vars/centos_8.yml
@@ -7,11 +7,6 @@ common_yum_repos:
     baseurl: "http://{{ mirror_host }}/lab-extras/8/"
     enabled: 1
     gpgcheck: 0
-  apache-arrow:
-    name: "Apache Arrow"
-    baseurl: "https://apache.jfrog.io/artifactory/arrow/centos/8/$basearch"
-    enabled: 1
-    gpgcheck: 1
 
 # These will overwrite the repo files that come with a CentOS installation
 yum_repos:

diff --git a/roles/testnode/vars/redhat_7.yml b/roles/testnode/vars/redhat_7.yml
index a47771f1ab8162834398eaf5359b2d5e107a48c0..77741bd97ac2a1b228921fa82f173cc5cd3bc3fd 100644 (file)
--- a/roles/testnode/vars/redhat_7.yml
+++ b/roles/testnode/vars/redhat_7.yml
@@ -12,11 +12,6 @@ common_yum_repos:
     baseurl: "http://{{ mirror_host }}/lab-extras/rhel7/"
     enabled: 1
     gpgcheck: 0
-  apache-arrow:
-    name: "Apache Arrow"
-    baseurl: "https://apache.jfrog.io/artifactory/arrow/centos/7/$basearch"
-    enabled: 1
-    gpgcheck: 1
 
 packages:
   - '@core'

diff --git a/roles/testnode/vars/redhat_8.yml b/roles/testnode/vars/redhat_8.yml
index 7b79c328d35d0c41a51e07a1bf7a589e2d821ddf..b56784fc3741b44a3b59a5677774cd69ef1445ec 100644 (file)
--- a/roles/testnode/vars/redhat_8.yml
+++ b/roles/testnode/vars/redhat_8.yml
@@ -7,11 +7,6 @@ common_yum_repos:
     baseurl: "http://{{ mirror_host }}/lab-extras/8/"
     enabled: 1
     gpgcheck: 0
-  apache-arrow:
-    name: "Apache Arrow"
-    baseurl: "https://apache.jfrog.io/artifactory/arrow/centos/8/$basearch"
-    enabled: 1
-    gpgcheck: 1
 
 copr_repos:
   - ceph/python3-asyncssh