From 106ef6ae69664d59c148d3d411d774b7b9ae988b Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.de>
Date: Mon, 6 May 2019 22:52:22 +0200
Subject: [PATCH] Run flake8 from Tumbleweed

---
 .travis.yml                           |  9 +--------
 dist/ci/docker-compose-flaker.sh      |  7 +++++++
 dist/ci/docker-compose.yml            | 12 +++++++++---
 dist/ci/testenv-tumbleweed/Dockerfile |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100755 dist/ci/docker-compose-flaker.sh

diff --git a/.travis.yml b/.travis.yml
index 611e6d7c..1a7cb2ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,19 +14,12 @@ env:
 
 matrix:
   include:
-    - env: TEST_SUITE=flake8
-      language: python
-      python: 3.6
-      install:
-        - pip install flake8
-      script:
-        - flake8
-        - ./dist/ci/flake-extra
     - env: TEST_SUITE=nosetests
       language: bash
       services:
         - docker
       script:
+        - docker-compose -f dist/ci/docker-compose.yml run flaker
         - for var in TRAVIS_BRANCH TRAVIS_JOB_ID TRAVIS_PULL_REQUEST; do echo "$var=${!var}"; done > travis.settings
         - docker-compose -f dist/ci/docker-compose.yml run test
       after_success:
diff --git a/dist/ci/docker-compose-flaker.sh b/dist/ci/docker-compose-flaker.sh
new file mode 100755
index 00000000..016d8e45
--- /dev/null
+++ b/dist/ci/docker-compose-flaker.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -ex
+
+zypper in -y python3-flake8
+run_as_tester flake8
+run_as_tester ./dist/ci/flake-extra
diff --git a/dist/ci/docker-compose.yml b/dist/ci/docker-compose.yml
index 960ca1f3..dea3e3e3 100644
--- a/dist/ci/docker-compose.yml
+++ b/dist/ci/docker-compose.yml
@@ -3,6 +3,11 @@ version: "3.4"
 x-obs: &obs
   image: registry.opensuse.org/opensuse/tools/images/containers/osrt_miniobs:latest
 
+x-testenv: &testenv
+  image: registry.opensuse.org/opensuse/tools/images/containers_tumbleweed/osrt_testenv_tumbleweed:latest
+  volumes:
+    - "../..:/code"
+
 services:
   db:
     <<: *obs
@@ -29,12 +34,13 @@ services:
     <<: *obs
     command: chroot --userspec=obsrun / /usr/lib/obs/server/bs_servicedispatch
   test:
-    image: registry.opensuse.org/opensuse/tools/images/containers_tumbleweed/osrt_testenv_tumbleweed:latest
+    <<: *testenv
     depends_on:
       - api
-    volumes:
-      - "../..:/code"
     command: /code/dist/ci/docker-compose-test.sh
     cap_add:
       - SYS_PTRACE
+  flaker:
+    <<: *testenv
+    command: /code/dist/ci/docker-compose-flaker.sh
 
diff --git a/dist/ci/testenv-tumbleweed/Dockerfile b/dist/ci/testenv-tumbleweed/Dockerfile
index 4f4bc437..21f5dee7 100644
--- a/dist/ci/testenv-tumbleweed/Dockerfile
+++ b/dist/ci/testenv-tumbleweed/Dockerfile
@@ -5,7 +5,7 @@ RUN useradd tester -d /code/tests/home
 
 RUN zypper in -y osc python3-nose python3-httpretty python3-pyxdg python3-PyYAML \
    python3-pika python3-mock python3-cmdln python3-lxml python3-python-dateutil python3-colorama \
-   python3-influxdb python3-coverage python3-coveralls libxml2-tools curl \
+   python3-influxdb python3-coverage python3-coveralls libxml2-tools curl python3-flake8 \
    vim vim-data strace git sudo patch openSUSE-release openSUSE-release-ftp
 
 COPY osc-hotpatch.diff /tmp