From 46b6bf1a2efd0acd8b9b58f23e111c51552d82eb Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dcallagh@redhat.com>
Date: Jul 03 2018 02:45:02 +0000
Subject: [PATCH 1/2] Jenkinsfile: actually it's 5 pods, not 6


I miscounted... Turns out we only have 1 replica of the waiverdb app not
2, so it's only 5 altogether.

---

diff --git a/Jenkinsfile b/Jenkinsfile
index 7dadc5a..7b57e16 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -174,7 +174,7 @@ node('fedora-27') {
                         echo "Waiting for pods with label environment=${environment_label} to become Ready"
                         def pods = openshift.selector('pods', ['environment': environment_label])
                         timeout(10) {
-                            pods.untilEach(6) {
+                            pods.untilEach(5) {
                                 def conds = it.object().status.conditions
                                 for (int i = 0; i < conds.size(); i++) {
                                     if (conds[i].type == 'Ready' && conds[i].status == 'True') {

From ad640672d1e96d7cd03b332ba25de2ab7d7d4d28 Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dcallagh@redhat.com>
Date: Jul 03 2018 03:51:36 +0000
Subject: [PATCH 2/2] tests: greenwave source path is always .


This would break if you didn't have greenwave checked out into
a directory named 'greenwave' because it was expecting to find the
sources at '../greenwave'. We can always just use '.' instead.

---

diff --git a/functional-tests/conftest.py b/functional-tests/conftest.py
index 3e258cf..47150be 100644
--- a/functional-tests/conftest.py
+++ b/functional-tests/conftest.py
@@ -221,6 +221,7 @@ def greenwave_server(tmpdir_factory, resultsdb_server, waiverdb_server, bodhi):
     with server_subprocess(
             name='greenwave',
             port=5005,
+            source_path='.',
             settings_content=settings_content,
             start_server_arguments=start_server_arguments,
             tmpdir_factory=tmpdir_factory) as url: