From a31d78ee347f2a8417c41930a3d573f508993efb Mon Sep 17 00:00:00 2001
From: Loic Dachary <loic@dachary.org>
Date: Sat, 9 Apr 2016 08:56:17 +0200
Subject: [PATCH] testnodes: add ubuntu 16.04 xenial support

Signed-off-by: Loic Dachary <loic@dachary.org>
---
 roles/testnode/vars/ubuntu.yml       |  6 ------
 roles/testnode/vars/ubuntu_12.04.yml | 13 +++++++++++++
 roles/testnode/vars/ubuntu_14.yml    | 11 +++++++++++
 roles/testnode/vars/ubuntu_15.yml    | 13 +++++++++++++
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/roles/testnode/vars/ubuntu.yml b/roles/testnode/vars/ubuntu.yml
index f10bd22..52d3478 100644
--- a/roles/testnode/vars/ubuntu.yml
+++ b/roles/testnode/vars/ubuntu.yml
@@ -31,7 +31,6 @@ common_packages:
   ###
   # for setting BIOS settings
   ###
-  - libcrypto++9
   - libuuid1
   - btrfs-tools
   # for compiling helpers and such
@@ -44,8 +43,6 @@ common_packages:
   - bonnie++
   - valgrind
   - python-nose
-  - mpich2
-  - libmpich2-dev
   - ant
   ###
   # used by the xfstests tasks
@@ -99,11 +96,8 @@ common_packages:
   - nfs-kernel-server
 
 non_aarch64_common_packages:
-  - libssl0.9.8
   - smbios-utils
   - libfcgi
-  - iozone3
-  - dmapi
   - sysprof
 
 packages_to_upgrade:
diff --git a/roles/testnode/vars/ubuntu_12.04.yml b/roles/testnode/vars/ubuntu_12.04.yml
index 74727a4..0a410b0 100644
--- a/roles/testnode/vars/ubuntu_12.04.yml
+++ b/roles/testnode/vars/ubuntu_12.04.yml
@@ -5,6 +5,19 @@ packages:
   - ltp-kernel-test
   - libmpich2-3
   - kvm
+  ###
+  # for setting BIOS settings
+  ###
+  - libcrypto++9
+  ###
+  # used by workunits
+  - mpich2
+  - libmpich2-dev
+
+non_aarch64_packages:
+  - iozone3
+  - dmapi
+  - libssl0.9.8
 
 # on precise rpcbind does not provide a way to
 # be managed with upstart
diff --git a/roles/testnode/vars/ubuntu_14.yml b/roles/testnode/vars/ubuntu_14.yml
index 6450c14..29efb66 100644
--- a/roles/testnode/vars/ubuntu_14.yml
+++ b/roles/testnode/vars/ubuntu_14.yml
@@ -11,6 +11,17 @@ packages:
   - qemu-system-x86
 #  - blkin
   - lttng-tools
+  ###
+  # for setting BIOS settings
+  ###
+  - libcrypto++9
+  ###
+  # used by workunits
+  - mpich2
+  - libmpich2-dev
 
 non_aarch64_packages:
   - libgoogle-perftools4
+  - iozone3
+  - dmapi
+  - libssl0.9.8
diff --git a/roles/testnode/vars/ubuntu_15.yml b/roles/testnode/vars/ubuntu_15.yml
index ec0e8bd..4701704 100644
--- a/roles/testnode/vars/ubuntu_15.yml
+++ b/roles/testnode/vars/ubuntu_15.yml
@@ -10,3 +10,16 @@ packages:
 # FIXME: not available on vivid, figure out what's available and use it
 #  - blkin
   - lttng-tools
+  ###
+  # for setting BIOS settings
+  ###
+  - libcrypto++9
+  ###
+  # used by workunits
+  - mpich2
+  - libmpich2-dev
+
+non_aarch64_packages:
+  - iozone3
+  - dmapi
+  - libssl0.9.8
-- 
2.39.5