Merge "Increase thread stack size for Graal in apex-pdp"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Tue, 3 Mar 2020 17:37:38 +0000 (17:37 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 3 Mar 2020 17:37:38 +0000 (17:37 +0000)
141 files changed:
global-jjb
jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg [new file with mode: 0644]
jenkins-config/global-vars-production.sh
jenkins-config/global-vars-sandbox.sh
jjb/aaf/aaf-certservice-csit.yaml [new file with mode: 0644]
jjb/aaf/aaf-certservice.yaml [new file with mode: 0644]
jjb/aai/aai-aai-common.yaml
jjb/aai/aai-model-loader.yaml
jjb/appc/appc-cdt.yaml
jjb/appc/appc-deployment.yaml
jjb/appc/appc-master.yaml
jjb/appc/appc-parent.yaml
jjb/ccsdk/apps.yaml
jjb/ccsdk/cds.yaml
jjb/ccsdk/dashboard.yaml
jjb/ccsdk/distribution.yaml
jjb/ccsdk/features.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/platform-plugins.yaml
jjb/ccsdk/sli-adaptors.yaml
jjb/ccsdk/sli-core.yaml
jjb/ccsdk/sli-northbound.yaml
jjb/ccsdk/sli-plugins.yaml
jjb/ci-management/ci-management-packer-jobs.yaml
jjb/clamp/clamp.yaml
jjb/clamp/dashboard/clamp-dashboard.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
jjb/dcaegen2/dcaegen2-analytics-tca.yaml
jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
jjb/dcaegen2/dcaegen2-collectors-ves.yaml
jjb/dcaegen2/dcaegen2-deployments.yaml
jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
jjb/dcaegen2/dcaegen2-platform-plugins.yaml
jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
jjb/dcaegen2/dcaegen2-platform.yaml
jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
jjb/dcaegen2/dcaegen2-services-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml [deleted file]
jjb/dcaegen2/dcaegen2-services-prh.yaml
jjb/dcaegen2/dcaegen2-services-sdk.yaml
jjb/dcaegen2/dcaegen2-services-son-handler.yaml
jjb/dcaegen2/dcaegen2-services.yaml
jjb/dcaegen2/dcaegen2-utils.yaml
jjb/dcaegen2/dcaegen2.yaml
jjb/dmaap/dmaap-datarouter.yaml
jjb/dmaap/dmaap-dbcapi.yaml
jjb/dmaap/dmaap-kafka.yaml
jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
jjb/dmaap/dmaap-messagerouter-docker.yaml
jjb/dmaap/dmaap-messagerouter-messageservice.yaml
jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
jjb/doc/doc-templates-rtd.yaml
jjb/global-templates-golang.yaml
jjb/holmes/holmes-common.yaml
jjb/holmes/holmes-engine-mgt.yaml
jjb/holmes/holmes-rule-mgt.yaml
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates-csit.yaml
jjb/integration/integration-templates.yaml [new file with mode: 0644]
jjb/integration/integration.yaml
jjb/integration/vagrantfile-verify.sh [new file with mode: 0644]
jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
jjb/logging-analytics/logging-analytics.yaml
jjb/modeling/modeling-etsicatalog.yaml
jjb/modeling/modeling-toscaparsers-nfvparser.yaml
jjb/multicloud/multicloud-openstack.yaml
jjb/oom/offline-installer.yaml
jjb/optf/optf-cmso.yaml
jjb/optf/optf-osdf.yaml
jjb/policy/policy-csit.yaml
jjb/policy/policy-gui.yaml [new file with mode: 0644]
jjb/rtdv3/rtdv3.yaml [new file with mode: 0644]
jjb/sdc/sdc-sdc-docker-base.yaml
jjb/sdc/sdc-sdc-workflow-designer.yaml
jjb/sdc/sdc.yaml
jjb/sdnc/sdnc-apps.yaml
jjb/sdnc/sdnc-northbound.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/sdnc/sdnc-oom.yaml
jjb/testsuite/testsuite-oom.yaml [new file with mode: 0644]
jjb/usecaseui/usecase-ui-server.yaml
jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
jjb/vfc/vfc-gvnfm-vnfres-java.yaml
jjb/vfc/vfc-nfvo-catalog.yaml
jjb/vfc/vfc-nfvo-driver-ems-java.yaml
jjb/vfc/vfc-nfvo-driver-sfc.yaml
jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
jjb/vfc/vfc-nfvo-lcm-java.yaml
jjb/vfc/vfc-nfvo-multivimproxy.yaml
jjb/vfc/vfc-nfvo-resmanagement.yaml
jjb/vfc/vfc-nfvo-wfengine-java.yaml
jjb/vnfrqts/pre-build-needs.sh
jjb/vvp/vvp-em.yaml [new file with mode: 0644]
jjb/vvp/vvp-oom.yaml [new file with mode: 0644]
jjb/vvp/vvp-regression.yaml [new file with mode: 0644]
jjb/vvp/vvp-test-engine.yaml [new file with mode: 0644]
jjb/vvp/vvp-validation-scripts.yaml
packer/common-packer
packer/provision/helm.yaml
packer/provision/local-builder.yaml
packer/provision/local-docker.yaml
shell/run_releasedockerhub.sh

index a2cfbc6..2100921 160000 (submodule)
@@ -1 +1 @@
-Subproject commit a2cfbc66e675655ed0fb7d76862fdc044d96678d
+Subproject commit 21009213aa6204bfb40eedc1b11f89a259abd917
index a542419..a5b4bd9 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190926-155906.553
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
 LABELS=centos7-builder-2c-1g
 HARDWARE_ID=v2-highcpu-2
index c583dd8..209cb0e 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190926-155906.553
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
 LABELS=centos7-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
index 1829cfe..edbfd34 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190926-164302.295
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200224-195343.324
 LABELS=centos7-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8
index 75014db..37a375a 100644 (file)
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200220-113128.675
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1
index 111d8a7..9018cf4 100644 (file)
@@ -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 - 20200220-190142.855
 LABELS=ubuntu1604-builder-2c-1g
 HARDWARE_ID=v2-highcpu-2
index cb9b277..610a33d 100644 (file)
@@ -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 - 20200220-190142.855
 LABELS=ubuntu1604-builder-4c-2g
 HARDWARE_ID=v2-highcpu-4
index 1180443..ec5ae3e 100644 (file)
@@ -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 - 20200220-190142.855
 LABELS=ubuntu1604-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
index 2d4bd37..65e930c 100644 (file)
@@ -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 - 20200220-190142.855
 LABELS=ubuntu1604-builder-8c-8g
 HARDWARE_ID=v2-highcpu-8
index 8f57b1d..fb013cd 100644 (file)
@@ -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/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 (file)
index 0000000..7b9af8f
--- /dev/null
@@ -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 (file)
index 0000000..c4d05ac
--- /dev/null
@@ -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
index 7b124aa..d450c7b 100644 (file)
@@ -19,3 +19,4 @@ SIGUL_BRIDGE_IP=10.30.104.3
 SIGUL_KEY=onap-release-2018
 SILO=production
 SONAR_URL=https://sonar.onap.org
+MASTER_RTD_PROJECT=doc
index 146fe6e..412f808 100644 (file)
@@ -19,3 +19,4 @@ SIGUL_BRIDGE_IP=10.30.104.3
 SIGUL_KEY=onap-test
 SILO=sandbox
 SONAR_URL=https://sonar.onap.org
+MASTER_RTD_PROJECT=doc-test
diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml
new file mode 100644 (file)
index 0000000..68077b7
--- /dev/null
@@ -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/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml
new file mode 100644 (file)
index 0000000..8efdb43
--- /dev/null
@@ -0,0 +1,63 @@
+---
+- project:
+    name: aaf-certservice
+    project-name: 'aaf-certservice'
+    stream:
+        -   'master':
+                branch: 'master'
+                java-version: openjdk11
+    project: 'aaf/certservice'
+    mvn-settings: 'aaf-certservice-settings'
+    files: '**'
+    maven-deploy-properties: |
+        deployAtEnd=true
+    archive-artifacts: ''
+    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
+    subproject: 'aaf-certservice-ws'
+    path: 'certService'
+    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: 'aaf/certservice'
+    project-name: 'aaf-certservice'
+    branch: 'master'
+    mvn-settings: 'aaf-certservice-settings'
+    mvn-pom: 'certService/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aaf-certservice-info
+    project-name: aaf-certservice
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: aaf/certservice
+    branch: master
index a21f0c9..5f10f9a 100644 (file)
@@ -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/'
     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
index 25f4782..2a9c7c1 100644 (file)
@@ -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'
index d52ef08..9a2c190 100644 (file)
@@ -16,8 +16,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'appc-cdt-settings'
     files: '**'
     archive-artifacts: ''
index 1a569c0..a4ef267 100644 (file)
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'appc-deployment-settings'
     maven-version: "mvn35"
     files: '**'
           mvn-params: '-Dmaven.test.skip=true'
       - 'docker-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-versions-plugin: true
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+          java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'appc/deployment'
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'appc-deployment-settings'
     maven-version: "mvn35"
     files: '**'
index 1e49704..dd7353f 100644 (file)
@@ -26,8 +26,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'appc-settings'
     maven-version: "mvn35"
     files: '**'
index 0ff2d48..897028c 100644 (file)
@@ -22,8 +22,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'appc-parent-settings'
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-2c-1g
index 174f529..8a97a17 100644 (file)
@@ -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
index 7e6645d..91fb432 100644 (file)
@@ -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
index 8b01af9..764aba8 100644 (file)
           cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
+      - 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: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+          maven-versions-plugin: true
+          cron: '@daily'
 
     project: 'ccsdk/dashboard'
     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
index 8e9c9ac..eab7aa8 100644 (file)
           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: ''
index 37f13ef..fc8b655 100644 (file)
     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
index a6ff815..4a73968 100644 (file)
     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
index 9ee1504..6a943f0 100644 (file)
@@ -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
index 7e83f00..8db8e3e 100644 (file)
@@ -10,6 +10,9 @@
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
           cron: ''
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-site-id: ecomp-site
+          javadoc-path: org.onap.$PROJECT/$STREAM
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
     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
index 73d5b0b..f4996b9 100644 (file)
@@ -10,6 +10,9 @@
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
           cron: ''
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-site-id: ecomp-site
+          javadoc-path: org.onap.$PROJECT/$STREAM
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
     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
index cbd12c4..ebe19d4 100644 (file)
@@ -9,6 +9,9 @@
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           cron: ''
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-site-id: ecomp-site
+          javadoc-path: org.onap.$PROJECT/$STREAM
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
     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
index 0997bff..c631f64 100644 (file)
@@ -10,6 +10,9 @@
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
           cron: ''
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-site-id: ecomp-site
+          javadoc-path: org.onap.$PROJECT/$STREAM
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
     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
index 7d3fd78..d292bf4 100644 (file)
@@ -36,6 +36,7 @@
       - centos-7
       - ubuntu-16.04
       - ubuntu-16.04-arm64
+      - ubuntu-18.04
     templates: docker
 
 - project:
index 79a39f6..dae2418 100644 (file)
@@ -31,8 +31,8 @@
     stream:
         - 'master':
               branch: 'master'
-        - 'dublin':
-              branch: 'dublin'
+        - 'elalto':
+              branch: 'elalto'
     mvn-settings: 'clamp-settings'
     java-version: openjdk11
     files: '**'
diff --git a/jjb/clamp/dashboard/clamp-dashboard.yaml b/jjb/clamp/dashboard/clamp-dashboard.yaml
new file mode 100644 (file)
index 0000000..2cea7f5
--- /dev/null
@@ -0,0 +1,72 @@
+---
+- project:
+    name: clamp-dashboard-project-view
+    project-name: clamp-dashboard
+    views:
+      - project-view
+
+- project:
+    name: clamp-dashboard
+    project-name: 'clamp-dashboard'
+    jobs:
+      - gerrit-maven-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+      - '{project-name}-{stream}-verify-java-checkstyle':
+         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+      - '{project-name}-{stream}-merge-properties-java':
+         mvn_properties:
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+    project: 'clamp/dashboard'
+    stream:
+        - 'master':
+              branch: 'master'
+    mvn-settings: 'clamp-settings'
+    java-version: openjdk11
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-8c-8g
+
+#- project:
+#    name: clamp-dashboard-sonar
+#    jobs:
+#      - gerrit-maven-sonar:
+#          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+#    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: 'clamp/dashboard'
+#    project-name: 'clamp-dashboard'
+#    branch: 'master'
+#    mvn-settings: 'clamp-settings'
+#    mvn-goals: 'clean install'
+#    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+#    java-version: openjdk11
+#
+- project:
+    name: clamp-dashboard-clm
+    jobs:
+      - gerrit-maven-clm:
+         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+    nexus-iq-namespace: 'onap-'
+    project: 'clamp/dashboard'
+    project-name: 'clamp-dashboard'
+    branch: 'master'
+    mvn-settings: 'clamp-settings'
+    build-node: ubuntu1604-docker-8c-8g
+    build-timeout: 120
+    java-version: openjdk11
index 7dba3af..49a1d53 100644 (file)
     name: dcaegen2-analytics-pnda-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: 'dcaegen2/analytics/pnda'
index c3b7ed1..0b97d5a 100644 (file)
     name: dcaegen2-analytics-tca-gen2-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-docker-8c-8g
     project: 'dcaegen2/analytics/tca-gen2'
index 21f605f..2e2296c 100644 (file)
     name: dcaegen2-analytics-tca-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: 'dcaegen2/analytics/tca'
index 89eb6b6..733f9c4 100644 (file)
@@ -6,8 +6,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     # apply to all jobs
     project: 'dcaegen2/collectors/datafile'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
     name: dcaegen2-collectors-datafile-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-docker-8c-8g
     project: 'dcaegen2/collectors/datafile'
index ab4e9f5..a171bde 100644 (file)
@@ -7,8 +7,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'elalto':
-          branch: 'elalto'
     # apply to all jobs
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
           container-staging-registry: 'nexus3.onap.org:10003'
           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
index 90f26ef..72c5a55 100644 (file)
     name: dcaegen2-collectors-restconf-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-docker-8c-8g
     project: 'dcaegen2/collectors/restconf'
index 02be8dd..b94302f 100644 (file)
@@ -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:
     name: dcaegen2-collectors-snmptrap-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: 'dcaegen2/collectors/snmptrap'
index d507433..43201bd 100644 (file)
     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/ves'
index b707826..c07a546 100644 (file)
@@ -12,8 +12,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'dcaegen2-deployments-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index c00ded6..450bd4f 100644 (file)
@@ -6,13 +6,12 @@
       - '{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/platform/blueprints'
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'dcaegen2-platform-blueprints-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 670b71d..78d12ee 100644 (file)
       # 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
-      - elalto:
-          branch: elalto
 
 - project:
     name: dcaegen2-platform-configbinding-sonar
index 68d4f96..c03f0d2 100644 (file)
@@ -12,8 +12,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 911435c..685582e 100644 (file)
     #    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}/.*'
           cron: '@daily'
           stream: master
           branch: master
-      - gerrit-release-verify
-      - gerrit-release-merge
+          sonarcloud: true
+          sonarcloud-project-organization: '{sonarcloud_project_organization}'
+          sonarcloud-api-token: '{sonarcloud_api_token}'
+          sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
 
 - project:
     name: dcaegen2-platform-docker-python-subprojects
     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:
index f1a67cd..6f97d6f 100644 (file)
@@ -21,8 +21,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
     name: dcaegen2-platform-inventory-api-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: 'dcaegen2/platform/inventory-api'
index 859badc..855be90 100644 (file)
@@ -6,9 +6,8 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
       - gerrit-maven-stage:
+          project-name: dcaegen2-platform-mod-bpgenerator
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
index f7a8bac..f3ad499 100644 (file)
     name: dcaegen2-platform-mod-genprocessor-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-docker-8c-8g
     project: 'dcaegen2/platform'
index 368e5c5..cdfd3c6 100644 (file)
     name: dcaegen2-platform-mod-runtimeapi-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-docker-8c-8g
     project: 'dcaegen2/platform'
index b4c5864..c38e1c8 100644 (file)
     name: dcaegen2-platform-oti-event-proc-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-docker-8c-8g
     project: 'dcaegen2/platform'
index 5d57fd1..31d7d11 100644 (file)
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'dcaegen2-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
     name: dcaegen2-platform-plugins-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: 'dcaegen2/platform/plugins'
index 7ceef5e..7d403d2 100644 (file)
     name: dcaegen2-platform-policy-handler-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: 'dcaegen2/platform/policy-handler'
index 81c9b13..db819a1 100644 (file)
@@ -21,8 +21,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
 
     mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
     # due to a strange macro / variable translation problem this needs
index fa8af0d..23d22ed 100644 (file)
@@ -7,3 +7,13 @@
     build-node: centos7-builder-2c-1g
     project: dcaegen2/platform
     branch: master
+
+- project:
+    name: dcaegen2-platform-release
+    project-name: dcaegen2-platform
+    mvn-settings: dcaegen2-platform-settings
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+    build-node: centos7-docker-8c-8g
+    project: dcaegen2/platform
+    branch: master
index bb087d8..32e4856 100644 (file)
@@ -14,6 +14,7 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -45,6 +46,7 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
 
 - project:
     name: dcaegen2-services-bbs-event-processor-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-builder-4c-4g
     project: 'dcaegen2/services'
@@ -68,6 +76,7 @@
 
 - project:
     name: dcaegen2-services-bbs-event-processor-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
index 81c70d1..3b6d678 100644 (file)
           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/**'
+    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-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/init_db/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           pattern: 'components/datalake-handler/**'
     name: dcaegen2-services-datalake-handler-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-docker-8c-8g
     project: 'dcaegen2/services'
diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
new file mode 100644 (file)
index 0000000..be95546
--- /dev/null
@@ -0,0 +1,89 @@
+---
+- job-group:
+    # This job group contains all the jobs that should be deployed for
+    # a subproject of dcaegen2/services that builds a Docker image from
+    # Python code.
+    #
+    # Required parameters:
+    #  build-node: The node to run build on.
+    #  mvn-settings: Maven settings.xml file containing credentials to use.
+    #  project-name: The job name prefix
+    #  src-dir: The subdirectory of the repository containing subproject code
+    #  stream: The stream to build
+    #  branch: The branch to build
+    #
+    #  Note: Multiple subprojects can be built with a single JJB project
+    #  by specifying the value of project-name as a list.
+    #  Similarly, multiple streams can be built with a single JJB project
+    #  by specifying the value of the stream as a list.
+    #  For example:
+    #    project-name:
+    #      - subproject-name1:
+    #          src-dir: subproject-dir1
+    #          docker-name: onap/org.onap.dcaegen2.services.something.name1
+    #      - subproject-name2:
+    #          src-dir: subproject-dir2
+    #          docker-name: onap/org.onap.dcaegen2.services.something.name2
+    #      - subproject-name3:
+    #          src-dir: subproject-dir3
+    #          docker-name: onap/org.onap.dcaegen2.services.something.name3
+    #    stream:
+    #      - master:
+    #          branch: master
+    #      - release1:
+    #          branch: release1.0
+    #    jobs:
+    #      - dcaegen2-docker-python-jobs
+
+    name: '{project-name}-docker-python-jobs'
+    id: dcaegen2-services-docker-python-jobs
+    container-tag-method: latest
+    docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
+    nexus-iq-namespace: 'onap-'
+    tox-dir: '{src-dir}'
+    tox-envs: 'py3'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    python-version: python3
+    wss-product-name: '{project-name}'
+    docker-root: '{src-dir}'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '{src-dir}/.*'
+    jobs:
+      - gerrit-tox-verify:
+          stream: master
+          branch: 'master'
+      - gerrit-docker-verify
+      - gerrit-docker-merge
+      - gerrit-whitesource-scan:
+          build-timeout: 120
+          submodule-timeout: 30
+          java-opts: '-Xmx2048m'
+          mvn-pom: '{src-dir}/pom.xml'
+      - gerrit-tox-sonar:
+          # workaround because gerrit-tox-sonar doesn't support mvn-params/opts
+          sonar-mvn-goal: '-f {src-dir}/pom.xml sonar:sonar'
+          cron: '@daily'
+          stream: master
+          branch: master
+
+- project:
+    name: dcaegen2-services-docker-python-subprojects
+    project: dcaegen2/services
+    mvn-settings: dcaegen2-services-settings
+    build-node: ubuntu1804-docker-8c-8g
+    project-name:
+      - dcaegen2-services-pmsh:
+          src-dir: components/pm-subscription-handler
+          docker-name: onap/org.onap.dcaegen2.services.pmsh
+    stream:
+      - master:
+          branch: master
+    views:
+      - project-view:
+          project-name: dcaegen2-services-pmsh
+    jobs:
+      - dcaegen2-services-docker-python-jobs
index b8ff328..e9c8531 100644 (file)
@@ -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:
     name: dcaegen2-services-heartbeat-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
+    build-node: ubuntu1604-docker-8c-8g
     project: 'dcaegen2/services/heartbeat'
     project-name: 'dcaegen2-services-heartbeat'
     branch: 'master'
index e82cf47..76c1337 100644 (file)
@@ -21,8 +21,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'dcaegen2-services-mapper-settings'
     files: '**'
     archive-artifacts: ''
     name: dcaegen2-services-mapper-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: 'dcaegen2/services/mapper'
index 0bde5de..dca7dd5 100644 (file)
@@ -6,8 +6,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
     name: dcaegen2-services-pm-mapper-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-docker-8c-8g
     project: 'dcaegen2/services/pm-mapper'
index 3eb5989..a6bc305 100644 (file)
@@ -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'
+            - '{project-name}-docker-merge-master'
     robot-options: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml
deleted file mode 100644 (file)
index 7a84545..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
----
-- dcaegen2_services_common: &dcaegen2_services_common
-    # values apply to all dcaegen2_services docker projects
-    name: dcaegen2-services-docker-common
-    project: dcaegen2/services
-    # maven settings file has docker credentials
-    mvn-settings: dcaegen2-services-settings
-    # use host network to clone from our gerrit
-    container-tag-method: latest
-    build-node: ubuntu1604-docker-8c-8g
-    # jenkins job name prefix
-    project-name: '{name}'
-    tox-dir: '{docker-root}'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
-
-- project:
-    <<: *dcaegen2_services_common
-    name: dcaegen2-services-pmsh
-    # root of docker build
-    docker-root: components/pm-subscription-handler
-    # tag override
-    # Following is dependent on merge https://gerrit.onap.org/r/#/c/ci-management/+/99313/
-    # docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
-    # image name
-    docker-name: 'onap/{name}'
-    stream:
-      - master:
-            branch: master
-    jobs:
-      - gerrit-docker-verify
-      - gerrit-docker-merge
-
-- project:
-    <<: *dcaegen2_services_common
-    name: dcaegen2-services-pmsh-verify
-    docker-root: components/pm-subscription-handler
-    stream:
-      - all:
-            branch: '*'
-    jobs:
-      - gerrit-tox-verify
-
-- project:
-    <<: *dcaegen2_services_common
-    name: dcaegen2-services-pmsh-sonar
-    docker-root: components/pm-subscription-handler
-    branch: master
-    jobs:
-      - gerrit-tox-sonar
-    cron: '@daily'
-
-- project:
-    <<: *dcaegen2_services_common
-    docker-root: components/pm-subscription-handler
-    name: dcaegen2-services-pmsh-release
-    project-name: dcaegen2-services-pmsh-release
-    jobs:
-      - '{project-name}-gerrit-release-jobs':
-              build-node: centos7-docker-8c-8g
-    stream:
-      - 'master':
-          branch: master
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    <<: *dcaegen2_services_common
-    name: dcaegen2-services-pmsh-clm
-    docker-root: components/pm-subscription-handler
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project-name: 'dcaegen2-services-pmsh-clm'
-    mvn-params: '-f components/pm-subscription-handler/pom.xml'
-    branch: 'master'
-
index 4073a9f..bb5aa84 100644 (file)
@@ -21,8 +21,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''
     name: dcaegen2-services-prh-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-docker-8c-8g
     java-version: openjdk11
index 5cbb321..4d90397 100644 (file)
@@ -17,8 +17,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'dcaegen2-services-sdk-settings'
     files: '**'
     archive-artifacts: ''
     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: centos7-docker-8c-8g
     project: 'dcaegen2/services/sdk'
index 99055a7..27d546b 100644 (file)
@@ -21,8 +21,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'dcaegen2-services-son-handler-settings'
     files: '**'
     archive-artifacts: ''
     name: dcaegen2-services-son-handler-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-docker-8c-8g
     project: 'dcaegen2/services/son-handler'
index 81bcd8a..4ff813e 100644 (file)
@@ -7,3 +7,12 @@
     build-node: centos7-builder-2c-1g
     project: dcaegen2/services
     branch: master
+- project:
+    name: dcaegen2-services-release
+    project-name: dcaegen2-services
+    mvn-settings: dcaegen2-services-settings
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+    build-node: centos7-docker-8c-8g
+    project: dcaegen2/services
+    branch: master
index 84fe787..9388c2b 100644 (file)
     name: dcaegen2-utils-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-docker-8c-8g
     project: 'dcaegen2/utils'
index dd0b0cc..1305937 100644 (file)
@@ -17,8 +17,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'dcaegen2-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 8fbd19f..18cb107 100644 (file)
     name: dmaap-datarouter-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: 'dmaap/datarouter'
index f9785b9..5793822 100644 (file)
     name: dmaap-dbcapi-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: 'dmaap/dbcapi'
index bc42004..f3b4fb8 100644 (file)
     name: dmaap-kafka-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: 'dmaap/kafka11aaf'
index 9c932b4..d92e85a 100644 (file)
     name: dmaap-messagerouter-dmaapclient-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: 'dmaap/messagerouter/dmaapclient'
index d044ba1..21a8ba5 100644 (file)
@@ -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':
index aef8067..ba23d9a 100644 (file)
     name: dmaap-messagerouter-messageservice-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: 'dmaap/messagerouter/messageservice'
index 09633d9..2d32ea0 100644 (file)
     name: dmaap-messagerouter-mirroragent-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: 'dmaap/messagerouter/mirroragent'
index 9127fca..90baffd 100644 (file)
     name: dmaap-messagerouter-msgrtr-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: 'dmaap/messagerouter/msgrtr'
index 234a767..be97b29 100644 (file)
@@ -71,7 +71,7 @@
       - shell: !include-raw: doc-install-plantuml.sh
       - shell: |
           #!/bin/bash
-          virtualenv $WORKSPACE/venv-tox
+          python3 -m venv $WORKSPACE/venv-tox
           source $WORKSPACE/venv-tox/bin/activate
           pip install --upgrade pip
           pip install --upgrade tox argparse
index ba2f74e..6305828 100644 (file)
@@ -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:
index d950825..3f8816e 100644 (file)
     name: holmes-common-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: 'holmes/common'
index 0788584..cb23377 100644 (file)
     name: holmes-engine-management-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: 'holmes/engine-management'
index 5f1bae2..7e4342b 100644 (file)
     name: holmes-rule-management-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: 'holmes/rule-management'
index 23eaae6..aeb793f 100644 (file)
     builders:
       - shell: "${WORKSPACE}/autorelease/scripts/set-version.sh"
 
+- builder:
+    name: integration-install-vagrant
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -ex # Fail build if any setup step fails
+          sudo add-apt-repository --yes ppa:tiagohillebrandt/vagrant
+          sudo apt update
+          sudo apt --yes install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev vagrant
+          vagrant plugin install vagrant-libvirt
+          vagrant plugin install vagrant-disksize
+          mkdir -p ~/.ssh
+
 - publisher:
     name: integration-robot
     publishers:
index 10b713e..b7b92fd 100644 (file)
@@ -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:
           files: '**/{project-name}/**'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
     build-node: 'ubuntu1604-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           files: '**/{project-name}/**'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
     build-node: 'ubuntu1604-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           files: '**/{project-name}/**'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
     build-node: 'ubuntu1604-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
     build-node: 'ubuntu1604-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
     build-node: 'ubuntu1604-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
     build-node: 'ubuntu1604-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           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/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
new file mode 100644 (file)
index 0000000..0cf19bc
--- /dev/null
@@ -0,0 +1,98 @@
+---
+- job-template:
+    # Job template for verifying Vagrantfiles
+    #
+    # The purpose of this job template is to run:
+    # vagrant validate
+
+    name: '{project-name}-{stream}-verify-vagrantfile'
+    project-type: freestyle
+    description: 'Job intended for validating vagrantfiles'
+    node: ubuntu1604-builder-2c-1g
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**/Vagrantfile'
+
+    builders:
+      - integration-install-vagrant
+      - shell: !include-raw-escape: 'vagrantfile-verify.sh'
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    # Job template for running linters against specific file formats
+    #
+    # Required Variables:
+    #     python-version: Python version to deploy in venv
+    #     tox-env:        Tox environments to run
+    #     tox-dir:        Directory containing the project's tox.ini
+    #     pattern:        List of file patterns to scan
+
+    name: '{project-name}-{stream}-{subproject}-lint'
+    project-type: freestyle
+    description: 'Job intended for running linters with Tox and Coala'
+    node: ubuntu1604-builder-2c-1g
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - lf-infra-tox-parameters:
+          tox-dir: '{tox-dir}'
+          tox-envs: '{tox-envs}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{pattern}'
+
+    builders:
+      - lf-infra-tox-install:
+          python-version: '{python-version}'
+      - lf-infra-tox-run:
+          parallel: 'false'
+
+    publishers:
+      - lf-infra-publish
index de18753..8d4d52e 100644 (file)
     build-node: centos7-builder-2c-1g
     project: integration
     branch: master
+
+- project:
+    name: integration-verify-python
+    project-name: integration
+    project: integration
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'integration-settings'
+    build-node: 'centos7-builder-4c-4g'
+    subproject:
+      - 'test-vcpe':
+          path: 'test/vcpe'
+          pattern: 'test/vcpe/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
+
+- project:
+    name: integration-verify-vagrantfile
+    project-name: 'integration'
+    project: 'integration'
+    stream:
+      - 'master':
+          branch: 'master'
+    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
+
+- project:
+    name: integration-netconf-pnp-simulator
+    project: integration
+    stream:
+      - 'master':
+          branch: 'master'
+    # Required by verifier
+    mvn-settings: 'integration-settings'
+    project-name: 'integration-netconf-pnp-simulator'
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'test/mocks/netconf-pnp-simulator/engine/**'
+    docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
+    docker-root: test/mocks/netconf-pnp-simulator/engine
+    container-tag-method: yaml-file
+    build-node: centos7-docker-8c-8g
+    build-timeout: 20
+    jobs:
+      - gerrit-docker-verify
+      - gerrit-docker-merge
+
+- project:
+    name: integration-linters
+    project: 'integration'
+    project-name: 'integration'
+    python-version: python3
+    jobs:
+      - '{project-name}-{stream}-{subproject}-lint'
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml|**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/integration/vagrantfile-verify.sh b/jjb/integration/vagrantfile-verify.sh
new file mode 100644 (file)
index 0000000..6af0a9d
--- /dev/null
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Copyright 2020 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> vagrantfile-verify.sh"
+
+set -e
+
+declare -a CHANGED_VAGRANTFILES
+CMD='vagrant validate'
+
+CHANGED_VAGRANTFILES=(`git diff HEAD^ HEAD --name-only "*Vagrantfile"`)
+
+for v_dir in ${CHANGED_VAGRANTFILES[@]};
+do
+  echo "---> Validating ./$v_dir"
+  pushd $(dirname $v_dir)
+  eval "$CMD"
+  popd
+done
index 8c19c2a..4ef1801 100644 (file)
     name: logging-analytics-pomba-pomba-aai-context-builder-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: logging-analytics/pomba/pomba-aai-context-builder
index ac73c5c..be776ff 100644 (file)
     name: logging-analytics-pomba-pomba-audit-common-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: logging-analytics/pomba/pomba-audit-common
index 6735358..3f4f3cb 100644 (file)
     name: logging-analytics-pomba-pomba-context-aggregator-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: logging-analytics/pomba/pomba-context-aggregator
index 56bd157..82317ba 100644 (file)
     name: logging-analytics-pomba-pomba-network-discovery-context-builder-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: logging-analytics/pomba/pomba-network-discovery-context-builder
index ddc3ac9..ba9cf5d 100644 (file)
     name: logging-analytics-pomba-pomba-sdc-context-builder-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: logging-analytics/pomba/pomba-sdc-context-builder
index e3fce2a..a40fda1 100644 (file)
     name: logging-analytics-pomba-pomba-sdnc-context-builder-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: 'H 11 * * *'
     build-node: ubuntu1604-builder-4c-4g
     project: logging-analytics/pomba/pomba-sdnc-context-builder
index 9ff1348..6e6b289 100644 (file)
 #    archive-artifacts: ''
 #    build-node: ubuntu1604-docker-arm64-4c-2g
 #
+
 - project:
     name: logging-analytics-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: 'logging-analytics'
 
 - 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: centos7-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
index 0d8e74d..a58af1c 100644 (file)
     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'
index 4ff6b3d..8e6a8e6 100644 (file)
     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'
index f588024..1bdc5b9 100644 (file)
@@ -65,7 +65,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: centos7-docker-8c-8g
           maven-goals: install
           mvn-params: '-P docker'
           maven-versions-plugin: true
@@ -75,7 +75,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-memcached-4c-4g'
+    build-node: 'centos7-builder-4c-4g'
 
 #- project:
 #    name: multicloud-openstack-arm64
index edd2a33..29d9422 100644 (file)
@@ -8,8 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
 
     jobs:
       - '{project-name}-{stream}-review':
index b099e82..b4ba623 100644 (file)
@@ -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
index ec149ad..830ac93 100644 (file)
@@ -3,6 +3,7 @@
     name: optf-osdf
     project-name: 'optf-osdf'
     project: 'optf/osdf'
+    python-version: python3
     stream:
       - 'master':
           branch: 'master'
index ef02a1d..38759ff 100644 (file)
@@ -1,22 +1,3 @@
-- project:
-    name: policy-health-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'policy'
-    java-version: openjdk11
-    stream:
-      - 'master':
-          branch: master
-    functionality:
-      - 'health'
-    trigger_jobs:
-      - 'policy-engine-{stream}-merge-java'
-      - 'policy-drools-pdp-{stream}-merge-java'
-      - 'policy-drools-applications-{stream}-merge-java'
-    robot-options: ''
-    build-timeout: 40
-
 - project:
     name: policy-apex-pdp-csit
     jobs:
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
new file mode 100644 (file)
index 0000000..924ea37
--- /dev/null
@@ -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-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-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':
+          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/rtdv3/rtdv3.yaml b/jjb/rtdv3/rtdv3.yaml
new file mode 100644 (file)
index 0000000..017218a
--- /dev/null
@@ -0,0 +1,30 @@
+# Global read the docs version 3 jobs
+#
+# jobs trigger for all projects, all branches
+# on any changes to files in a docs/ directory
+# and publish subprojects to readthedocs.io
+# using credentials from Jenkins settings
+---
+- project:
+    name: rtdv3-view
+    project-name: rtdv3-global
+    views:
+      - project-view
+
+- project:
+    name: rtdv3-global
+    default-version: latest
+    tox-dir: "docs/"
+    doc-dir: "_build/html"
+    build-node: centos7-builder-2c-1g
+    # override the default to ignore ref-updated-event (tag)
+    gerrit_merge_triggers:
+      - change-merged-event
+      - comment-added-contains-event:
+          comment-contains-value: remerge$
+    jobs:
+      - rtdv3-global-verify
+      - rtdv3-global-merge
+    stream:
+      - master:
+          branch: '*'
index 1c718ac..f003fbb 100644 (file)
@@ -4,6 +4,7 @@
     name: sdc-sdc-docker-base
     project-name: 'sdc-sdc-docker-base'
     jobs:
+      - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-sdc-merge-java':
           build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
@@ -14,6 +15,8 @@
           mvn-params: '-P default'
           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: 'sdc/sdc-docker-base'
     stream:
       - 'master':
index 698f992..ca0408a 100644 (file)
@@ -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-docker-8c-8g
 
     project: 'sdc/sdc-workflow-designer'
     stream:
index 1d3b37e..71296e4 100644 (file)
@@ -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
@@ -45,6 +46,8 @@
           mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
           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: 'sdc'
     stream:
index f796934..39a8977 100644 (file)
@@ -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
 
     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
index 7c7094f..85293ea 100644 (file)
     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
index 38c6061..c39db40 100644 (file)
           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'
     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'
 
index 1a02f8f..1ab6862 100644 (file)
@@ -13,8 +13,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
 
     mvn-settings: 'sdnc-oom-settings'
     files: '**'
diff --git a/jjb/testsuite/testsuite-oom.yaml b/jjb/testsuite/testsuite-oom.yaml
new file mode 100644 (file)
index 0000000..40b281a
--- /dev/null
@@ -0,0 +1,10 @@
+---
+- project:
+    name: testsuite-oom
+    project-name: testsuite-oom
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: testsuite/oom
+    branch: master
+
index 601c5e5..a19dcd6 100644 (file)
     name: usecase-ui-server-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: 'usecase-ui/server'
index 9d49b44..b93bf60 100644 (file)
     name: vfc-gvnfm-vnflcm-lcm-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f lcm/pom.xml'
     build-node: centos7-redis-4c-4g
index d688bcc..4412d09 100644 (file)
     name: vfc-gvnfm-vnfmgr-mgr-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f mgr/pom.xml'
     build-node: ubuntu1604-builder-4c-4g
index e27e3c6..8fbf442 100644 (file)
     name: vfc-gvnfm-vnfres-res-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f res/pom.xml'
     build-node: ubuntu1604-builder-4c-4g
index 6e2e934..e12807d 100644 (file)
     name: vfc-nfvo-catalog-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     build-node: centos7-redis-4c-4g
     project: 'vfc/nfvo/catalog'
index 7bf8cfb..348cef1 100644 (file)
     name: vfc-nfvo-driver-ems-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'vfc/nfvo/driver/ems'
index 1696ea5..273e377 100644 (file)
     name: vfc-nfvo-driver-sfc-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f zte/sfc-driver/pom.xml'
     build-node: ubuntu1604-builder-4c-4g
index 80680bd..709562c 100644 (file)
     name: vfc-nfvo-driver-svnfm-huawei-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     mvn-params: '-f huawei/pom.xml'
index a818758..95a4dee 100644 (file)
     name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f gvnfmadapter/pom.xml'
     build-node: ubuntu1604-builder-4c-4g
index 2fea7c7..0990efb 100644 (file)
     name: vfc-nfvo-driver-vnfm-gvnfm-juju-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     mvn-params: '-f juju/juju-vnfmadapter/pom.xml'
index 3ba98f6..96c9988 100644 (file)
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
index 0b121e1..13f5945 100644 (file)
     name: vfc-nfvo-driver-vnfm-svnfm-zte-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f zte/vmanager/pom.xml'
     build-node: ubuntu1604-builder-4c-4g
index 30e6678..ff6c94b 100644 (file)
     name: vfc-nfvo-lcm-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     build-node: centos7-redis-4c-4g
     project: 'vfc/nfvo/lcm'
index dec3110..f89e2fc 100644 (file)
     name: vfc-nfvo-multivimproxy-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'vfc/nfvo/multivimproxy'
index 2370d35..9fa63c6 100644 (file)
     name: vfc-nfvo-resmanagement-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'vfc/nfvo/resmanagement'
index ae679b5..0b3cf05 100644 (file)
     name: vfc-nfvo-wfengine-wfenginemgrservice-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     mvn-params: '-f wfenginemgrservice/pom.xml'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     name: vfc-nfvo-wfengine-activiti-extension-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     mvn-params: '-f activiti-extension/pom.xml'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
index 77099b1..c27b550 100644 (file)
@@ -5,4 +5,5 @@ source $WORKSPACE/venv-tox/bin/activate
 pip install --upgrade pip
 pip install -r etc/requirements.txt
 ls
+wget -O docs/data/needs.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json" && echo "Copied newest needs." || exit 1
 tox -e needs
\ No newline at end of file
diff --git a/jjb/vvp/vvp-em.yaml b/jjb/vvp/vvp-em.yaml
new file mode 100644 (file)
index 0000000..a0870ad
--- /dev/null
@@ -0,0 +1,10 @@
+---
+- project:
+    name: vvp-engagementmgr
+    project-name: 'vvp-engagementmgr'
+    project: 'vvp/engagementmgr'
+    mvn-settings: 'vvp-engagementmgr-settings'
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
diff --git a/jjb/vvp/vvp-oom.yaml b/jjb/vvp/vvp-oom.yaml
new file mode 100644 (file)
index 0000000..2a6b271
--- /dev/null
@@ -0,0 +1,10 @@
+---
+- project:
+    name: vvp-oom
+    project-name: 'vvp-oom'
+    project: 'vvp/oom'
+    mvn-settings: 'vvp-oom-settings'
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
diff --git a/jjb/vvp/vvp-regression.yaml b/jjb/vvp/vvp-regression.yaml
new file mode 100644 (file)
index 0000000..bea93c3
--- /dev/null
@@ -0,0 +1,10 @@
+---
+- project:
+    name: vvp-regression-tests
+    project-name: 'vvp-regression-tests'
+    project: 'vvp/regression-tests'
+    mvn-settings: 'vvp-regression-tests-settings'
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
new file mode 100644 (file)
index 0000000..c746fbd
--- /dev/null
@@ -0,0 +1,10 @@
+---
+- project:
+    name: vvp-test-engine
+    project-name: 'vvp-test-engine'
+    project: 'vvp/test-engine'
+    mvn-settings: 'vvp-test-engine-settings'
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
index b730ea8..9e2cc94 100644 (file)
     name: vvp-validation-scripts-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-docker-8c-8g
     project: 'vvp/validation-scripts'
index 57648e1..da5d5cf 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 57648e1600c3c2457900ad4872f26d8f5cd679c7
+Subproject commit da5d5cf92fafcdc0f31a76d2955e8ac9c327c100
index e3b8086..daed681 100644 (file)
@@ -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}}'
index c156150..61cc509 100644 (file)
       become: true
       when: ansible_distribution == 'Ubuntu'
 
-    - name: Install python-tox
+    - name: Install python-tox and deps
       pip:
-        name: tox
+        name:
+          - tox
+          - tox-pyenv
+          - virtualenv
+          - more-itertools~=5.0.0
+          - zipp==1.0.0
         state: present
       become: true
 
@@ -34,6 +39,7 @@
           - libssl-dev
           - libmysqlclient-dev
           - gcc
+          - python3-venv
       become: true
       when: ansible_distribution == 'Ubuntu'
 
           - 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'
index 7b9f9c0..d54746f 100644 (file)
       become: true
       when: ansible_distribution == 'Ubuntu'
 
-    - name: Install python-tox
+    - name: Install python-tox and deps
       pip:
-        name: tox
+        name:
+          - tox
+          - tox-pyenv
+          - virtualenv
+          - more-itertools~=5.0.0
+          - zipp==1.0.0
         state: present
       become: true
 
@@ -88,6 +93,7 @@
           - libssl-dev
           - libmysqlclient-dev
           - gcc
+          - python3-venv
       become: true
       when: ansible_distribution == 'Ubuntu'
 
           - 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'
 
index 42771af..474911d 100644 (file)
@@ -18,7 +18,7 @@ set -euf -o pipefail
 # shellcheck disable=SC1090
 source ~/lf-env.sh
 
-lf-activate-venv lftools
+lf-activate-venv zipp==1.1.0 lftools
 
 if [ ! -v RELEASEDOCKERHUB_ORG ]
 then