diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/csit/csit-tox.yaml (renamed from jjb/csit/csit-vpp-pylint.yaml) | 19 | ||||
| -rw-r--r-- | jjb/csit/include-raw-csit-pylint.sh | 17 |
2 files changed, 8 insertions, 28 deletions
diff --git a/jjb/csit/csit-vpp-pylint.yaml b/jjb/csit/csit-tox.yaml index 0a4f4556e..cb7f648d3 100644 --- a/jjb/csit/csit-vpp-pylint.yaml +++ b/jjb/csit/csit-tox.yaml @@ -3,7 +3,7 @@ name: csit-validate jobs: - - 'csit-validate-pylint-{stream}' + - 'csit-verify-tox-{stream}' project: 'csit' branch: 'master' @@ -14,10 +14,10 @@ branch: 'rls1901' - job-template: - name: 'csit-validate-pylint-{stream}' + name: 'csit-verify-tox-{stream}' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: ubuntu1804-us concurrent: true build-discarder: @@ -31,6 +31,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' + - gerrit-refspec-parameter scm: - gerrit-trigger-scm: @@ -48,19 +49,15 @@ branch: '{branch}' builders: - # yamllint disable-line rule:line-length - # This is where we will need to insert a step with a script that pulls all the - # yamllint disable-line rule:line-length - # allocated IP addresses and injecting as vars into the env. (see Opendaylight script: include-raw-integration-get-slave-addresses.sh - # yamllint enable rule:line-length - # See jjb/integration from ODL - shell: - !include-raw-escape: include-raw-csit-pylint.sh + ./resources/libraries/bash/entry/tox.sh publishers: - archive-artifacts: - artifacts: 'pylint.log' + artifacts: '*.log' latest-only: false + # TODO: Remove this when a voting pylint difference checker + # with nice enough output is implemented. - violations: pylint: min: 10 diff --git a/jjb/csit/include-raw-csit-pylint.sh b/jjb/csit/include-raw-csit-pylint.sh deleted file mode 100644 index 2987e5e25..000000000 --- a/jjb/csit/include-raw-csit-pylint.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -x - -# Re-create virtual environment -rm -rf env || true -virtualenv env -. env/bin/activate - -# Install requirements, so all CSIT python dependencies are met -pip install -r requirements.txt -pip install pylint==1.5.4 - -# Run pylint, but hide its' return value until python warnings are cleared -PYTHONPATH=`pwd` pylint --rcfile=pylint.cfg resources/ > pylint.log || true - -# vim: ts=4 ts=4 sts=4 et : |