diff options
33 files changed, 158 insertions, 40 deletions
diff --git a/global-jjb b/global-jjb -Subproject f09897651a64bbfa1d3424ca58d09cbb2af382c +Subproject 21009213aa6204bfb40eedc1b11f89a259abd91 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg index a54241965..57bc08268 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190926-155906.553 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200220-190206.299 LABELS=centos7-builder-2c-1g HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg index c583dd880..ef5f7235e 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190926-155906.553 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200220-190206.299 LABELS=centos7-builder-4c-4g HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg index 1829cfe50..fa6448ef5 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190926-164302.295 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200220-190109.738 LABELS=centos7-docker-8c-8g HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg index fbd283169..9018cf4bf 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855 LABELS=ubuntu1604-builder-2c-1g HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg index 7f2ebe842..610a33d7d 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855 LABELS=ubuntu1604-builder-4c-2g HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg index 2bf93caf6..ec5ae3e9a 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855 LABELS=ubuntu1604-builder-4c-4g HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg index f28c24ee2..65e930c9b 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855 LABELS=ubuntu1604-builder-8c-8g HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg new file mode 100644 index 000000000..7b9af8f46 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200219-191621.319 +LABELS=ubuntu1804-builder-4c-4g +HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg new file mode 100644 index 000000000..c4d05ac87 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200219-195603.229 +LABELS=ubuntu1804-docker-8c-8g +HARDWARE_ID=v2-highcpu-8 diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml new file mode 100644 index 000000000..68077b7b7 --- /dev/null +++ b/jjb/aaf/aaf-certservice-csit.yaml @@ -0,0 +1,14 @@ +- project: + name: aaf-certservice-csit + jobs: + - "{project-name}-{stream}-verify-csit-{functionality}" + - "{project-name}-{stream}-csit-{functionality}" + project-name: "aaf" + stream: + - "master": + branch: "master" + functionality: + - "certservice": + trigger_jobs: + - "aaf-certservice-{stream}-merge-java" + robot-options: "" diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 0515a51a5..5f10f9a5d 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -21,9 +21,9 @@ stream: - 'master': branch: 'master' + mvn-params: '-P spring-boot-2-1' - 'elalto': branch: 'elalto' - mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' files: '**' @@ -44,6 +44,7 @@ project: 'aai/aai-common' project-name: 'aai-aai-common' branch: 'master' + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -60,6 +61,7 @@ stream: - 'master': branch: 'master' + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' @@ -88,6 +90,7 @@ - 'master': branch: 'master' distro: 'alpine' + mvn-params: '-P spring-boot-2-1' docker_name: 'onap/aai-common-{distro}' docker_build_args: '-f ./Dockerfile.{distro}' docker_root: '$WORKSPACE/Dockerfiles/aai-common/' @@ -102,6 +105,7 @@ build-node: ubuntu1604-docker-8c-8g jobs: - gerrit-whitesource-scan + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' wss-product-name: 'aai' mvn-clean-install: true diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 25f47827b..2a9c7c1c5 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -28,6 +28,7 @@ branch: 'elalto' - 'master': branch: 'master' + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-model-loader-settings' files: '**' archive-artifacts: '' @@ -47,6 +48,7 @@ project: 'aai/model-loader' project-name: 'aai-model-loader' branch: 'master' + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-model-loader-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -61,6 +63,7 @@ stream: - 'master': branch: 'master' + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-model-loader-settings' - project: @@ -70,6 +73,7 @@ - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g project: aai/model-loader + mvn-params: '-P spring-boot-2-1' branch: master - project: @@ -79,6 +83,7 @@ jobs: - gerrit-whitesource-scan mvn-settings: 'aai-model-loader-settings' + mvn-params: '-P spring-boot-2-1' wss-product-name: 'aai' mvn-clean-install: true project: 'aai/model-loader' diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 779c9e3ff..b94302f91 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -6,6 +6,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dcaegen2/collectors/snmptrap' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index 9b8b58160..78d12ee4f 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -23,6 +23,8 @@ # build docker image - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - gerrit-release-verify + - gerrit-release-merge stream: - master: branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml index 911435c1a..847f052c3 100644 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml @@ -20,10 +20,13 @@ # project-name: # - subproject-name1: # src-dir: subproject-dir1 + # docker-name: onap/org.onap.dcaegen2.platform.something.name1 # - subproject-name2: # src-dir: subproject-dir2 + # docker-name: onap/org.onap.dcaegen2.platform.something.name2 # - subproject-name3: # src-dir: subproject-dir3 + # docker-name: onap/org.onap.dcaegen2.platform.something.name3 # stream: # - master: # branch: master @@ -39,7 +42,6 @@ nexus-iq-namespace: 'onap-' tox-dir: '{src-dir}' docker-root: '{src-dir}' - docker-name: 'onap/{project-name}' gerrit_trigger_file_paths: - compare-type: REG_EXP pattern: '{src-dir}/.*' @@ -68,20 +70,24 @@ mvn-settings: dcaegen2-platform-settings build-node: ubuntu1604-docker-8c-8g project-name: - - dcaegen2-platform-aoadapter: + - dcaegen2-platform-adapter-acumos: src-dir: adapter/acumos + docker-name: onap/org.onap.dcaegen2.platform.adapter.acumos - dcaegen2-platform-mod-distributorapi: src-dir: mod/distributorapi + docker-name: onap/org.onap.dcaegen2.platform.mod.distributorapi - dcaegen2-platform-mod-onboardingapi: src-dir: mod/onboardingapi + docker-name: onap/org.onap.dcaegen2.platform.mod.onboardingapi - dcaegen2-platform-oti-event-handler: src-dir: oti/event-handler + docker-name: onap/org.onap.dcaegen2.platform.oti.event-handler stream: - master: branch: master views: - project-view: - project-name: dcaegen2-platform-aoadapter + project-name: dcaegen2-platform-adapter - project-view: project-name: dcaegen2-platform-mod - project-view: diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml index 859badcdc..1c29e0415 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml @@ -8,7 +8,9 @@ - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g + project-name: dcaegen2-platform-mod-bpgenerator - gerrit-maven-stage: + project-name: dcaegen2-platform-mod-bpgenerator sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml index 2402dd06c..4cced95b0 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml @@ -8,6 +8,9 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java': mvn-goals: 'clean install' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project-name: dcaegen2-platform-mod-designtool subproject: - designtool: pom: 'mod/designtool/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml index f3ad499a1..513df2fa2 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -8,6 +8,9 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java': mvn-goals: 'clean install' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project-name: dcaegen2-platform-mod-genprocessor subproject: - genprocessor: pom: 'mod/genprocessor/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml index cdfd3c615..ed11903ce 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml @@ -8,6 +8,9 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java': mvn-goals: 'clean install' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project-name: dcaegen2-platform-mod-runtimeapi subproject: - runtimeapi: pom: 'mod/runtimeapi/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml index c38e1c84c..e5825be56 100644 --- a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml @@ -8,6 +8,10 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java': mvn-goals: 'clean install' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project-name: dcaegen2-platform-oti-event-proc + subproject: - eventproc: pom: 'oti/event-proc/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml index 81444df19..d2487ddaf 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -7,6 +7,9 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java': mvn-goals: 'clean install' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project-name: dcaegen2-services-bbs-event-processor subproject: - 'bbs-event-processor': pom: '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 93e46087d..a119ef98e 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -6,6 +6,9 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + subproject: - 'datalake-handler': pom: 'components/datalake-handler/pom.xml' @@ -50,6 +53,64 @@ build-node: 'ubuntu1604-docker-8c-8g' - project: + name: dcaegen2-services-datalake-handler-admin-ui-release + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-datalake-handler-admin-ui' + 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/admin/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-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/packages/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/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index bbf5b88c9..e9c85313a 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -6,6 +6,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dcaegen2/services/heartbeat' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml index 3eb59891b..20dcad43a 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml @@ -1,6 +1,7 @@ - project: name: dcaegen2-services-pmsh-csit jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: dcaegen2-services-pmsh recipients: 'lego@est.tech' @@ -8,7 +9,7 @@ - 'master': branch: 'master' functionality: - - 'testsuites': + - 'testsuite': trigger_jobs: - '{project-name}-{stream}-release-version-java-daily' robot-options: '' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 57753770b..39a89779f 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -30,10 +30,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - - '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 7c7094f8d..85293ea15 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -17,10 +17,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - - '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 53d26e3fd..c39db4017 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -26,15 +26,12 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - - 'elalto-fluorine': - branch: 'elalto-fluorine' mvn-settings: 'sdnc-oam-settings' maven-version: "mvn35" files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + shallow-clone: true mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml index 1a02f8faf..1ab686219 100644 --- a/jjb/sdnc/sdnc-oom.yaml +++ b/jjb/sdnc/sdnc-oom.yaml @@ -13,8 +13,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'sdnc-oom-settings' files: '**' diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 273e37747..04836243f 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -32,6 +32,7 @@ - project: name: vfc-nfvo-driver-sfc-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index 9fa63c617..8beb8d4cb 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -24,6 +24,7 @@ - project: name: vfc-nfvo-resmanagement-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index c15615081..992cd485f 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -34,6 +34,7 @@ - libssl-dev - libmysqlclient-dev - gcc + - python3-venv become: true when: ansible_distribution == 'Ubuntu' @@ -54,21 +55,24 @@ - libxml-xpath-perl - wget - make - - npm - sshuttle - netcat - libssl-dev - libffi-dev - become: true - when: ansible_distribution == 'Ubuntu' - - - name: Install autorelease support packages - apt: - name: - xmlstarlet - xvfb - crudini - maven - python-ncclient + - xmlstarlet + - xvfb + - crudini + - maven + - python-ncclient + - nodejs-dev + - node-gyp + - nodejs + - npm + update_cache: yes become: true when: ansible_distribution == 'Ubuntu' diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index 7b9f9c0c6..37e857fdd 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -88,6 +88,7 @@ - libssl-dev - libmysqlclient-dev - gcc + - python3-venv become: true when: ansible_distribution == 'Ubuntu' @@ -108,22 +109,25 @@ - libxml-xpath-perl - wget - make - - npm - sshuttle - netcat - libssl-dev - libffi-dev - become: true - when: ansible_distribution == 'Ubuntu' - - - name: Install autorelease support packages - apt: - name: - xmlstarlet - xvfb - crudini - maven - python-ncclient + - xmlstarlet + - xvfb + - crudini + - maven + - python-ncclient + - nodejs-dev + - node-gyp + - nodejs + - npm + update_cache: yes become: true when: ansible_distribution == 'Ubuntu' |