From 3457f584e6d9048b01c1dad4c5f079d6812f2cd4 Mon Sep 17 00:00:00 2001
From: David Galloway <dgallowa@redhat.com>
Date: Fri, 24 Apr 2020 12:26:48 -0400
Subject: [PATCH] testnode: Shuffle package lists around to support Ubuntu
 20.04

It appears Focal doesn't come with python2 anything so the python2 packages are no longer "common" across all Ubuntu distros.

I moved them out of `common_packages` and added them to the appropriate package lists for each distro_majorversion.yml back to Xenial.

Signed-off-by: David Galloway <dgallowa@redhat.com>
---
 roles/testnode/vars/ubuntu.yml    |  7 -------
 roles/testnode/vars/ubuntu_16.yml |  7 +++++++
 roles/testnode/vars/ubuntu_18.yml |  7 +++++++
 roles/testnode/vars/ubuntu_20.yml | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 roles/testnode/vars/ubuntu_20.yml

diff --git a/roles/testnode/vars/ubuntu.yml b/roles/testnode/vars/ubuntu.yml
index 833aca9..e864b91 100644
--- a/roles/testnode/vars/ubuntu.yml
+++ b/roles/testnode/vars/ubuntu.yml
@@ -4,7 +4,6 @@ common_packages:
   - libfcgi0ldbl
   ###
   # for s3 tests
-  - python-virtualenv
   - python-dev
   - libev-dev
   ###
@@ -16,8 +15,6 @@ common_packages:
   - build-essential
   - sysstat
   - gdb
-  - python-configobj
-  - python-gevent
   # for running ceph
   - libedit2
   - cryptsetup-bin
@@ -28,7 +25,6 @@ common_packages:
   # for setting BIOS settings
   ###
   - libuuid1
-  - btrfs-tools
   # for compiling helpers and such
   - libatomic-ops-dev
   ###
@@ -38,7 +34,6 @@ common_packages:
   - dbench
   - bonnie++
   - valgrind
-  - python-nose
   - ant
   ###
   # used by the xfstests tasks
@@ -61,8 +56,6 @@ common_packages:
   - collectl
   # for blktrace and seekwatcher
   - blktrace
-  - python-numpy
-  - python-matplotlib
   ###
   # qemu
   - genisoimage
diff --git a/roles/testnode/vars/ubuntu_16.yml b/roles/testnode/vars/ubuntu_16.yml
index 0b5d4c2..0841413 100644
--- a/roles/testnode/vars/ubuntu_16.yml
+++ b/roles/testnode/vars/ubuntu_16.yml
@@ -7,6 +7,13 @@ packages:
   - libboost-thread1.58.0
   - mpich
   - qemu-system-x86
+  - python-virtualenv
+  - python-configobj
+  - python-gevent
+  - python-numpy
+  - python-matplotlib
+  - python-nose
+  - btrfs-tools
 #  - blkin
   - lttng-tools
   ###
diff --git a/roles/testnode/vars/ubuntu_18.yml b/roles/testnode/vars/ubuntu_18.yml
index e704031..b210634 100644
--- a/roles/testnode/vars/ubuntu_18.yml
+++ b/roles/testnode/vars/ubuntu_18.yml
@@ -2,6 +2,13 @@
 packages:
   - mpich
   - qemu-system-x86
+  - python-virtualenv
+  - python-configobj
+  - python-gevent
+  - python-numpy
+  - python-matplotlib
+  - python-nose
+  - btrfs-tools
 #  - blkin
   - lttng-tools
   # for building xfstests #18067
diff --git a/roles/testnode/vars/ubuntu_20.yml b/roles/testnode/vars/ubuntu_20.yml
new file mode 100644
index 0000000..19d1996
--- /dev/null
+++ b/roles/testnode/vars/ubuntu_20.yml
@@ -0,0 +1,25 @@
+---
+packages:
+  - mpich
+  - qemu-system-x86
+#  - blkin
+  - lttng-tools
+  # for building xfstests #18067
+  - libtool-bin
+  # for ceph-daemon (no podman on ubuntu/debian, yet)
+  - docker.io
+  # qa/workunits/rbd/test_librbd_python.sh
+  - python3-nose
+  # python3 version of deps
+  - python3-virtualenv
+  - python3-configobj
+  - python3-gevent
+  - python3-numpy
+  - python3-matplotlib
+  - python3-setuptools
+
+non_aarch64_packages:
+  - libgoogle-perftools4
+  - iozone3
+
+non_aarch64_packages_to_upgrade: []
-- 
2.39.5