From 590835472c4d4ed0e344e0e19c45460cbb3e5ec4 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Thu, 9 Apr 2020 06:35:50 -0700 Subject: [PATCH] Tag linter and docker-compose integration jobs with id Simplify linter and docker-compose jobs assignment by tagging them with shorthand name. Change-Id: I9b7994c2a032b160a0356bdd2577de330c18ba56 Issue-ID: INT-1508 Signed-off-by: Bartek Grzybowski --- jjb/demo/demo.yaml | 2 +- jjb/integration/integration-docker-compose.yaml | 2 +- jjb/integration/integration-templates-docker.yaml | 1 + jjb/integration/integration-templates.yaml | 1 + jjb/integration/integration.yaml | 2 +- jjb/integration/simulators/integration-dc-simulator.yaml | 2 +- jjb/integration/simulators/integration-pnf-simulator.yaml | 2 +- jjb/integration/simulators/integration-ran-simulator.yaml | 2 +- jjb/integration/usecases/integration-usecases-bbs.yaml | 2 +- jjb/integration/usecases/integration-usecases-mdons.yaml | 2 +- jjb/testsuite/testsuite.yaml | 2 +- 11 files changed, 11 insertions(+), 9 deletions(-) diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index 2cec1347f..ea7bcaf8c 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -61,7 +61,7 @@ project-name: 'demo' python-version: python3 jobs: - - '{project-name}-{stream}-{subproject}-lint' + - integration-linters subproject: - 'yaml': tox-dir: '.' diff --git a/jjb/integration/integration-docker-compose.yaml b/jjb/integration/integration-docker-compose.yaml index 3d1e8a2cf..852d5a1bb 100644 --- a/jjb/integration/integration-docker-compose.yaml +++ b/jjb/integration/integration-docker-compose.yaml @@ -7,7 +7,7 @@ - 'master': branch: 'master' jobs: - - '{project-name}-{stream}-{subproject}-docker-compose-verify' + - integration-docker-compose-verify subproject: - 'netconf-pnp-simulator': pattern: 'test/mocks/netconf-pnp-simulator/modules/**' diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml index ac383fb23..e434d0a7b 100644 --- a/jjb/integration/integration-templates-docker.yaml +++ b/jjb/integration/integration-templates-docker.yaml @@ -126,6 +126,7 @@ - job-template: name: '{project-name}-{stream}-{subproject}-docker-compose-verify' + id: integration-docker-compose-verify project-type: freestyle description: 'This job validates Docker Compose based projects' node: 'ubuntu1804-docker-8c-8g' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 7d9ffed21..61d09d7d7 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -54,6 +54,7 @@ # pattern: List of file patterns to scan name: '{project-name}-{stream}-{subproject}-lint' + id: integration-linters project-type: freestyle description: 'Job intended for running linters with Tox and Coala' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 6e36576dd..5111c4d30 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -83,7 +83,7 @@ project-name: 'integration' python-version: python3 jobs: - - '{project-name}-{stream}-{subproject}-lint' + - integration-linters subproject: - 'yaml': tox-dir: '.' diff --git a/jjb/integration/simulators/integration-dc-simulator.yaml b/jjb/integration/simulators/integration-dc-simulator.yaml index 7d807dc8e..5b074135a 100644 --- a/jjb/integration/simulators/integration-dc-simulator.yaml +++ b/jjb/integration/simulators/integration-dc-simulator.yaml @@ -14,7 +14,7 @@ project-name: integration-simulators-dc-simulator python-version: python3 jobs: - - '{project-name}-{stream}-{subproject}-lint' + - integration-linters subproject: - 'yaml': tox-dir: '.' diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml index 664a0fa76..09875f851 100644 --- a/jjb/integration/simulators/integration-pnf-simulator.yaml +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -66,7 +66,7 @@ project-name: integration-simulators-pnf-simulator python-version: python3 jobs: - - '{project-name}-{stream}-{subproject}-lint' + - integration-linters subproject: - 'yaml': tox-dir: '.' diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml index 584d93f33..895854a55 100644 --- a/jjb/integration/simulators/integration-ran-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-simulator.yaml @@ -14,7 +14,7 @@ project-name: integration-simulators-ran-simulator python-version: python3 jobs: - - '{project-name}-{stream}-{subproject}-lint' + - integration-linters subproject: - 'yaml': tox-dir: '.' diff --git a/jjb/integration/usecases/integration-usecases-bbs.yaml b/jjb/integration/usecases/integration-usecases-bbs.yaml index fbf56a4a6..ce2743e98 100644 --- a/jjb/integration/usecases/integration-usecases-bbs.yaml +++ b/jjb/integration/usecases/integration-usecases-bbs.yaml @@ -14,7 +14,7 @@ project-name: integration-usecases-bbs python-version: python3 jobs: - - '{project-name}-{stream}-{subproject}-lint' + - integration-linters subproject: - 'yaml': tox-dir: '.' diff --git a/jjb/integration/usecases/integration-usecases-mdons.yaml b/jjb/integration/usecases/integration-usecases-mdons.yaml index 7f4d692ea..475b27182 100644 --- a/jjb/integration/usecases/integration-usecases-mdons.yaml +++ b/jjb/integration/usecases/integration-usecases-mdons.yaml @@ -14,7 +14,7 @@ project-name: integration-usecases-mdons python-version: python3 jobs: - - '{project-name}-{stream}-{subproject}-lint' + - integration-linters subproject: - 'yaml': tox-dir: '.' diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index 7d0eb5d72..58bab20a6 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -63,7 +63,7 @@ project-name: 'testsuite' python-version: python3 jobs: - - '{project-name}-{stream}-{subproject}-lint' + - integration-linters subproject: - 'yaml': tox-dir: '.' -- 2.16.6