Make builder use tox template

Instead of using a custom job to run flake8 test we should use our
existing community template.

Change-Id: I0b3937bae638e9d2d8f9e2324ec43778c04c2498
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 7e6b262308ecb51266dc437289a8d21022e7761a..4cf277cec2826fb39ade6733c4f5c5760474936d 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -3,7 +3,7 @@
     name: builder-jobs
     jobs:
       - 'builder-verify-jjb'
-      - 'builder-verify-python'
+      - '{project-name}-verify-tox-{stream}'
       - 'builder-merge'
       - 'builder-weekly'
       - 'builder-check-poms'
@@ -56,10 +56,13 @@
     project-type: freestyle
     archive-artifacts: '**/*.log'
     build-timeout: '60'
-    # The following two values are only specified here
+
+    # The following values are only specified here
     # so that code blocks look similar to other projects.
     project: 'releng/builder'
-    branch: 'master'
+    project-name: builder
+    stream: master
+    branch: master
 
 - job-template:
     name: builder-verify-jjb
@@ -115,59 +118,6 @@
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'
 
-# FIXME: Migrate to {project-name}-verify-python-{stream} or delete this entirely,
-#        as there are zero python files (aside docs/conf.py) in releng/builder.
-- job-template:
-    name: builder-verify-python
-    node: centos7-java-builder-2c-4g
-    concurrent: true
-
-    project-type: freestyle
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - opendaylight-infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: 'scripts/**'
-
-    builders:
-      - verify-gpg-signature
-      - shell: |
-          virtualenv $WORKSPACE/venv
-          source $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip
-          pip freeze
-          pip install flake8
-          flake8 scripts/
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
 - job-template:
     name: 'builder-merge'
     node: centos7-java-builder-2c-4g

diff --git a/tox.ini b/tox.ini
index ff20b9401df95213e47935d27f01e714e6adab25..f00fdcc21e6ac08ee6978cb52ecbffddd79f750e 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,13 @@
 [tox]
 minversion = 1.6
-envlist = docs
+envlist = docs,pep8
 skipsdist = true
 
 [testenv:docs]
 deps = sphinx
 commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
+
+[testenv:pep8]
+deps = flake8
+commands = flake8 scripts/
+