From 72758204f8f97cacaf1df8dfb029a4b988d8bbc0 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Tue, 5 Jun 2018 16:18:08 -0700
Subject: [PATCH] .travis.yml: One stage for integration tests (userns and
 otherwise)

The separate stage is from 4964bd9d (test: run integration tests with
userNS enabled, 2018-05-24, #1578), but using a separate stage meant
that Travis serialized these slow (20+ minute) stages.  By flattening
into one stage we can run these in parallel (modulo Travis worker
availability) and get the Travis results earlier.

I've shifted the TEST_USERNS declaration into an env property so it
shows up in the Travis UI (e.g. [1]).

[1]: https://travis-ci.org/kubernetes-incubator/cri-o/builds/386122146

Signed-off-by: W. Trevor King <wking@tremily.us>
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9ec493558e6..0edd38ecfc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,9 +59,9 @@ jobs:
       script:
         - make integration
       go: "1.10.x"
-    - stage: Integration Test with User namespaces enabled
-      script:
-        - TEST_USERNS=1 make integration
+    - script:
+        - make integration
+      env: TEST_USERNS=1
       go: "1.10.x"
   allow_failures:
     - os: osx