summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/ccsdk/apps.yaml4
-rw-r--r--jjb/ccsdk/cds.yaml4
-rw-r--r--jjb/ccsdk/distribution.yaml4
-rw-r--r--jjb/ccsdk/features.yaml4
-rw-r--r--jjb/ccsdk/parent.yaml4
-rw-r--r--jjb/ccsdk/sli-adaptors.yaml4
-rw-r--r--jjb/ccsdk/sli-core.yaml4
-rw-r--r--jjb/ccsdk/sli-northbound.yaml4
-rw-r--r--jjb/ccsdk/sli-plugins.yaml4
-rw-r--r--jjb/ci-management/ci-management-packer-jobs.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml11
-rw-r--r--jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml29
-rw-r--r--jjb/dmaap/dmaap-kafka-docker.yaml2
-rw-r--r--jjb/dmaap/dmaap-zookeeper.yaml2
-rw-r--r--jjb/global-templates-helm.yaml2
-rw-r--r--jjb/integration/integration-templates.yaml3
-rw-r--r--jjb/integration/integration.yaml11
-rw-r--r--jjb/msb/msb-apigateway.yaml2
-rw-r--r--jjb/msb/msb-discovery.yaml2
-rw-r--r--jjb/oom/oom-registrator.yaml2
-rw-r--r--jjb/optf/optf-osdf.yaml38
-rw-r--r--jjb/policy/policy-apex-pdp.yaml1
-rw-r--r--jjb/policy/policy-pap.yaml45
-rw-r--r--jjb/sdc/sdc-sdc-docker-base.yaml4
-rw-r--r--jjb/sdc/sdc.yaml2
-rw-r--r--jjb/testsuite/testsuite.yaml29
-rw-r--r--jjb/usecaseui/usecase-ui-server.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-ems-java.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-sfc.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-multivimproxy.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-wfengine-java.yaml2
34 files changed, 158 insertions, 81 deletions
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 8a97a17b4..8b2ec47b0 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -30,6 +30,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-apps-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
@@ -72,6 +74,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-apps-settings'
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 91fb43203..d8395bab5 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -26,6 +26,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-cds-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
@@ -68,6 +70,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-cds-settings'
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index eab7aa874..b9cd8faba 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -25,6 +25,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-distribution-settings'
files: '**'
archive-artifacts: ''
@@ -63,6 +65,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-distribution-settings'
build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index fc8b655f7..0a0120eb3 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -17,6 +17,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-features-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
@@ -60,6 +62,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-features-settings'
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 4a7396811..a29b09607 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -19,6 +19,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-parent-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
@@ -39,6 +41,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-parent-settings'
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 8db8e3e39..8b65dc8f5 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -20,6 +20,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-sli-adaptors-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
@@ -62,6 +64,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-sli-adaptors-settings'
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index f4996b997..946a4fb4f 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -20,6 +20,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-sli-core-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
@@ -62,6 +64,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-sli-core-settings'
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index ebe19d4bf..8cd692b0f 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -20,6 +20,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-sli-northbound-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
@@ -62,6 +64,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-sli-northbound-settings'
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index c631f6416..aec06dbc8 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -20,6 +20,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-sli-plugins-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
@@ -62,6 +64,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'ccsdk-sli-plugins-settings'
maven-version: "mvn35"
diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
index d292bf4e8..2a8436f69 100644
--- a/jjb/ci-management/ci-management-packer-jobs.yaml
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -15,7 +15,6 @@
platforms:
- centos-7
- ubuntu-16.04
- - ubuntu-16.04-arm64
- ubuntu-18.04
templates: builder
@@ -87,4 +86,5 @@
platforms:
- ubuntu-16.04
+ - ubuntu-18.04
templates: helm
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index 32e485679..eec174ab5 100644
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -16,11 +16,12 @@
branch: 'master'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
+ maven-version: 'mvn35'
maven-deploy-properties: |
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-services-bbs-event-processor-release
@@ -37,7 +38,7 @@
mvn-goals: 'clean deploy -Ddockerfile.skip -f components/bbs-event-processor/pom.xml'
pattern: 'components/bbs-event-processor/**'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/bbs-event-processor/pom.xml'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -52,7 +53,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-services-bbs-event-processor-sonar
@@ -71,7 +72,7 @@
branch: 'master'
mvn-settings: 'dcaegen2-services-settings'
mvn-params: '-f components/bbs-event-processor/pom.xml'
- mvn-goals: 'clean install'
+ mvn-goals: 'clean install -Ddockerfile.skip'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- project:
@@ -80,7 +81,7 @@
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/services'
project-name: 'dcaegen2-services-bbs-event-processor-clm'
mvn-params: '-f components/bbs-event-processor/pom.xml'
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 3b6d678ab..4b43e2c5e 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -79,35 +79,6 @@
build-node: 'ubuntu1604-docker-8c-8g'
- project:
- name: dcaegen2-services-datalake-handler-db-init-release
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-datalake-handler-db-init'
- jobs:
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- mvn-pom: 'components/datalake-handler/pom.xml'
- mvn-params: '-f components/datalake-handler/pom.xml'
- version-properties-file: 'components/datalake-handler/version.properties'
- pattern: 'components/datalake-handler/**'
- - gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
- mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/init_db/pom.xml'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- pattern: 'components/datalake-handler/**'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-services-settings'
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
-
-- project:
name: dcaegen2-services-datalake-handler-sonar
jobs:
- gerrit-maven-sonar
diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml
index e610e477b..b09e30ea7 100644
--- a/jjb/dmaap/dmaap-kafka-docker.yaml
+++ b/jjb/dmaap/dmaap-kafka-docker.yaml
@@ -10,6 +10,8 @@
mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'dmaap/kafka11aaf'
stream:
- 'master':
diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml
index 3b18d082b..e17fbe073 100644
--- a/jjb/dmaap/dmaap-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-zookeeper.yaml
@@ -20,6 +20,8 @@
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'dmaap/zookeeper'
stream:
- 'master':
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 12ce9a383..a147e1a51 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -20,6 +20,7 @@
submodule-disable: false
submodule-recursive: true
submodule-timeout: 10
+ build-timeout: 120
#####################
# Job Configuration #
@@ -55,6 +56,7 @@
# Job template for helm verify jobs
<<: *helm_job_boiler_plate
+ concurrent: true
scm:
- gerrit-trigger-scm:
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 0cf19bcff..f4d101eb8 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -56,7 +56,8 @@
name: '{project-name}-{stream}-{subproject}-lint'
project-type: freestyle
description: 'Job intended for running linters with Tox and Coala'
- node: ubuntu1604-builder-2c-1g
+ build-node: ubuntu1604-builder-2c-1g
+ node: '{build-node}'
parameters:
- lf-infra-parameters:
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 8d4d52e48..17b608363 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -79,6 +79,7 @@
docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
docker-root: test/mocks/netconf-pnp-simulator/engine
container-tag-method: yaml-file
+ post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh
build-node: centos7-docker-8c-8g
build-timeout: 20
jobs:
@@ -96,11 +97,19 @@
- 'yaml':
tox-dir: '.'
tox-envs: 'yaml'
- pattern: '**/*.yaml|**/*.yml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
- 'json':
tox-dir: '.'
tox-envs: 'json'
pattern: '**/*.json'
+ - 'python':
+ tox-dir: '.'
+ tox-envs: 'py'
+ pattern: '**/*.py'
stream:
- 'master':
branch: 'master'
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index cc07972d4..ed611b84c 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -22,6 +22,8 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'msb/apigateway'
stream:
- 'master':
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 67eca0a5d..b38802b9d 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -16,6 +16,8 @@
container-staging-registry: 'nexus3.onap.org:10003'
mvn-pom: 'distributions/msb-discovery/pom.xml'
mvn-params: '-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'msb/discovery'
stream:
- 'master':
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index 4b5a3b3fe..d625aba44 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -16,6 +16,8 @@
script:
!include-raw-escape: 'build-registrator-docker-image.sh'
build-node: ubuntu1604-docker-8c-8g
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'oom/registrator'
stream:
- 'master':
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 830ac930a..b4884b752 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -17,9 +17,9 @@
pom: 'pom.xml'
jobs:
- '{project-name}-{stream}-{subproject}-verify-python':
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- '{project-name}-{stream}-{subproject}-merge-java':
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-docker-8c-8g
@@ -27,12 +27,11 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
docker-pom: 'pom.xml'
- mvn-goals: 'install'
mvn-params: '-Dmaven.test.skip=true -P docker'
files: '**'
@@ -40,37 +39,6 @@
build-node: 'ubuntu1604-builder-4c-4g'
- project:
- name: optf-osdf-docker
- project-name: 'optf-osdf'
- project: 'optf/osdf'
- stream:
- - 'master':
- branch: 'master'
- - 'elalto':
- branch: 'elalto'
- mvn-settings: 'optf-osdf-settings'
- subproject:
- - 'osdf':
- path: '.'
- pattern: '**'
- pom: 'pom.xml'
- jobs:
- - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- mvn-params: '-Dmaven.test.skip=true'
- script:
- !include-raw-escape: 'build-optf-osdf-docker-image.sh'
- build-node: queue-docker-4c-4g
- - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- mvn-params: '-Dmaven.test.skip=true'
- script:
- !include-raw-escape: 'build-optf-osdf-docker-image.sh'
- build-node: queue-docker-4c-4g
-
-- project:
name: optf-osdf-sonar
jobs:
- gerrit-maven-sonar
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index da2407d16..1923c765e 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -14,7 +14,6 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: "-P docker"
- java-opts: 'Xss2048k'
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 97dc5675a..d5f183efe 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -5,21 +5,52 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java':
+ project-name: 'policy-pap-amd64'
docker-pom: 'pom.xml'
- mvn-params: '-P docker'
- build-node: ubuntu1604-docker-8c-8g
+ mvn-profile: 'docker'
+ mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+ build-node: ubuntu1804-docker-8c-8g
+ pattern: 'do_not_match_any_file'
+ - '{project-name}-{stream}-merge-java':
+ project-name: 'policy-pap-arm64'
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
+ mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+ build-node: ubuntu1604-docker-arm64-4c-2g
+ pattern: 'do_not_match_any_file'
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+ - '{project-name}-multiarch-{stream}-merge-java':
+ build-node: ubuntu1804-docker-8c-8g
+ - gerrit-maven-docker-stage:
+ project-name: 'policy-pap-arm64'
+ build-node: ubuntu1604-docker-arm64-4c-2g
+ maven-versions-plugin: true
+ mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+ container-public-registry: 'docker.io'
+ container-staging-registry: 'docker.io'
+ cron: ''
+ gerrit_trigger_file_paths:
+ - compare-type: REG_EXP
+ pattern: 'do_not_match_any_file'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ project-name: 'policy-pap-amd64'
+ build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
+ mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+ container-public-registry: 'docker.io'
+ container-staging-registry: 'docker.io'
+ cron: ''
+ gerrit_trigger_file_paths:
+ - compare-type: REG_EXP
+ pattern: 'do_not_match_any_file'
+ - '{project-name}-docker-manifest-{stream}':
build-node: centos7-docker-8c-8g
+ - '{project-name}-multiarch-docker-stage-{stream}'
project: 'policy/pap'
stream:
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index f003fbbb9..6507f4f25 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -4,7 +4,9 @@
name: sdc-sdc-docker-base
project-name: 'sdc-sdc-docker-base'
jobs:
- - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-verify-java':
+ build-node: 'ubuntu1604-docker-v1-8c-8g'
+ docker-pom: 'pom.xml'
- '{project-name}-{stream}-sdc-merge-java':
build-node: 'ubuntu1604-docker-8c-8g'
docker-pom: 'pom.xml'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 71296e47e..70d2c221d 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -53,6 +53,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'sdc-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index fd32c94a5..f93a1faf2 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -56,3 +56,32 @@
build-node: centos7-builder-2c-1g
project: testsuite
branch: master
+
+- project:
+ name: testsuite-linters
+ project: 'testsuite'
+ project-name: 'testsuite'
+ python-version: python3
+ jobs:
+ - '{project-name}-{stream}-{subproject}-lint':
+ build-node: ubuntu1804-builder-4c-4g
+ 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'
+# - 'robot':
+# tox-dir: '.'
+# tox-envs: 'robot'
+# pattern: '**/*.robot'
+ stream:
+ - 'master':
+ branch: 'master'
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index a19dcd649..917ff2970 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -18,6 +18,8 @@
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
build-node: ubuntu1604-docker-8c-8g
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index 348cef156..b79fdcca4 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -25,6 +25,8 @@
script:
!include-raw-escape: 'build-driver-ems-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: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index 273e37747..5130e9ccf 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -26,6 +26,8 @@
script:
!include-raw-escape: 'build-driver-zte-sfc-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: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 709562c91..19cf0b477 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -20,6 +20,8 @@
maven-versions-plugin: true
mvn-pom: 'huawei/pom.xml'
mvn-params: '-f huawei/pom.xml'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
index 96c99885c..193df51a2 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
@@ -20,6 +20,8 @@
maven-versions-plugin: true
mvn-pom: 'nokiav2/pom.xml'
mvn-params: '-f nokiav2/pom.xml'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
files: 'nokiav2/**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
index f89e2fcae..d9601cbf6 100644
--- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
@@ -21,6 +21,8 @@
script:
!include-raw-escape: 'build-nfvo-multivimproxy-docker-image.sh'
build-node: ubuntu1604-docker-8c-8g
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
- project:
name: vfc-nfvo-multivimproxy-sonar
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 9fa63c617..35992f87a 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -21,6 +21,8 @@
script:
!include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'
build-node: ubuntu1604-docker-8c-8g
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
- project:
name: vfc-nfvo-resmanagement-sonar
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 0b3cf0567..4d650c3d4 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -23,6 +23,8 @@
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
mvn-goals: 'clean'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g