summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aai/aai-babel.yaml2
-rw-r--r--jjb/aai/aai-data-router.yaml2
-rw-r--r--jjb/aai/aai-model-loader.yaml2
-rw-r--r--jjb/aai/aai-sparky-be.yaml2
-rw-r--r--jjb/aai/aai-spike.yaml2
-rw-r--r--jjb/appc/appc-master.yaml2
-rw-r--r--jjb/ci-management/ci-management-coverity.yaml9
-rw-r--r--jjb/global-templates-java.yaml6
-rw-r--r--jjb/multicloud/multicloud-k8s.yaml2
-rw-r--r--jjb/oparent/oparent.yaml3
-rw-r--r--jjb/policy/policy-csit.yaml4
-rw-r--r--jjb/policy/policy-docker-base-common.yaml2
-rw-r--r--jjb/portal-sdk/portal-sdk.yaml2
-rw-r--r--jjb/sdnc/sdnc-apps.yaml2
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml2
-rw-r--r--jjb/sdnc/sdnc-oam.yaml2
-rw-r--r--jjb/so/so-libs.yaml2
-rw-r--r--jjb/so/so.yaml2
-rw-r--r--jjb/vvp/vvp-validation-scripts.yaml1
19 files changed, 43 insertions, 8 deletions
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index cab62d047..71e05e0c3 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- mvn-params: 'docker:build -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index 357727522..eb918b2bd 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- mvn-params: 'docker:build -B -Dmaven.test.skip=true'
+ mvn-params: '-P docker -B -Dmaven.test.skip=true'
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 152f01d15..86505f4c5 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- mvn-params: 'docker:build -B -Dmaven.test.skip=true'
+ mvn-params: '-P docker -B -Dmaven.test.skip=true'
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 7e270003a..a1a68d6d2 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- mvn-params: '-f sparkybe-onap-application/pom.xml docker:build -B -Dmaven.test.skip=true'
+ mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true'
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
index ec5228a38..d1a19abe6 100644
--- a/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- mvn-params: 'docker:build -B -Dmaven.test.skip=true'
+ mvn-params: '-P docker -B -Dmaven.test.skip=true'
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 30a4b94de..80c568d08 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -5,6 +5,8 @@
jobs:
- '{project-name}-{stream}-verify-java':
build-node: ubuntu1604-builder-8c-8g
+ mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+ java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
- '{project-name}-{stream}-merge-java':
build-node: ubuntu1604-builder-8c-8g
- gerrit-maven-stage:
diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml
index fadea8882..6003bf24e 100644
--- a/jjb/ci-management/ci-management-coverity.yaml
+++ b/jjb/ci-management/ci-management-coverity.yaml
@@ -41,6 +41,7 @@
coverity-user-email: ''
coverity-search-paths: ''
coverity-search-exclude-regexs: ''
+ max-git-repo-age-hours: 0
stream: master
submodule-recursive: true
submodule-timeout: 10
@@ -101,6 +102,14 @@
name: DRY_RUN
default: '{dry-run}'
description: Do not submit results to Coverity Scan server at the end of the build.
+ - string:
+ name: 'MAX_GIT_REPO_AGE_HOURS'
+ default: '{max-git-repo-age-hours}'
+ description: >
+ If set to non-zero run the code scan only if there were no git
+ repository commits last MAX_GIT_REPO_AGE_HOURS hours.
+ It makes sense to set the value twice the 'cron' interval for the
+ job (e.g. if 'cron: @daily', then MAX_GIT_REPO_AGE_HOURS=48)
triggers:
- timed: '{obj:cron}'
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index c7fe3cf80..b919c1f2a 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -15,6 +15,8 @@
node: '{build-node}'
pattern: '**'
pom:
+ mvn-opts: ''
+ java-opts: ''
properties:
- infra-properties:
@@ -58,6 +60,10 @@
pom: '{obj:pom}'
goals: 'clean install -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}'
+ properties:
+ - MAVEN_OPTS='{mvn-opts}'
+ java-opts:
+ - "{java-opts}"
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index c015a674a..4d368afbc 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -22,7 +22,7 @@
mvn-settings: 'multicloud-k8s-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1604-builder-8c-8g
#- project:
# name: multicloud-k8s-arm64
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index b5f915094..f13cbb301 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -15,6 +15,9 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
+
project: 'oparent'
stream:
- 'master':
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index b0b61db0c..3579ab3c1 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -10,8 +10,8 @@
functionality:
- 'health'
trigger_jobs:
- - 'policy-engine-{stream}-merge-scm-mvn-script'
- - 'policy-drools-pdp-{stream}-merge-scm-mvn-script'
+ - 'policy-engine-{stream}-merge-java'
+ - 'policy-drools-pdp-{stream}-merge-java'
- 'policy-drools-applications-{stream}-merge-java'
robot-options: ''
build-timeout: 40
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 196fb2b96..4551f15c8 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -22,6 +22,8 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index ca0a873a4..a423fd613 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'release-2.6.0':
+ branch: 'release-2.6.0'
mvn-settings: 'portal-sdk-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 739beaf5b..7a2c2a71e 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -27,6 +27,8 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto-fluorine':
+ branch: 'elalto-fluorine'
mvn-settings: 'sdnc-apps-settings'
# due to a strange macro / variable translation problem this needs to be
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index a65e78065..8363700da 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto-fluorine':
+ branch: 'elalto-fluorine'
mvn-settings: 'sdnc-northbound-settings'
# due to a strange macro / variable translation problem this needs to be
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 695fa4ba1..73b58dd92 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -23,6 +23,8 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto-fluorine':
+ branch: 'elalto-fluorine'
mvn-settings: 'sdnc-oam-settings'
maven-version: "mvn35"
files: '**'
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 2d71fa2d8..09e9c2243 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -9,6 +9,8 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
project: 'so/libs'
stream:
- 'master':
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index d1f7217db..6ff962e91 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -21,6 +21,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-builder-4c-4g
project: 'so'
stream:
- 'master':
diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 943ea87ec..dca64eb31 100644
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -37,6 +37,7 @@
name: vvp-validation-scripts-tracability-matrix
project: 'vvp/validation-scripts'
project-name: 'vvp-validation-scripts'
+ build-node: ubuntu1604-docker-8c-8g
mvn-settings: 'vvp-validation-scripts-settings'
mvn-global-settings: 'global-settings'
stream: