diff options
33 files changed, 151 insertions, 94 deletions
diff --git a/global-jjb b/global-jjb -Subproject f09897651a64bbfa1d3424ca58d09cbb2af382c +Subproject 21009213aa6204bfb40eedc1b11f89a259abd91 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 111d8a7e4..fbd283169 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 - 20191007-191710.199 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898 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 cb9b2776a..7f2ebe842 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 - 20191007-191710.199 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898 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 118044308..2bf93caf6 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 - 20191007-191710.199 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898 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 2d4bd3781..f28c24ee2 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 - 20191007-191710.199 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898 LABELS=ubuntu1604-builder-8c-8g HARDWARE_ID=v2-highcpu-8 diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml index 92c538652..8efdb438f 100644 --- a/jjb/aaf/aaf-certservice.yaml +++ b/jjb/aaf/aaf-certservice.yaml @@ -2,42 +2,34 @@ - project: name: aaf-certservice project-name: 'aaf-certservice' - subproject: 'aaf-certservice-ws' - path: 'certService' - java-version: openjdk11 - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - build-node: 'ubuntu1604-docker-v1-8c-8g' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-pom: 'certService/pom.xml' - - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-v1-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -DskipTests=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: 'aaf/certservice' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + java-version: openjdk11 + project: 'aaf/certservice' mvn-settings: 'aaf-certservice-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 in the job - maven-deploy-properties: | - deployAtEnd=true files: '**' + maven-deploy-properties: | + deployAtEnd=true archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' + build-node: ubuntu1604-docker-8c-8g + jobs: + - '{project-name}-{stream}-verify-java': + mvn-goals: 'clean install' + - '{project-name}-{stream}-merge-java': + mvn-goals: 'clean deploy' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-goals: 'clean deploy -P docker' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false' - project: name: aaf-certservice-sonar diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index a21f0c9a3..5f10f9a5d 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -21,6 +21,7 @@ stream: - 'master': branch: 'master' + mvn-params: '-P spring-boot-2-1' - 'elalto': branch: 'elalto' mvn-settings: 'aai-aai-common-settings' @@ -43,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' @@ -59,6 +61,7 @@ stream: - 'master': branch: 'master' + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' @@ -87,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/' @@ -101,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/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index 7d3fd7868..d292bf4e8 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -36,6 +36,7 @@ - centos-7 - ubuntu-16.04 - ubuntu-16.04-arm64 + - ubuntu-18.04 templates: docker - project: diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index d101fba64..a171bde69 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -34,6 +34,25 @@ mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false' - project: + name: dcaegen2-collectors-hv-ves-sonar + java-version: openjdk11 + 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-docker-8c-8g + project: 'dcaegen2/collectors/hv-ves' + project-name: 'dcaegen2-collectors-hv-ves' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-hv-ves-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: name: dcaegen2-collectors-hv-ves-clm java-version: openjdk11 jobs: 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-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml index 859badcdc..d7a8a6fe9 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml @@ -8,6 +8,7 @@ - '{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: sign-artifacts: true build-node: centos7-builder-4c-4g 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..7d86a1e6a 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' 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/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index ba2f74e2e..6305828d9 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -5,15 +5,22 @@ # The purpose of this job template is to run: # 1. make build # - # golangver can be set to golang110 or golang111 + # golangver can be set to golang110, golang111 or golang112 # depending on what version is needed by the project # default is golang110 # # Required Variables: # branch: git branch (eg. stable/lithium or master) + # + # Optional Variables: + # script: build script to execute + # pattern: ant file-path pattern relative to the workspace used to + # trigger the job name: '{project-name}-{stream}-verify-golang' path: '$WORKSPACE' + pattern: '**' + script: '' golangver: 'golang110' project-type: freestyle @@ -47,7 +54,7 @@ server: '{server-name}' project: '{project}' branch: '{branch}' - files: '**' + files: '{pattern}' builders: - lf-infra-pre-build @@ -58,6 +65,7 @@ #!/bin/bash cd $WORKSPACE/{path} make build + - shell: '{script}' publishers: - infra-shiplogs: diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 31bda6ebd..453dc752a 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -43,3 +43,25 @@ jobs: - '{project-name}-{stream}-verify-vagrantfile' + +- project: + name: integration-verify-golang + project-name: 'integration' + project: 'integration' + golangver: 'golang112' + mvn-settings: 'integration-settings' + archive-artifacts: '' + build-node: ubuntu1604-builder-2c-1g + jobs: + - '{project-name}-{stream}-verify-golang': + script: '{build_script}' + path: 'test/security/k8s' + pattern: '{path}/**' + stream: + - 'master': + branch: 'master' + build_script: | + #!/bin/bash + set -ex # Fail build if any setup step fails + cd test/security/k8s + make test diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 5d936a81f..62947a081 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -52,6 +52,7 @@ # archive-artifacts: '' # build-node: ubuntu1604-docker-arm64-4c-2g # + - project: name: logging-analytics-sonar jobs: @@ -72,43 +73,24 @@ - project: name: logging-analytics-pylog - project-name: 'logging-analytics-pylog' + project-name: 'logging-analytics' project: 'logging-analytics' - python-version: python3 + python-version: python3.6 + tox-dir: 'pylog/' + tox-envs: '' stream: - 'master': branch: 'master' + build-node: ubuntu1604-builder-4c-4g mvn-settings: 'logging-analytics-settings' subproject: - 'pylog': - pom: 'pylog/pom.xml' pattern: 'pylog/**' - tox-dir: pylog/ - tox-envs: '' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{subproject}-python-staging-{stream}' - - '{project-name}-{subproject}-python-release-{stream}' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g - -- project: - name: logging-analytics-pylog-python - project-name: 'logging-analytics-pylog' - project: 'logging-analytics' - stream: - - 'master': - branch: 'master' - mvn-settings: 'logging-analytics-settings' - build-node: 'ubuntu1604-builder-4c-4g' - subproject: - - 'pylog': path: 'pylog' - pattern: 'pylog/**' jobs: - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{subproject}-python-staging-{stream}' + - '{project-name}-{subproject}-python-release-{stream}' - project: name: logging-analytics-info diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index 8ec46fc4c..924ea3786 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -7,13 +7,13 @@ - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' mvn-params: '-P docker' - build-node: ubuntu1604-docker-4c-4g + build-node: ubuntu1604-docker-8c-8g - 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 + build-node: ubuntu1604-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' 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/common-packer b/packer/common-packer -Subproject 57648e1600c3c2457900ad4872f26d8f5cd679c +Subproject d5fc82ea247c96744ac7610476f5df10614f366 diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index c15615081..a9b0bd6f9 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -54,21 +54,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 + - libssl1.0-dev + - 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..6c114b5a9 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -108,22 +108,26 @@ - 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 + - libssl1.0-dev + - nodejs + - npm + update_cache: yes become: true when: ansible_distribution == 'Ubuntu' |