summaryrefslogtreecommitdiffstats
path: root/jjb/integration
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2020-04-09 18:44:57 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-09 18:44:57 +0000
commitfd0448455a5feb7879a3f203479106423c9bc68d (patch)
treec359b29886a746ef8b02e36933cd007c716d90f6 /jjb/integration
parent21c3b2eb7bf114e010bb70c6eb9602a8d9610646 (diff)
parent590835472c4d4ed0e344e0e19c45460cbb3e5ec4 (diff)
Merge "Tag linter and docker-compose integration jobs with id"
Diffstat (limited to 'jjb/integration')
-rw-r--r--jjb/integration/integration-docker-compose.yaml2
-rw-r--r--jjb/integration/integration-templates-docker.yaml1
-rw-r--r--jjb/integration/integration-templates.yaml1
-rw-r--r--jjb/integration/integration.yaml2
-rw-r--r--jjb/integration/simulators/integration-dc-simulator.yaml2
-rw-r--r--jjb/integration/simulators/integration-pnf-simulator.yaml2
-rw-r--r--jjb/integration/simulators/integration-ran-simulator.yaml2
-rw-r--r--jjb/integration/usecases/integration-usecases-bbs.yaml2
-rw-r--r--jjb/integration/usecases/integration-usecases-mdons.yaml2
9 files changed, 9 insertions, 7 deletions
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: '.'