Merge "ansible: lxd: Disable secureboot on the ci-rootnode profile"

diff --git a/automation/ansible/roles/lttng-scope/tasks/main.yml b/automation/ansible/roles/lttng-scope/tasks/main.yml
deleted file mode 100644 (file)
index b45a1b6..0000000
--- a/automation/ansible/roles/lttng-scope/tasks/main.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-# Include variables and define needed variables.
-- name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-
-- name: Define lttng_scope_packages.
-  set_fact:
-    lttng_scope_packages: "{{ __lttng_scope_packages | list }}"
-  when: lttng_scope_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'

diff --git a/automation/ansible/roles/lttng-scope/tasks/setup-Debian.yml b/automation/ansible/roles/lttng-scope/tasks/setup-Debian.yml
deleted file mode 100644 (file)
index 3352c0a..0000000
--- a/automation/ansible/roles/lttng-scope/tasks/setup-Debian.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- 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 lttng_scope build dependencies are installed.
-  apt: "name={{ lttng_scope_packages }} state=present"
-

diff --git a/automation/ansible/roles/lttng-scope/tasks/setup-RedHat.yml b/automation/ansible/roles/lttng-scope/tasks/setup-RedHat.yml
deleted file mode 100644 (file)
index 5c539d5..0000000
--- a/automation/ansible/roles/lttng-scope/tasks/setup-RedHat.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: Ensure lttng_scope build dependencies are installed.
-  dnf:
-    name: "{{ lttng_scope_packages }}"
-    state: installed

diff --git a/automation/ansible/roles/lttng-scope/vars/Debian.yml b/automation/ansible/roles/lttng-scope/vars/Debian.yml
deleted file mode 100644 (file)
index cc01bab..0000000
--- a/automation/ansible/roles/lttng-scope/vars/Debian.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-__lttng_scope_packages:
-  - openjdk-8-jdk
-  - openjfx
-  - metacity
-  - xfonts-100dpi
-  - xfonts-75dpi
-  - xfonts-scalable
-  - xfonts-cyrillic
-  - xvfb
-  - x11-apps
-  - imagemagick

diff --git a/automation/ansible/roles/lttng-scope/vars/RedHat.yml b/automation/ansible/roles/lttng-scope/vars/RedHat.yml
deleted file mode 100644 (file)
index 9ef6947..0000000
--- a/automation/ansible/roles/lttng-scope/vars/RedHat.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# TODO
-__lttng_scope_packages:

diff --git a/automation/ansible/roles/lttng-scope/vars/Suse.yml b/automation/ansible/roles/lttng-scope/vars/Suse.yml
deleted file mode 100644 (file)
index cc01bab..0000000
--- a/automation/ansible/roles/lttng-scope/vars/Suse.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-__lttng_scope_packages:
-  - openjdk-8-jdk
-  - openjfx
-  - metacity
-  - xfonts-100dpi
-  - xfonts-75dpi
-  - xfonts-scalable
-  - xfonts-cyrillic
-  - xvfb
-  - x11-apps
-  - imagemagick

diff --git a/scripts/common/coverity.sh b/scripts/common/coverity.sh
index d596599aba4994ff2b0fe40f06db23125889e396..80abeddf6a6cc40e63ede582055775086ce812b7 100755 (executable)
--- a/scripts/common/coverity.sh
+++ b/scripts/common/coverity.sh
@@ -78,11 +78,6 @@ lttng-ust)
     BUILD_TYPE="autotools"
     export CLASSPATH="/usr/share/java/log4j-api.jar:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar"
     ;;
-lttng-scope|ctf-java|libdelorean-java|jabberwocky)
-    CONF_OPTS=()
-    BUILD_TYPE="maven"
-    MVN_BIN="$HOME/tools/hudson.tasks.Maven_MavenInstallation/default/bin/mvn"
-    ;;
 *)
     echo "Generic project, no configure options."
     CONF_OPTS=()