From: Andrew Grimberg Date: Tue, 20 Aug 2019 18:33:06 +0000 (-0700) Subject: Revert "Add packagecloud deps to ansible role" X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=1c58d7e89b1a8859bc8e877f36ba0c6c86aaae1c;p=ansible%2Froles%2Flf-recommended-tools.git Revert "Add packagecloud deps to ansible role" This reverts commit 07b3e6afe811bf7d0ca7d50946a05c8b45906371. Installation of package_cloud is not working as expected Issue: RELENG-2240 Change-Id: I94b7cabdae6e63995fadaa65bac4446425c90c7d Signed-off-by: Andrew Grimberg --- diff --git a/tasks/main.yml b/tasks/main.yml index 64f2fac..36c6844 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -21,13 +21,6 @@ when: ansible_os_family == 'RedHat' become: true -- name: Install list of gem packages - gem: name={{ item }} state=latest - with_items: - - rake - - package_cloud - become: true - - name: Install PlantUML block: - name: Create /opt/plantuml install directory diff --git a/tasks/pkg-names-Debian.yaml b/tasks/pkg-names-Debian.yaml index 6f404fb..88266b8 100644 --- a/tasks/pkg-names-Debian.yaml +++ b/tasks/pkg-names-Debian.yaml @@ -1,9 +1,7 @@ --- -pkg_build_essential: build-essential pkg_gnu_parallel: parallel pkg_netcat: netcat pkg_perl_digest_sha: libdigest-sha-perl pkg_perl_extutils_makemaker: libextutils-makemaker-cpanfile-perl pkg_perl_xml_xpath: libxml-xpath-perl -pkg_ruby_dev: ruby-dev pkg_xz: xz-utils diff --git a/tasks/pkg-names-RedHat.yaml b/tasks/pkg-names-RedHat.yaml index 060e518..c69f6a1 100644 --- a/tasks/pkg-names-RedHat.yaml +++ b/tasks/pkg-names-RedHat.yaml @@ -1,9 +1,7 @@ --- -pkg_development_tools: "@Development tools" pkg_gnu_parallel: http://ftp.riken.jp/Linux/cern/centos/7/cern/x86_64/Packages/parallel-20150522-1.el7.cern.noarch.rpm pkg_netcat: nc pkg_perl_digest_sha: perl-Digest-SHA pkg_perl_extutils_makemaker: perl-ExtUtils-MakeMaker pkg_perl_xml_xpath: perl-XML-XPath -pkg_ruby_devel: ruby-devel pkg_xz: xz diff --git a/vars/Debian.yaml b/vars/Debian.yaml index e4e7aa2..a7a34b6 100644 --- a/vars/Debian.yaml +++ b/vars/Debian.yaml @@ -1,10 +1,8 @@ --- lf_recommended_tools_packages_distro: - - build-essential + - parallel + - netcat - libdigest-sha-perl - libextutils-makemaker-cpanfile-perl - libxml-xpath-perl - - netcat - - parallel - - ruby-dev - xz-utils diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml index 73e9b93..50f9eb3 100644 --- a/vars/RedHat.yaml +++ b/vars/RedHat.yaml @@ -1,11 +1,9 @@ --- lf_recommended_tools_packages_distro: - - "@Development tools" - - http://ftp.riken.jp/Linux/cern/centos/7/cern/x86_64/Packages/parallel-20150522-1.el7.cern.noarch.rpm - fedora-packager + - http://ftp.riken.jp/Linux/cern/centos/7/cern/x86_64/Packages/parallel-20150522-1.el7.cern.noarch.rpm - nc - perl-Digest-SHA - perl-ExtUtils-MakeMaker - perl-XML-XPath - - ruby-devel - xz