summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------global-jjb0
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg2
-rw-r--r--jjb/ccsdk/apps.yaml3
-rw-r--r--jjb/ccsdk/cds.yaml4
-rw-r--r--jjb/ccsdk/dashboard.yaml2
-rw-r--r--jjb/ccsdk/distribution.yaml6
-rw-r--r--jjb/ccsdk/features.yaml4
-rw-r--r--jjb/ccsdk/parent.yaml4
-rw-r--r--jjb/ccsdk/platform-plugins.yaml2
-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/dcaegen2/dcaegen2-services-datalake-handler.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-docker.yaml2
-rw-r--r--jjb/integration/integration-templates-csit.yaml24
-rw-r--r--jjb/modeling/modeling-etsicatalog.yaml5
-rw-r--r--jjb/modeling/modeling-toscaparsers-nfvparser.yaml5
-rw-r--r--jjb/optf/optf-cmso.yaml4
-rw-r--r--jjb/policy/policy-gui.yaml70
-rw-r--r--jjb/sdc/sdc.yaml1
-rw-r--r--jjb/sdnc/sdnc-apps.yaml2
-rw-r--r--jjb/sdnc/sdnc-oam.yaml2
-rw-r--r--packer/provision/helm.yaml2
24 files changed, 119 insertions, 43 deletions
diff --git a/global-jjb b/global-jjb
-Subproject a2cfbc66e675655ed0fb7d76862fdc044d96678
+Subproject 1fb55e807d49e36b27d94d0c411c6907d221606
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
index 8f57b1d3c..fb013cdb5 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm - - 20190925-211723.485
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm - - 20200124-210936.289
LABELS=ubuntu1604-helm-2c-1g
HARDWARE_ID=v2-highcpu-2
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 174f5292c..8a97a17b4 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -22,6 +22,7 @@
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
+ cron: '@daily'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
@@ -29,8 +30,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
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
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 7e6645d22..91fb43203 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -18,7 +18,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
maven-versions-plugin: true
- cron: ''
+ cron: '@daily'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
@@ -26,8 +26,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
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
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 8b01af930..497249a4b 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -16,8 +16,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-dashboard-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
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 8e9c9acc1..eab7aa874 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -18,17 +18,13 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
maven-versions-plugin: true
- cron: ''
+ cron: '@daily'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'ccsdk/distribution'
stream:
- 'master':
branch: 'master'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-distribution-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 37f13eff3..fc8b655f7 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -17,10 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
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
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index a6ff815ff..4a7396811 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -19,10 +19,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
- - 'elalto':
- branch: 'elalto'
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
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index 9ee150456..6a943f0cd 100644
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -17,8 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-platform-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
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 7e83f0038..1a0e10645 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -17,10 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
- - 'elalto':
- branch: 'elalto'
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
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 73d5b0b1c..088a9e015 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -17,10 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
- - 'elalto':
- branch: 'elalto'
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
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index cbd12c4cb..7e296da04 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -17,10 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
- - 'elalto':
- branch: 'elalto'
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
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 0997bffe7..c955eddcb 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -17,10 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
- - 'elalto':
- branch: 'elalto'
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
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 81c70d15f..886949f0b 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -35,7 +35,7 @@
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/pom.xml'
+ mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/feeder/pom.xml'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
pattern: 'components/datalake-handler/**'
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index d044ba10f..21a8ba535 100644
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -10,6 +10,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/messagerouter/messageservice'
stream:
- 'master':
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 10b713e46..b7b92fde5 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -7,6 +7,7 @@
build-node: 'ubuntu1604-docker-8c-8g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -43,6 +44,8 @@
files: '**/{project-name}/**'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -66,6 +69,7 @@
build-node: 'ubuntu1604-docker-arm64-4c-2g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -102,6 +106,8 @@
files: '**/{project-name}/**'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -125,6 +131,7 @@
build-node: 'ubuntu1604-docker-8c-8g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -165,6 +172,8 @@
files: '**/{project-name}/**'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -206,6 +215,7 @@
build-node: 'ubuntu1604-docker-arm64-4c-2g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -246,6 +256,8 @@
files: '**/{project-name}/**'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -287,6 +299,7 @@
build-node: 'ubuntu1604-docker-8c-8g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -326,6 +339,8 @@
jobs: '{obj:trigger_jobs}'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -349,6 +364,7 @@
build-node: 'ubuntu1604-docker-arm64-4c-2g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -388,6 +404,8 @@
jobs: '{obj:trigger_jobs}'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -411,6 +429,7 @@
build-node: 'ubuntu1604-docker-8c-8g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -454,6 +473,8 @@
jobs: '{obj:trigger_jobs}'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -495,6 +516,7 @@
build-node: 'ubuntu1604-docker-arm64-4c-2g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -538,6 +560,8 @@
jobs: '{obj:trigger_jobs}'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
index 0d8e74d5f..a58af1cc9 100644
--- a/jjb/modeling/modeling-etsicatalog.yaml
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -34,6 +34,11 @@
name: modeling-etsicatalog-sonar
jobs:
- gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
build-node: centos7-redis-4c-4g
project: 'modeling/etsicatalog'
diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index 4ff6b3d25..8e6a8e6cd 100644
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -28,6 +28,11 @@
name: modeling-toscaparsers-nfvparser-sonar
jobs:
- gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'modeling/toscaparsers'
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index b099e8273..b4ba62312 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -34,6 +34,8 @@
- 'elalto':
branch: 'elalto'
mvn-settings: 'optf-cmso-settings'
+ java-version: openjdk11
+
subproject:
- 'cmso':
path: '.'
@@ -58,6 +60,7 @@
mvn-settings: 'optf-cmso-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
- project:
name: optf-cmso-clm
@@ -74,6 +77,7 @@
- 'elalto':
branch: 'elalto'
mvn-settings: 'optf-cmso-settings'
+ java-version: openjdk11
- project:
name: optf-cmso-info
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
new file mode 100644
index 000000000..8ec46fc4c
--- /dev/null
+++ b/jjb/policy/policy-gui.yaml
@@ -0,0 +1,70 @@
+---
+- project:
+ name: policy-gui
+ project-name: 'policy-gui'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java':
+ docker-pom: 'pom.xml'
+ mvn-params: '-P docker'
+ build-node: ubuntu1604-docker-4c-4g
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1604-docker-4c-4g
+ 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':
+ build-node: centos7-builder-4c-4g
+
+ project: 'policy/gui'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'policy-gui-settings'
+ java-version: openjdk11
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-builder-4c-4g
+
+- project:
+ name: policy-gui-sonar
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: '{sonar_mvn_goal}'
+ cron: '@daily'
+ build-node: ubuntu1604-builder-4c-4g
+ project: 'policy/gui'
+ project-name: 'policy-gui'
+ branch: 'master'
+ mvn-settings: 'policy-gui-settings'
+ java-version: openjdk11
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-gui-clm
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: policy/gui
+ project-name: 'policy-gui'
+ branch: 'master'
+ mvn-settings: 'policy-gui-settings'
+ java-version: openjdk11
+
+- project:
+ name: policy-gui-info
+ project-name: policy-gui
+ jobs:
+ - gerrit-info-yaml-verify
+ project: policy/gui
+ branch: master
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 1d3b37e0c..8a8c6b48d 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -35,6 +35,7 @@
mvn-profile: 'docker'
mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
- gerrit-maven-stage:
+ build-timeout: 90
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index f79693483..57753770b 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -22,7 +22,7 @@
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
- cron: ''
+ cron: '@daily'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 38c60612c..53d26e3fd 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -19,7 +19,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
maven-versions-plugin: true
- cron: ''
+ cron: '@daily'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'sdnc/oam'
diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index e3b808681..daed68127 100644
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -7,7 +7,7 @@
vars:
kubectl_version: 1.11.2
- helm_version: 2.9.1
+ helm_version: 2.12.3
tasks:
- name: 'Install kubectl {{kubectl_version}}'