From 1e4cdca3390906a7bc4b27af9afa62002d20880c Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Tue, 9 Apr 2019 08:34:18 -0700
Subject: [PATCH] Fix ostestr invocation

More-recent versions of stestr are rather picky about wanting an integer
for concurrency [1], but ostestr prior to [2] defaults it to None. As a
result, all our func tests would fail with:

   TypeError: int() argument must be a string or a number, not 'NoneType'

Also, move the rolling upgrade job to non-voting since it's going to
pull in the old version but try to run with new deps.

[1] https://github.com/mtreinish/stestr/commit/c93bc81
[2] https://review.openstack.org/#/c/651275/

Change-Id: Icba6c46bcff0e0516107e0f6742d32c92488ae20
---
 .functests | 2 +-
 .zuul.yaml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.functests b/.functests
index bf920798ca..ad58ec7133 100755
--- a/.functests
+++ b/.functests
@@ -7,7 +7,7 @@ SRC_DIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))")
 
 cd ${SRC_DIR} > /dev/null
 export TESTS_DIR=${SRC_DIR}/test/functional
-ARGS="--serial ${@:-"--pretty"}"
+ARGS="--concurrency 1 ${@:-"--pretty"}"
 ostestr $ARGS
 rvalue=$?
 cd -  > /dev/null
diff --git a/.zuul.yaml b/.zuul.yaml
index 47e4f9ea34..5e56ebb584 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -401,6 +401,7 @@
               - ^(api-ref|doc|releasenotes)/.*$
               - ^test/probe/.*$
               - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
+            voting: false
     gate:
       jobs:
         # For gate jobs, err towards running more jobs (so, generally avoid