From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 24 Jul 2018 16:50:34 +0000 (-0400)
Subject: ceph-iscsi-config-flake8: removed use of docker
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9389c901c53ffac306940c41e944224049adae92;p=ceph-build.git

ceph-iscsi-config-flake8: removed use of docker

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/ceph-iscsi-config-flake8/build/build b/ceph-iscsi-config-flake8/build/build
old mode 100755
new mode 100644
index 26536437..426bc9d4
--- a/ceph-iscsi-config-flake8/build/build
+++ b/ceph-iscsi-config-flake8/build/build
@@ -1,56 +1,9 @@
 #!/bin/bash
 
-set -e
-set -x
+# the following two methods exist in scripts/build_utils.sh
+pkgs=( "tox" )
+install_python_packages "pkgs[@]"
 
-function generate_filelist(){
-   if [[ "$pull_request_id" -eq "" || "${ghprbCommentBody:-}" = "jenkins flake8 all" ]]
-   then
-       find . -name '*.py'
-   else
-       curl -XGET "https://api.github.com/repos/ceph/ceph-iscsi-config/pulls/$pull_request_id/files" |
-       jq '.[].filename' |  # just the files please
-       tr -d '"' |  # remove the quoting from JSON
-       grep ".py$" # just the python
-   fi
+cd "$WORKSPACE/ceph-iscsi-config"
 
-}
-
-function check(){
-    local file
-    while read -r filename; do
-        pushd "$(dirname "$filename")"
-        file=$(basename "$filename")
-        sudo docker run --rm -v "$workspace"/ceph-iscsi-config/tox.ini:/tox.ini -v "$(pwd)"/"$file":/"$file" eeacms/flake8 /"$file"
-        popd
-    done
-    return $?
-}
-
-function main() {
-    # install some of our dependencies if running on a jenkins slave
-    if [[ -n "$HUDSON_URL" ]]
-    then
-        sudo yum -y install epel-release
-        sudo yum -y install docker jq
-        sudo systemctl start docker
-        pull_request_id=${ghprbPullId:-$2}
-        workspace=${WORKSPACE:-$1}
-    else
-        if ! command -v docker || ! command -v jq
-        then
-            echo "docker or jq is/are missing, install it/them"
-            exit 1
-        fi
-        pull_request_id=${ghprbPullId:-$2}
-        workspace=${WORKSPACE:-$1}
-    fi
-
-
-    pushd "$workspace/ceph-iscsi-config"
-    generate_filelist | check
-    popd
-    exit $?
-}
-
-main "$@"
+$VENV/tox -rv -e flake8
diff --git a/ceph-iscsi-config-flake8/config/definitions/ceph-iscsi-config-flake8.yml b/ceph-iscsi-config-flake8/config/definitions/ceph-iscsi-config-flake8.yml
index 0185d355..83ecb7d9 100644
--- a/ceph-iscsi-config-flake8/config/definitions/ceph-iscsi-config-flake8.yml
+++ b/ceph-iscsi-config-flake8/config/definitions/ceph-iscsi-config-flake8.yml
@@ -9,20 +9,27 @@
           browser: auto
           timeout: 20
           skip-tag: true
-          wipe-workspace: false
+          wipe-workspace: true
           basedir: "ceph-iscsi-config"
 
 - job:
     name: ceph-iscsi-config-flake8
-    node: small && centos7
+    description: Runs Flake8 tests for ceph-iscsi-config on each GitHub PR
+    project-type: freestyle
+    node: python3
+    block-downstream: false
+    block-upstream: false
     defaults: global
-    display-name: 'ceph-iscsi-config-flake8'
+    display-name: 'ceph-iscsi-config: Flake8'
+    quiet-period: 5
+    retry-count: 3
+
     properties:
       - build-discarder:
           days-to-keep: 15
           num-to-keep: 30
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
+          artifact-days-to-keep: 15
+          artifact-num-to-keep: 15
       - github:
           url: https://github.com/ceph/ceph-iscsi-config/
 
@@ -42,10 +49,6 @@
           github-hooks: true
           permit-all: true
           auto-close-on-fail: false
-          status-context: "Testing: flake8"
-          started-status: "Running: flake8"
-          success-status: "OK"
-          failure-status: "FAIL - please clean up for merge"
 
     scm:
       - ceph-iscsi-config
@@ -53,5 +56,5 @@
     builders:
       - shell:
           !include-raw:
+            - ../../../scripts/build_utils.sh
             - ../../build/build
-