From 3ee07001b1b16ba174d66465bbe063e061a52e3f Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 3 Sep 2019 11:02:52 -0700
Subject: [PATCH] tests: Drop tito from the Dockerfile.test

It isn't needed to run the tests, and currently a package it depends on
(cheetah) is not working in rawhide.

Also bump glusterfs version to 7.*
---
 Dockerfile.test                                 | 1 -
 tests/pylorax/blueprints/example-glusterfs.toml | 4 ++--
 tests/pylorax/test_server.py                    | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Dockerfile.test b/Dockerfile.test
index 07de79b5..2ee121ff 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -27,7 +27,6 @@ RUN  dnf -y install \
   python3-pyvmomi \
   beakerlib \
   sudo \
-  tito \
   rsync \
   e2fsprogs \
   xz-lzma-compat \
diff --git a/tests/pylorax/blueprints/example-glusterfs.toml b/tests/pylorax/blueprints/example-glusterfs.toml
index 54d0d383..5fe4a20f 100644
--- a/tests/pylorax/blueprints/example-glusterfs.toml
+++ b/tests/pylorax/blueprints/example-glusterfs.toml
@@ -3,11 +3,11 @@ description = "An example GlusterFS server with samba"
 
 [[modules]]
 name = "glusterfs"
-version = "6.*"
+version = "7.*"
 
 [[modules]]
 name = "glusterfs-cli"
-version = "6.*"
+version = "7.*"
 
 [[packages]]
 name = "samba"
diff --git a/tests/pylorax/test_server.py b/tests/pylorax/test_server.py
index 303a3ca9..91d6237a 100644
--- a/tests/pylorax/test_server.py
+++ b/tests/pylorax/test_server.py
@@ -52,8 +52,8 @@ OPENSSH_GLOB = {"name":"openssh-server", "version": "8.*"}
 RSYNC_GLOB = {"name": "rsync", "version": "3.1.*"}
 SAMBA_GLOB = {"name": "samba", "version": "4.*.*"}
 TMUX_GLOB = {"name": "tmux", "version": "2.9a"}
-GLUSTERFS_GLOB = {"name": "glusterfs", "version": "6.*"}
-GLUSTERFSCLI_GLOB = {"name": "glusterfs-cli", "version": "6.*"}
+GLUSTERFS_GLOB = {"name": "glusterfs", "version": "7.*"}
+GLUSTERFSCLI_GLOB = {"name": "glusterfs-cli", "version": "7.*"}
 
 
 def get_system_repo():