From 57266d248f5c5e2b7cd498de4d2d0262134113a3 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 3 Feb 2022 14:30:22 -0500 Subject: [PATCH] Revert "testnode: Add Apache Arrow repo" This reverts commit 3f960fe1b6957bdfb551bd4e53ad275d0d446855. Signed-off-by: Casey Bodley --- roles/testnode/tasks/yum/gpg_keys.yml | 1 - roles/testnode/tasks/yum/repos.yml | 1 + roles/testnode/vars/centos_7.yml | 5 ----- roles/testnode/vars/centos_8.yml | 5 ----- roles/testnode/vars/redhat_7.yml | 5 ----- roles/testnode/vars/redhat_8.yml | 5 ----- 6 files changed, 1 insertion(+), 21 deletions(-) diff --git a/roles/testnode/tasks/yum/gpg_keys.yml b/roles/testnode/tasks/yum/gpg_keys.yml index 4455932f..5c216c98 100644 --- 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 da9877e8..278d8d7f 100644 --- 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 dd4deaa8..e88310ca 100644 --- 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 38fbf778..f3cca0ec 100644 --- 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 a47771f1..77741bd9 100644 --- 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 7b79c328..b56784fc 100644 --- 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 -- 2.47.3