diff options
| -rw-r--r-- | jjb/integration/integration-templates.yaml | 8 | ||||
| -rw-r--r-- | jjb/integration/simulators/integration-pnf-simulator.yaml | 16 | ||||
| -rw-r--r-- | jjb/integration/xtesting/integration-xtesting.yaml | 2 |
3 files changed, 24 insertions, 2 deletions
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 61d09d7d7..622d523a7 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -44,7 +44,7 @@ publishers: - lf-infra-publish -- job-template: +- job-template: &tox_verify_boilerplate # Job template for running linters against specific file formats # # Required Variables: @@ -98,3 +98,9 @@ publishers: - lf-infra-publish + +- job-template: + <<: *tox_verify_boilerplate + name: '{project-name}-{stream}-{subproject}-tox-verify' + id: integration-tox-verify + description: 'Job intended for running tox' diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml index ec0f970d1..481aca909 100644 --- a/jjb/integration/simulators/integration-pnf-simulator.yaml +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -61,6 +61,22 @@ branch: master - project: + name: integration-simulators-pnf-simulator-cli + project: integration/simulators/pnf-simulator + project-name: integration-pnf-simulator + python-version: python3 + jobs: + - integration-tox-verify + subproject: + - 'simulator-cli': + tox-dir: 'simulator-cli' + tox-envs: 'pytest' + pattern: '**/*' + stream: + - 'master': + branch: 'master' + +- project: name: integration-simulators-pnf-simulator-linters project: integration/simulators/pnf-simulator project-name: integration-pnf-simulator diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 1da408752..2065813c5 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -92,7 +92,7 @@ project-name: 'integration-xtesting-benchmarking' docker-root: ./benchmarking docker-name: 'onap/xtesting-benchmarking' - docker-build-args: '-f ./benchmarking/docker/Dockerfile' + docker-build-args: '-f ./docker/Dockerfile' - gerrit-docker-merge: project-name: 'integration-xtesting-benchmarking' docker-root: ./benchmarking |