diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/appc/appc-parent.yaml | 2 | ||||
-rw-r--r-- | jjb/global-defaults.yaml | 2 | ||||
-rw-r--r-- | jjb/integration/simulators/integration-ran-simulator.yaml | 24 | ||||
-rw-r--r-- | jjb/lab/lab-templates.yaml | 2 | ||||
-rw-r--r-- | jjb/modeling/modeling-etsicatalog.yaml | 2 | ||||
-rw-r--r-- | jjb/sdc/sdc-dcae-d-dt.yaml | 4 | ||||
-rw-r--r-- | jjb/sdc/sdc-dcae-d-fe.yaml | 4 | ||||
-rw-r--r-- | jjb/sdc/sdc-sdc-workflow-designer.yaml | 4 |
8 files changed, 35 insertions, 9 deletions
diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml index 897028cb3..2ada1b0b0 100644 --- a/jjb/appc/appc-parent.yaml +++ b/jjb/appc/appc-parent.yaml @@ -24,7 +24,7 @@ branch: 'master' mvn-settings: 'appc-parent-settings' maven-version: "mvn35" - build-node: ubuntu1604-builder-2c-1g + build-node: ubuntu1804-builder-4c-4g - project: name: appc-parent-info diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 1590d0134..74479f299 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -38,7 +38,7 @@ # Timeout in minutes build-timeout: 90 - build-node: ubuntu1604-builder-2c-1g + build-node: ubuntu1804-builder-4c-4g archive-artifacts: '' diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml index e639f2fdf..584d93f33 100644 --- a/jjb/integration/simulators/integration-ran-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-simulator.yaml @@ -7,3 +7,27 @@ build-node: centos7-builder-2c-1g project: integration/simulators/ran-simulator branch: master + +- project: + name: integration-simulators-ran-simulator-linters + project: integration/simulators/ran-simulator + project-name: integration-simulators-ran-simulator + python-version: python3 + jobs: + - '{project-name}-{stream}-{subproject}-lint' + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + stream: + - 'master': + branch: 'master' diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml index ff7a59d40..234d1fc86 100644 --- a/jjb/lab/lab-templates.yaml +++ b/jjb/lab/lab-templates.yaml @@ -4,7 +4,7 @@ description: '{job-desc}' disabled: false project-type: freestyle - build-node: ubuntu1604-builder-2c-1g + build-node: ubuntu1804-builder-4c-4g properties: - lf-infra-properties: diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml index a58af1cc9..28248e332 100644 --- a/jjb/modeling/modeling-etsicatalog.yaml +++ b/jjb/modeling/modeling-etsicatalog.yaml @@ -26,6 +26,8 @@ script: !include-raw-escape: 'build-modeling-etsicatalog-docker-image.sh' build-node: ubuntu1604-docker-8c-8g + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: centos7-redis-4c-4g diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 2a14df817..6531c545a 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -2,7 +2,7 @@ - project: name: sdc-dcae-d-dt project-name: 'sdc-dcae-d-dt' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -73,7 +73,7 @@ nexus-iq-namespace: 'onap-' project: sdc/dcae-d/dt project-name: 'sdc-dcae-d-dt' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'sdc-dcae-d-dt-settings' diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index 3923a154e..f5693cb28 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -2,7 +2,7 @@ - project: name: sdc-dcae-d-fe project-name: 'sdc-dcae-d-fe' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -72,7 +72,7 @@ nexus-iq-namespace: 'onap-' project: sdc/dcae-d/fe project-name: 'sdc-dcae-d-fe' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'sdc-dcae-d-fe-settings' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 8adf12063..b2d42b961 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -28,8 +28,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'sdc-sdc-workflow-designer-settings' files: '**' archive-artifacts: '' |