From c8fbf0c17a45f0a4e6559d00ea11a03b77ddfa2c Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 15 May 2017 14:55:21 -0400
Subject: [PATCH] ansible: Remove tracecompass

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 .../ansible/roles/tracecompass/tasks/main.yml | 23 -------------------
 .../roles/tracecompass/tasks/setup-Debian.yml | 20 ----------------
 .../roles/tracecompass/tasks/setup-RedHat.yml |  6 -----
 .../roles/tracecompass/vars/Debian.yml        | 11 ---------
 .../roles/tracecompass/vars/RedHat.yml        |  3 ---
 automation/ansible/slave-all.yml              |  2 +-
 automation/ansible/slave-amd64.yml            |  1 -
 automation/ansible/slave-i386.yml             |  1 -
 automation/ansible/slave-standalone.yml       |  2 +-
 9 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 automation/ansible/roles/tracecompass/tasks/main.yml
 delete mode 100644 automation/ansible/roles/tracecompass/tasks/setup-Debian.yml
 delete mode 100644 automation/ansible/roles/tracecompass/tasks/setup-RedHat.yml
 delete mode 100644 automation/ansible/roles/tracecompass/vars/Debian.yml
 delete mode 100644 automation/ansible/roles/tracecompass/vars/RedHat.yml

diff --git a/automation/ansible/roles/tracecompass/tasks/main.yml b/automation/ansible/roles/tracecompass/tasks/main.yml
deleted file mode 100644
index 1c5a686..0000000
--- a/automation/ansible/roles/tracecompass/tasks/main.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# Include variables and define needed variables.
-- name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-
-- name: Define tracecompass_packages.
-  set_fact:
-    tracecompass_packages: "{{ __tracecompass_packages | list }}"
-  when: tracecompass_packages is not defined
-
-# Setup/install tasks.
-- include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
-
-- include: setup-Debian.yml
-  when: ansible_os_family == 'Debian'
-
-- name: checkout repo
-  git: repo=git://artifacts.internal.efficios.com/git/org.eclipse.tracecompass.git
-       dest=/home/jenkins/gitcache/org.eclipse.tracecompass.git
-       bare=yes
-  become: yes
-  become_user: jenkins
diff --git a/automation/ansible/roles/tracecompass/tasks/setup-Debian.yml b/automation/ansible/roles/tracecompass/tasks/setup-Debian.yml
deleted file mode 100644
index b62378d..0000000
--- a/automation/ansible/roles/tracecompass/tasks/setup-Debian.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: install pycurl package in order to use the apt_repository module
-  apt: pkg=python-pycurl state=present
-
-#- name: Add OpenJDK ppa.
-#  apt_repository: repo='ppa:openjdk-r/ppa'
-
-- name: Update apt cache.
-  apt: update_cache=yes cache_valid_time=86400
-
-- name: Ensure unity is installed.
-  apt: "name=unity install_recommends=no"
-
-#- name: Ensure lightdm service is stopped.
-#  service: name=lightdm state=stopped enabled=no
-
-- name: Ensure tracecompass build dependencies are installed.
-  apt: "name={{ item }} state=installed"
-  with_items: "{{ tracecompass_packages }}"
-
diff --git a/automation/ansible/roles/tracecompass/tasks/setup-RedHat.yml b/automation/ansible/roles/tracecompass/tasks/setup-RedHat.yml
deleted file mode 100644
index d4c7e85..0000000
--- a/automation/ansible/roles/tracecompass/tasks/setup-RedHat.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: Ensure tracecompass build dependencies are installed.
-  yum:
-    name: "{{ item }}"
-    state: installed
-  with_items: "{{ tracecompass_packages }}"
diff --git a/automation/ansible/roles/tracecompass/vars/Debian.yml b/automation/ansible/roles/tracecompass/vars/Debian.yml
deleted file mode 100644
index 7a881d4..0000000
--- a/automation/ansible/roles/tracecompass/vars/Debian.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-__tracecompass_packages:
-  - openjdk-8-jdk
-  - metacity
-  - xfonts-100dpi
-  - xfonts-75dpi
-  - xfonts-scalable
-  - xfonts-cyrillic
-  - xvfb
-  - x11-apps
-  - imagemagick
diff --git a/automation/ansible/roles/tracecompass/vars/RedHat.yml b/automation/ansible/roles/tracecompass/vars/RedHat.yml
deleted file mode 100644
index f2b9ed6..0000000
--- a/automation/ansible/roles/tracecompass/vars/RedHat.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# TODO
-__tracecompass_packages:
diff --git a/automation/ansible/slave-all.yml b/automation/ansible/slave-all.yml
index c246351..8b5638b 100644
--- a/automation/ansible/slave-all.yml
+++ b/automation/ansible/slave-all.yml
@@ -8,4 +8,4 @@
     - lttng-tools
     - lttng-modules
     - lttng-analyses
-    - tracecompass
+    - lttng-scope
diff --git a/automation/ansible/slave-amd64.yml b/automation/ansible/slave-amd64.yml
index 9cdf66f..05248d4 100644
--- a/automation/ansible/slave-amd64.yml
+++ b/automation/ansible/slave-amd64.yml
@@ -9,4 +9,3 @@
     - lttng-modules
     - lttng-analyses
     - lttng-scope
-    - tracecompass
diff --git a/automation/ansible/slave-i386.yml b/automation/ansible/slave-i386.yml
index 7c64495..f92df6c 100644
--- a/automation/ansible/slave-i386.yml
+++ b/automation/ansible/slave-i386.yml
@@ -9,4 +9,3 @@
     - lttng-modules
     - lttng-analyses
     - lttng-scope
-    - tracecompass
diff --git a/automation/ansible/slave-standalone.yml b/automation/ansible/slave-standalone.yml
index 8953c31..3f71b16 100644
--- a/automation/ansible/slave-standalone.yml
+++ b/automation/ansible/slave-standalone.yml
@@ -8,4 +8,4 @@
     - lttng-tools
     - lttng-modules
     - lttng-analyses
-    - tracecompass
+    - lttng-scope
-- 
2.34.1