Merge "Update dcaegen2 blueprint generator jobs to use java 11"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Thu, 17 Sep 2020 17:26:17 +0000 (17:26 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 17 Sep 2020 17:26:17 +0000 (17:26 +0000)
68 files changed:
INFO.yaml [new file with mode: 0644]
global-jjb
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
jenkins-config/global-vars-production.sh
jenkins-config/global-vars-sandbox.sh
jjb/aaf/aaf-cadi.yaml
jjb/ccsdk/apps.yaml
jjb/ccsdk/ccsdk-csit.yaml
jjb/ccsdk/ccsdk-oran.yaml
jjb/ccsdk/cds.yaml
jjb/ccsdk/dashboard.yaml
jjb/ccsdk/distribution.yaml
jjb/ccsdk/features.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/sli-adaptors.yaml
jjb/ccsdk/sli-core.yaml
jjb/ccsdk/sli-northbound.yaml
jjb/ccsdk/sli-plugins.yaml
jjb/ccsdk/utils.yaml
jjb/ci-management/ci-management.yaml
jjb/cli/cli.yaml
jjb/dcaegen2/dcaegen2-collectors-ves.yaml
jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
jjb/dcaegen2/dcaegen2-services-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml [new file with mode: 0644]
jjb/global-templates-java.yaml
jjb/integration/integration-docker.yaml
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-terraform.yaml [new file with mode: 0644]
jjb/integration/simulators/integration-5G-core-nf-simulator.yaml [new file with mode: 0644]
jjb/integration/xtesting/integration-xtesting.yaml
jjb/multicloud/multicloud-azure-java.yaml
jjb/multicloud/multicloud-framework-java.yaml
jjb/multicloud/multicloud-info.yaml [new file with mode: 0644]
jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
jjb/oom/oom-consul.yaml [new file with mode: 0644]
jjb/optf/optf-fgps.yaml [deleted file]
jjb/portal-sdk/portal-sdk.yaml
jjb/rtdv3/rtdv3.yaml
jjb/sdc/sdc-dcae-d-ci.yaml [deleted file]
jjb/sdc/sdc-dcae-d-csit.yaml [deleted file]
jjb/sdc/sdc-dcae-d-dt-be-main.yaml [deleted file]
jjb/sdc/sdc-dcae-d-dt-be-property.yaml [deleted file]
jjb/sdc/sdc-dcae-d-dt.yaml [deleted file]
jjb/sdc/sdc-dcae-d-fe.yaml [deleted file]
jjb/sdc/sdc-dcae-d-tosca-lab.yaml [deleted file]
jjb/sdc/sdc-microservices.yaml [deleted file]
jjb/sdc/sdc-onap-ui-react.yaml [deleted file]
jjb/sdc/sdc.yaml
jjb/sdnc/sdnc-apps.yaml
jjb/sdnc/sdnc-northbound.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/sdnc/sdnc-oom.yaml [deleted file]
jjb/so/so-libs.yaml
jjb/testsuite/testsuite-cds.yaml [new file with mode: 0644]
jjb/vnfsdk/vnfsdk-refrepo.yaml
jjb/vnfsdk/vnfsdk-validation.yaml

diff --git a/INFO.yaml b/INFO.yaml
new file mode 100644 (file)
index 0000000..6c8cbec
--- /dev/null
+++ b/INFO.yaml
@@ -0,0 +1,60 @@
+---
+project: 'ci-management'
+project_creation_date: '2017-01-24'
+lifecycle_state: 'Incubation'
+project_category: ''
+project_lead: &onap_releng_ptl
+    name: 'Jessica Wagantall'
+    email: 'jwagantall@linuxfoundation.org'
+    id: 'jwagantall'
+    company: 'LF'
+    timezone: 'America/Los_Angeles'
+primary_contact: *onap_releng_ptl
+issue_tracking:
+    type: 'jira'
+    url: 'https://jira.onap.org/projects/CIMAN'
+    key: 'CIMAN'
+mailing_list:
+    type: 'groups.io'
+    url: 'lists.onap.org'
+    tag: '<[sub-project_name]>'
+realtime_discussion: ''
+meetings:
+    - type: 'zoom'
+      agenda: 'n/a'
+      url: 'n/a'
+      server: 'n/a'
+      channel: 'n/a'
+      repeats: 'n/a'
+      time: 'n/a'
+repositories:
+    - ci-management
+committers:
+    - <<: *onap_releng_ptl
+    - name: 'Bengt Thuree'
+      email: 'bthuree@linuxfoundation.org'
+      company: 'LF'
+      id: 'bthuree'
+      timezone: 'Australia/Melbourne'
+    - name: 'Andrew Grimberg'
+      email: 'agrimberg@linuxfoundation.org'
+      company: 'LF'
+      id: 'agrimberg'
+      timezone: 'America/Los_Angeles'
+    - name: 'Eric Ball'
+      email: 'eball@linuxfoundation.org'
+      company: 'LF'
+      id: 'eball'
+      timezone: 'America/Los_Angeles'
+    - name: 'Aric Gardner'
+      email: 'agardner@linuxfoundation.org'
+      company: 'LF'
+      id: 'agardner'
+      timezone: 'America/New_York'
+    - name: 'Anil Belur'
+      email: 'abelur@linuxfoundation.org'
+      company: 'LF'
+      id: 'abelur'
+      timezone: 'Australia/Brisbane'
+tsc:
+    approval: 'https://lists.onap.org/pipermail/onap-tsc'
index 64faafa..2399be2 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 64faafae2362d36e4d5c3e8d5fe6579b9d09cf55
+Subproject commit 2399be2ca1402a7d1043089c3c57d623d9bfc064
index 5f1844a..fe7549c 100644 (file)
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181
 LABELS=ubuntu1804-docker-8c-16g
 HARDWARE_ID=v2-highcpu-16
-VOLUME_SIZE=20
+VOLUME_SIZE=40
index a997a04..52ffcd9 100644 (file)
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181
 LABELS=ubuntu1804-docker-v1-8c-8g
 HARDWARE_ID=v1-standard-8
-VOLUME_SIZE=20
+VOLUME_SIZE=50
index 3c83f0a..9f7a172 100644 (file)
@@ -17,7 +17,7 @@ RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
 RELEASE_USERNAME=onap-release
 S3_BUCKET=
 SIGUL_BRIDGE_IP=10.30.104.3
-SIGUL_KEY=onap-release-2018
+SIGUL_KEY=onap-release-2020
 SILO=production
 SONAR_URL=https://sonar.onap.org
 MASTER_RTD_PROJECT=doc
index 75ce593..7247094 100644 (file)
@@ -17,7 +17,7 @@ RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
 RELEASE_USERNAME=onap-release
 S3_BUCKET=
 SIGUL_BRIDGE_IP=10.30.104.3
-SIGUL_KEY=onap-test
+SIGUL_KEY=onap-sandbox
 SILO=sandbox
 SONAR_URL=https://sonar.onap.org
 MASTER_RTD_PROJECT=doc-test
index 64b3bc3..d8417ba 100644 (file)
@@ -6,6 +6,8 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
index c6c3f56..0883258 100644 (file)
@@ -21,7 +21,6 @@
           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"
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -40,7 +41,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
     project: 'ccsdk/apps'
     project-name: 'ccsdk-apps'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-apps-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
 #- project:
     project-name: ccsdk-apps
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index fcb1289..46e2558 100644 (file)
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
     robot-options: ''
     branch: 'master'
+
+- project:
+    name: ccsdk-oran-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'ccsdk-oran'
+    recipients: 'bjorn.magnusson@est.tech maxime.bonneau@est.tech'
+    stream: 'master'
+    functionality:
+      - 'polmansuite':
+          trigger_jobs: '{project-name}-maven-docker-stage-master'
+    robot-options: ''
+    branch: 'master'
index 71ffd54..ac15e76 100644 (file)
@@ -9,14 +9,13 @@
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
-          maven-versions-plugin: true
+          mvn-opts: '-Ddocker.skip=true'
           cron: ''
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-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-name}-gerrit-release-jobs':
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-oran-settings'
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
-    java-version: openjdk11
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1804-docker-8c-8g
     build-node: centos7-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    name: ccsdk-oran-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: ubuntu1804-docker-8c-8g
+    project: 'ccsdk/oran'
+    project-name: 'ccsdk-oran'
+    branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'ccsdk-oran-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index beb0c17..5882f0a 100644 (file)
@@ -3,20 +3,20 @@
     name: ccsdk-cds
     project-name: 'ccsdk-cds'
     jobs:
-      - gerrit-maven-verify
+      - gerrit-maven-verify:
+          mvn-params: '-Ddocker.skip.push=true -P docker'
       - gerrit-maven-merge:
           cron: '@daily'
+          mvn-params: '-Ddocker.skip.push=true -P docker'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
-          maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
           cron: ''
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-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-name}-gerrit-release-jobs':
           branch: 'elalto'
       - 'frankfurt':
           branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -38,8 +42,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
     project: 'ccsdk/cds'
     project-name: 'ccsdk-cds'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-cds-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-cds-info
     project-name: ccsdk-cds
@@ -93,6 +97,8 @@
     project-name: ccsdk-cds
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index 353ee2d..6447d1a 100644 (file)
@@ -16,7 +16,6 @@
           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'
 
@@ -24,6 +23,8 @@
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -50,6 +51,8 @@
     project: 'ccsdk/dashboard'
     project-name: 'ccsdk-dashboard'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-dashboard-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -64,6 +67,8 @@
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-dashboard-settings'
     build-node: centos7-redis-4c-4g
 
@@ -81,6 +86,8 @@
     project-name: ccsdk-dashboard
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-dashboard-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index 47e616b..a644435 100644 (file)
@@ -16,7 +16,6 @@
           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-name}-gerrit-release-jobs':
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1804-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     build-node: ubuntu1804-docker-8c-8g
 
@@ -89,6 +89,8 @@
     jobs:
       - gerrit-whitesource-scan:
           java-opts: '-Xmx2048m'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index 17dd0b4..eb9e830 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -27,7 +29,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     project: 'ccsdk/features'
     project-name: 'ccsdk-features'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-features-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -84,6 +87,8 @@
     project-name: ccsdk-features
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index 0d3a3ee..24cf739 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -29,7 +31,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-parent-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-parent-info
     project-name: ccsdk-parent
@@ -62,6 +63,8 @@
     project-name: ccsdk-parent
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index ad92332..bd553e1 100644 (file)
@@ -10,9 +10,6 @@
           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'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -30,7 +29,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
     project: 'ccsdk/sli/adaptors'
     project-name: 'ccsdk-sli-adaptors'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-adaptors-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-sli-adaptors-info
     project-name: ccsdk-sli-adaptors
@@ -86,6 +85,8 @@
     project-name: ccsdk-sli-adaptors
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index 0fc6d6c..658a92c 100644 (file)
@@ -10,9 +10,6 @@
           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'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -30,7 +29,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
     project: 'ccsdk/sli/core'
     project-name: 'ccsdk-sli-core'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-core-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-core-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-core-settings'
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-sli-core-info
     project-name: ccsdk-sli-core
@@ -85,6 +84,8 @@
     project-name: ccsdk-sli-core
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-core-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index d130cb1..a66c774 100644 (file)
@@ -9,9 +9,6 @@
       - 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'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -30,7 +29,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
     project: 'ccsdk/sli/northbound'
     project-name: 'ccsdk-sli-northbound'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-northbound-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-northbound-settings'
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-sli-northbound-info
     project-name: ccsdk-sli-northbound
@@ -85,6 +84,8 @@
     project-name: ccsdk-sli-northbound
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index 4f99ad8..4433bb3 100644 (file)
@@ -10,9 +10,6 @@
           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'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -30,7 +29,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
     project: 'ccsdk/sli/plugins'
     project-name: 'ccsdk-sli-plugins'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-plugins-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-plugins-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-plugins-settings'
-    maven-version: "mvn35"
-
 
 - project:
     name: ccsdk-sli-plugins-info
@@ -84,6 +83,8 @@
     project-name: ccsdk-sli-plugins
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-plugins-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index 3486a30..52ab57d 100644 (file)
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-utils-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
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-utils-settings'
 
-
 - project:
     name: ccsdk-utils-info
     project-name: ccsdk-utils
@@ -55,6 +58,8 @@
     project-name: ccsdk-utils
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-utils-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index d310819..74d02d6 100644 (file)
@@ -5,6 +5,15 @@
     views:
       - project-view
 
+- project:
+    name: ci-management-info
+    project-name: ci-management
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ci-management
+    branch: master
+
 - project:
     name: ci-management-jobs
     jobs:
index 4d1f3de..89b9460 100644 (file)
           build-node: ubuntu1804-docker-8c-8g
     project: 'cli'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+                branch: 'master'
+                java-version: openjdk11
+        - 'frankfurt':
+                branch: 'frankfurt'
+                java-version: openjdk8
     mvn-settings: 'cli-settings'
     files: '**'
     archive-artifacts: ''
index 8896237..4586ab1 100644 (file)
@@ -55,6 +55,7 @@
 
 - project:
     name: dcaegen2-collectors-ves-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
index 221e0f5..f6859a3 100644 (file)
       # build docker image
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - gerrit-release-verify
-      - gerrit-release-merge
+      - gerrit-release-verify:
+          build-node: centos7-docker-8c-8g
+      - gerrit-release-merge:
+          build-node: centos7-docker-8c-8g
     stream:
       - master:
           branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
new file mode 100644 (file)
index 0000000..5a5115b
--- /dev/null
@@ -0,0 +1,22 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-assembly
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - assembly:
+          pom: 'mod2/assembly/pom.xml'
+          pattern: 'mod2/assembly/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
new file mode 100644 (file)
index 0000000..b0f256e
--- /dev/null
@@ -0,0 +1,55 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-auth-service
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - auth-service:
+          pom: 'mod2/auth-service/pom.xml'
+          pattern: 'mod2/auth-service/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod2-auth-service-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: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod2-auth-service'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod2/auth-service/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-mod2-auth-service-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-mod2-auth-service-clm
+    mvn-params: '-f mod2/auth-service/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
new file mode 100644 (file)
index 0000000..163dfa4
--- /dev/null
@@ -0,0 +1,55 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-catalog-service
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - catalog-service:
+          pom: 'mod2/catalog-service/pom.xml'
+          pattern: 'mod2/catalog-service/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod2-catalog-service-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: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod2-catalog-service'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod2/catalog-service/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-mod2-catalog-service-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-mod2-catalog-service-clm
+    mvn-params: '-f mod2/catalog-service/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
new file mode 100644 (file)
index 0000000..64471cc
--- /dev/null
@@ -0,0 +1,55 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-ui
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - ui:
+          pom: 'mod2/ui/pom.xml'
+          pattern: 'mod2/ui/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod2-ui-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: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod2-ui'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod2/ui/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-mod2-ui-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-mod2-ui-clm
+    mvn-params: '-f mod2/ui/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
index 07722a5..ea80103 100644 (file)
@@ -2,27 +2,27 @@
 - project:
     name: dcaegen2-platform-policy-handler
     project-name: 'dcaegen2-platform-policy-handler'
-    jobs:
-      - '{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/policy-handler'
+    python-version: python3
+    tox-dir: '.'
+    tox-envs: 'py3'
     stream:
       - 'master':
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
+    subproject:
+      - 'policy-handler':
+          pattern: 'policyhandler/**'
+          path: 'policyhandler'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{subproject}-python-staging-{stream}'
+      - '{project-name}-{subproject}-python-release-{stream}'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-policy-handler-sonar
index 5b8fc98..b634404 100644 (file)
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'
 
+- project:
+    name: dcaegen2-services-datalake-handler-des-release
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-datalake-handler-des'
+    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: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/des/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'components/datalake-handler/**'
+    stream:
+      - 'master':
+         branch: 'master'
+         java-version: openjdk11
+      - 'frankfurt':
+          branch: 'frankfurt'
+    mvn-settings: 'dcaegen2-services-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
+
 - project:
     name: dcaegen2-services-datalake-handler-sonar
     java-version: openjdk11
index cde857b..ab9bb54 100644 (file)
@@ -12,7 +12,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package docker:build -DpushImage'
+          mvn-goals: 'clean package docker:build -DpushImageTag'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
index 55c5e90..fb0a334 100755 (executable)
@@ -7,8 +7,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+          java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
index 4d07ea6..b0d5f99 100644 (file)
@@ -38,6 +38,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImageTag'
+          mvn-params: '-f components/slice-analysis-ms/pom.xml'
           pattern: 'components/slice-analysis-ms/**'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml
new file mode 100644 (file)
index 0000000..34b4a63
--- /dev/null
@@ -0,0 +1,15 @@
+- project:
+    name: dcaegen2-services-son-handler-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcaegen2-services-son-handler'
+    recipients: 'vv770d@att.com reshmasree.chamarthi2@wipro.com niranjana.y60@wipro.com'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'testsuites':
+          trigger_jobs:
+            - '{project-name}-{stream}-merge-java'
+    robot-options: ''
index da5dfdc..55df274 100644 (file)
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
index b315bc4..7858ace 100644 (file)
       - 'master':
           branch: 'master'
     subproject:
+      - 'aai-simulator':
+          pom: 'test/mocks/aai-simulator/pom.xml'
+          pattern: 'test/mocks/aai-simulator/**'
+          mvn-goals: 'mvn clean install -Dcheckstyle.skip'
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'
           pattern: 'test/mocks/sniroemulator/**'
index 10b0437..a6d3695 100644 (file)
           default: '{html-files}'
           description: 'File name to be used by HTML publisher plugin to produce the report'
 
+- parameter:
+    name: integration-terraform-version
+    parameters:
+      - string:
+          name: TERRAFORM_VERSION
+          default: '{terraform-version}'
+          description: 'Terraform version to install on minion'
+
+- parameter:
+    name: integration-terragrunt-version
+    parameters:
+      - string:
+          name: TERRAGRUNT_VERSION
+          default: '{terragrunt-version}'
+          description: 'Terragrunt version to install on minion'
+
 - builder:
     name: integration-install-robotframework
     builders:
           vagrant plugin install vagrant-reload
           mkdir -p ~/.ssh
 
+- builder:
+   name: integration-install-terraform
+   builders:
+     - shell: |
+         #!/bin/bash
+         set -ex
+         cd /tmp
+         wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+         unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+         sudo mv terraform /usr/local/bin/
+         terraform version
+
+- builder:
+   name: integration-install-terragrunt
+   builders:
+     - shell: |
+         #!/bin/bash
+         set -ex
+         cd /tmp
+         wget -q https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/terragrunt_linux_amd64
+         sudo mv terragrunt_linux_amd64 /usr/local/bin/terragrunt
+         sudo chmod +x /usr/local/bin/terragrunt
+         terragrunt --version
+
 - builder:
     name: integration-docker-compose-logs
     builders:
index 622d523..77be42b 100644 (file)
     name: '{project-name}-{stream}-{subproject}-tox-verify'
     id: integration-tox-verify
     description: 'Job intended for running tox'
+
+- job-template:
+    <<: *tox_verify_boilerplate
+    name: '{project-name}-{stream}-{subproject}-terraform-verify'
+    terraform-version: 0.13.2
+    terragrunt-version: 0.24.1
+    python-version: python3
+    id: integration-terraform-verify
+    description: 'Job intended for validating terraform modules'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - lf-infra-tox-parameters:
+          tox-dir: '{tox-dir}'
+          tox-envs: '{tox-envs}'
+      - integration-terraform-version:
+          terraform-version: '{terraform-version}'
+      - integration-terragrunt-version:
+          terragrunt-version: '{terragrunt-version}'
+
+    builders:
+      - integration-install-terraform
+      - integration-install-terragrunt
+      - lf-infra-tox-install:
+          python-version: '{python-version}'
+      - lf-infra-tox-run:
+          parallel: 'false'
diff --git a/jjb/integration/integration-terraform.yaml b/jjb/integration/integration-terraform.yaml
new file mode 100644 (file)
index 0000000..2a7fc5d
--- /dev/null
@@ -0,0 +1,27 @@
+---
+- project:
+    name: integration-terraform-info
+    project: integration/terraform
+    project-name: integration-terraform
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-terraform-validate
+    project: integration/terraform
+    project-name: integration-terraform
+    jobs:
+        - integration-terraform-verify
+    subproject:
+        - 'openlab':
+              tox-dir: 'openlab'
+              tox-envs: 'terraform'
+              pattern: 'openlab/**'
+        - 'terragrunt':
+              tox-dir: 'terragrunt'
+              tox-envs: 'terragrunt'
+              pattern: 'terragrunt/**'
+    stream:
+        - 'master':
+              branch: 'master'
diff --git a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
new file mode 100644 (file)
index 0000000..f144dfa
--- /dev/null
@@ -0,0 +1,37 @@
+---
+- project:
+    name: integration-5G-core-nf-simulator-info
+    project-name: integration-5G-core-nf-simulator
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/simulators/5G-core-nf-simulator
+    branch: master
+
+- project:
+    name: integration-5G-core-nf-simulator-linters
+    project: integration/simulators/5G-core-nf-simulator
+    project-name: integration-5G-core-nf-simulator
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
index 2065813..5cbce4e 100644 (file)
           docker-root: ./smoke-usecases-robot
           docker-name: 'onap/xtesting-smoke-usecases-robot'
           docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-verify:
-          project-name: 'integration-xtesting-benchmarking'
-          docker-root: ./benchmarking
-          docker-name: 'onap/xtesting-benchmarking'
-          docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-merge:
-          project-name: 'integration-xtesting-benchmarking'
-          docker-root: ./benchmarking
-          docker-name: 'onap/xtesting-benchmarking'
-          docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-verify:
-          project-name: 'integration-xtesting-candidate-usecases'
-          docker-root: ./candidate-usecases
-          docker-name: 'onap/xtesting-candidate-usecases'
-          docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-merge:
-          project-name: 'integration-xtesting-candidate-usecases'
-          docker-root: ./candidate-usecases
-          docker-name: 'onap/xtesting-candidate-usecases'
-          docker-build-args: '-f ./docker/Dockerfile'
       - gerrit-docker-verify:
           project-name: 'integration-xtesting-security'
           docker-root: ./security
       - 'master':
             branch: 'master'
             files: ''
+      - 'frankfurt':
+            branch: 'frankfurt'
+            files: ''
     docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
     build-node: ubuntu1804-docker-8c-8g
+    cron: '@daily'
+    container-tag-method: stream
index da9827b..ff30754 100644 (file)
@@ -10,7 +10,7 @@
     subproject:
       - 'azure':
           pom: 'azure/pom.xml'
-          pattern: 'azure/**'
+          pattern: 'azure/azure/**'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
index 3233118..d28e62e 100644 (file)
@@ -6,6 +6,7 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
     mvn-settings: 'multicloud-framework-settings'
     subproject:
       - 'multivimbroker':
     project: 'multicloud/framework'
     project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
+    java-version: openjdk11
     mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
     mvn-goals: 'clean install'
     project: multicloud/framework
     project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
+    java-version: openjdk11
     mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
diff --git a/jjb/multicloud/multicloud-info.yaml b/jjb/multicloud/multicloud-info.yaml
new file mode 100644 (file)
index 0000000..d3b5dde
--- /dev/null
@@ -0,0 +1,29 @@
+---
+
+- project:
+    name: multicloud-info
+    project-name: multicloud
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: multicloud
+    branch: master
+
+- project:
+    name: multicloud-windriver-info
+    project-name: multicloud-windriver
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: multicloud/openstack/windriver
+    branch: master
+
+- project:
+    name: multicloud-oom-info
+    project-name: multicloud-oom
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: multicloud/oom
+    branch: master
+
index 5cf656a..a3a0d60 100644 (file)
@@ -11,5 +11,8 @@
       functionality:
           - "certservice":
                 trigger_jobs:
-                    - "{project-name}-{stream}-merge-java"
+                    - "oom-platform-cert-service-{stream}-merge-java"
+          - "truststoremerger":
+                trigger_jobs:
+                    - "oom-platform-cert-service-{stream}-merge-java"
       robot-options: ""
index 99a6387..5bcd5f3 100644 (file)
 
 - project:
       name: oom-platform-cert-service-clm
+      java-version: openjdk11
       jobs:
           - gerrit-maven-clm
       nexus-iq-namespace: 'onap-'
-      project: 'oom/platform/cert-service'
+      project: oom/platform/cert-service
       project-name: 'oom-platform-cert-service'
       branch: 'master'
+      build-node: ubuntu1804-docker-8c-8g
       mvn-settings: 'oom-platform-cert-service-settings'
diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml
new file mode 100644 (file)
index 0000000..bb0b2dd
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- project:
+    name: oom-consul-project-view
+    project-name: oom-consul
+    views:
+      - project-view
+
+- project:
+    name: oom-consul-info
+    project: oom/consul
+    project-name: oom-consul
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml
deleted file mode 100644 (file)
index 5f4509b..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
----
-- project:
-    name: optf-fgps-engine
-    project-name: 'optf-fgps'
-    project: 'optf/fgps'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'optf-fgps-settings'
-    subproject:
-      - 'engine':
-          path: 'engine'
-          pattern: 'engine/**'
-          pom: 'pom.xml'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-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}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-builder-4c-4g'
-
-- project:
-    name: optf-fgps-valetapi
-    project-name: 'optf-fgps'
-    project: 'optf/fgps'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'optf-fgps-settings'
-    subproject:
-      - 'valetapi':
-          path: 'valetapi'
-          pattern: 'valetapi/**'
-          pom: 'pom.xml'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-builder-4c-4g'
-
-- project:
-    name: optf-fgps-docker
-    project-name: 'optf-fgps'
-    project: 'optf/fgps'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'optf-fgps-settings'
-    subproject:
-      - 'valetapi':
-          path: 'valetapi'
-          pattern: 'valetapi/**'
-          pom: 'pom.xml'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          mvn-params: '-Dmaven.test.skip=true'
-          script:
-            !include-raw-escape: 'build-optf-fgps-docker-image.sh'
-          build-node: queue-docker-4c-4g
-      - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          mvn-params: '-Dmaven.test.skip=true'
-          script:
-            !include-raw-escape: 'build-optf-fgps-docker-image.sh'
-          build-node: queue-docker-4c-4g
-
-- project:
-    name: optf-fgps-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: ubuntu1804-builder-4c-4g
-    project: 'optf/fgps'
-    project-name: 'optf-fgps'
-    branch: 'master'
-    mvn-settings: 'optf-fgps-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: optf-fgps-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: optf/fgps
-    project-name: 'optf-fgps'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'optf-fgps-settings'
-
-- project:
-    name: optf-fgps-info
-    project-name: optf-fgps
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: optf/fgps
-    branch: master
index dca6674..32c9333 100644 (file)
@@ -24,8 +24,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-3.2.0':
-          branch: 'release-3.2.0'
+      - 'release-3.3.0':
+          branch: 'release-3.3.0'
     mvn-settings: 'portal-sdk-settings'
     files: '**'
     archive-artifacts: ''
index 017218a..a4cec83 100644 (file)
@@ -24,7 +24,8 @@
           comment-contains-value: remerge$
     jobs:
       - rtdv3-global-verify
-      - rtdv3-global-merge
+      - rtdv3-global-merge:
+          build-timeout: 30
     stream:
       - master:
           branch: '*'
diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
deleted file mode 100644 (file)
index bd2f1d4..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-project-view
-    project-name: sdc-dcae-d
-    views:
-      - project-view
-
-- project:
-    name: sdc-dcae-d-ci
-    project-name: 'sdc-dcae-d-ci'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: '-P docker -DskipTests=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-    project: 'sdc/dcae-d/ci'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-dcae-d-ci-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-#- project:
-#    name: sdc-dcae-d-ci-arm64
-#    project-name: 'sdc-dcae-d-ci-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#         docker-pom: 'pom.xml'
-#         mvn-profile: 'docker'
-#         mvn-params: '-DskipTests=true'
-#         build-node: 'ubuntu1804-docker-arm64-4c-2g'
-#    project: 'sdc/dcae-d/ci'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-dcae-d-ci-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-timeout: 60
-#
-- project:
-    name: sdc-dcae-ci-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: ubuntu1804-builder-4c-4g
-    project: 'sdc/dcae-d/ci'
-    project-name: 'sdc-dcae-d-ci'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-ci-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-dcae-d-ci-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/dcae-d/ci
-    project-name: 'sdc-dcae-d-ci'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-ci-settings'
-
-- project:
-    name: sdc-dcae-d-ci-info
-    project-name: sdc-dcae-d-ci
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/dcae-d/ci
-    branch: master
diff --git a/jjb/sdc/sdc-dcae-d-csit.yaml b/jjb/sdc/sdc-dcae-d-csit.yaml
deleted file mode 100644 (file)
index a8a8f3e..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'sdc-dcae-d'
-    recipients: 'ofir.sonsino@intl.att.com'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - 'dcaed':
-          trigger_jobs:
-            - 'sdc-{stream}-docker-version-java-daily'
-            - '{project-name}-dt-be-main-{stream}-docker-version-java-daily'
-            - '{project-name}-dt-{stream}-docker-version-java-daily'
-            - '{project-name}-fe-{stream}-docker-version-java-daily'
-            - '{project-name}-tosca-lab-{stream}-docker-java-daily'
-    robot-options: ''
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
deleted file mode 100644 (file)
index 3127610..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-dt-be-main
-    project-name: 'sdc-dcae-d-dt-be-main'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: '-P docker -DskipTests=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'sdc/dcae-d/dt-be-main'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-#- project:
-#    name: sdc-dcae-d-dt-be-main-arm64
-#    project-name: 'sdc-dcae-d-dt-be-main-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-DskipTests=true'
-#    project: 'sdc/dcae-d/dt-be-main'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    files: '**'
-#    archive-artifacts: ''
-#    build-timeout: 60
-#
-- project:
-    name: sdc-dcae-d-dt-be-main-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: ubuntu1804-builder-4c-4g
-    project: 'sdc/dcae-d/dt-be-main'
-    project-name: 'sdc-dcae-d-dt-be-main'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-dcae-d-dt-be-main-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/dcae-d/dt-be-main
-    project-name: 'sdc-dcae-d-dt-be-main'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-
-- project:
-    name: sdc-dcae-d-dt-be-main-info
-    project-name: sdc-dcae-d-dt-be-main
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/dcae-d/dt-be-main
-    branch: master
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
deleted file mode 100644 (file)
index 7180195..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-dt-be-property
-    project-name: 'sdc-dcae-d-dt-be-property'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-    project: 'sdc/dcae-d/dt-be-property'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-- project:
-    name: sdc-dcae-d-dt-be-property-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: ubuntu1804-builder-4c-4g
-    project: 'sdc/dcae-d/dt-be-property'
-    project-name: 'sdc-dcae-d-dt-be-property'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-dcae-d-dt-be-property-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/dcae-d/dt-be-property
-    project-name: 'sdc-dcae-d-dt-be-property'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
-
-- project:
-    name: sdc-dcae-d-dt-be-property-info
-    project-name: sdc-dcae-d-dt-be-property
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/dcae-d/dt-be-property
-    branch: master
diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
deleted file mode 100644 (file)
index 22117c7..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-dt
-    project-name: 'sdc-dcae-d-dt'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: '-P server,docker -DskipTests=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'sdc/dcae-d/dt'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'sdc-dcae-d-dt-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-#- project:
-#    name: sdc-dcae-d-dt-arm64
-#    project-name: 'sdc-dcae-d-dt-arm64'
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    jobs:
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'server,docker'
-#          mvn-params: '-DskipTests=true'
-#    project: 'sdc/dcae-d/dt'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-dcae-d-dt-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-timeout: 60
-#
-- project:
-    name: sdc-dcae-d-dt-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: ubuntu1804-builder-4c-4g
-    project: 'sdc/dcae-d/dt'
-    project-name: 'sdc-dcae-d-dt'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-dcae-d-dt-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/dcae-d/dt
-    project-name: 'sdc-dcae-d-dt'
-    build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-settings'
-
-- project:
-    name: sdc-dcae-d-dt-info
-    project-name: sdc-dcae-d-dt
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/dcae-d/dt
-    branch: master
diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
deleted file mode 100644 (file)
index fcd7d51..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-fe
-    project-name: 'sdc-dcae-d-fe'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: '-P docker -DskipTests=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'sdc/dcae-d/fe'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'sdc-dcae-d-fe-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-#- project:
-#    name: sdc-dcae-d-fe-arm64
-#    project-name: 'sdc-dcae-d-fe-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-DskipTests=true'
-#    project: 'sdc/dcae-d/fe'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-dcae-d-fe-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-timeout: 60
-#
-- project:
-    name: sdc-dcae-d-fe-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: ubuntu1804-builder-4c-4g
-    project: 'sdc/dcae-d/fe'
-    project-name: 'sdc-dcae-d-fe'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-fe-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-dcae-d-fe-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/dcae-d/fe
-    project-name: 'sdc-dcae-d-fe'
-    build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-fe-settings'
-
-- project:
-    name: sdc-dcae-d-fe-info
-    project-name: sdc-dcae-d-fe
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/dcae-d/fe
-    branch: master
diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
deleted file mode 100644 (file)
index 1165d58..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-tosca-lab
-    project-name: 'sdc-dcae-d-tosca-lab'
-    project: 'sdc/dcae-d/tosca-lab'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-    - dcae-d-tosca-lab:
-        path: '.'
-        pattern: '**'
-    mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: '-P default -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
-    docker-pom: 'pom.xml'
-    mvn-profile: 'default'
-
-#- project:
-#    name: sdc-dcae-d-tosca-lab-arm64
-#    project-name: 'sdc-dcae-d-tosca-lab-arm64'
-#    project: 'sdc/dcae-d/tosca-lab'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    subproject:
-#    - dcae-d-tosca-lab:
-#        path: '.'
-#        pattern: '**'
-#    mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          mvn-params: '-Dmaven.test.skip=true'
-#    docker-pom: 'pom.xml'
-#    mvn-profile: 'default'
-#
-- project:
-    name: sdc-dcae-d-tosca-lab-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: ubuntu1804-docker-8c-8g
-    project: 'sdc/dcae-d/tosca-lab'
-    project-name: 'sdc-dcae-d-tosca-lab'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-dcae-d-tosca-lab-info
-    project-name: sdc-dcae-d-tosca-lab
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/dcae-d/tosca-lab
-    branch: master
diff --git a/jjb/sdc/sdc-microservices.yaml b/jjb/sdc/sdc-microservices.yaml
deleted file mode 100644 (file)
index 0aad248..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
----
-- project:
-    name: sdc-microservices-project-view
-    project-name: sdc-microservices
-    views:
-      - project-view
-
-- project:
-    name: sdc-microservices
-    project-name: 'sdc-microservices'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-v1-8c-8g
-          maven-versions-plugin: true
-          mvn-params: '-DskipTests=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-    subproject:
-      - 'catalog-facade-ms':
-          pom: 'catalog-facade-ms/pom.xml'
-          pattern: 'catalog-facade-ms/**'
-    project: 'sdc/microservices'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-microservices-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-    maven-version: 'mvn35'
-
-- project:
-    name: sdc-microservices-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: ubuntu1804-builder-4c-4g
-    project: 'sdc/microservices'
-    project-name: 'sdc-microservices'
-    branch: 'master'
-    mvn-settings: 'sdc-microservices-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-microservices-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/microservices
-    project-name: 'sdc-microservices'
-    branch: 'master'
-    mvn-settings: 'sdc-microservices-settings'
-
-- project:
-    name: sdc-microservices-info
-    project-name: sdc-microservices
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/microservices
-    branch: master
diff --git a/jjb/sdc/sdc-onap-ui-react.yaml b/jjb/sdc/sdc-onap-ui-react.yaml
deleted file mode 100644 (file)
index 45b9792..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: sdc-onap-ui-react-info
-    project-name: 'sdc-onap-ui-react'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'sdc/onap-ui-react'
-    branch: 'master'
-
-- project:
-    name: sdc-onap-ui-react
-    project-name: 'sdc-onap-ui-react'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-    project: 'sdc/onap-ui-react'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-onap-ui-react-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-    maven-version: 'mvn35'
-
-- project:
-    name: sdc-onap-ui-react-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: ubuntu1804-builder-4c-4g
-    project: 'sdc/onap-ui-react'
-    project-name: 'sdc-onap-ui-react'
-    branch: 'master'
-    mvn-settings: 'sdc-onap-ui-react-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
index 862447a..c64d17e 100644 (file)
@@ -1,10 +1,4 @@
 ---
-- project:
-    name: sdc-master-project-view
-    project-name: sdc-master
-    views:
-      - project-view
-
 - project:
     name: sdc-sdc-docker-project-view
     project-name: sdc-sdc-docker
     views:
       - project-view
 
+- project:
+    name: sdc-project-view
+    project-name: sdc
+    views:
+      - project-view
+
 - project:
     name: sdc
     project-name: 'sdc'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          mvn-params: '-P docker -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          build-node: 'ubuntu1804-docker-8c-16g'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1804-docker-v1-8c-8g'
+          build-node: 'ubuntu1804-docker-8c-16g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
@@ -39,7 +40,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
@@ -55,9 +56,8 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'sdc-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar"
     cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-16g
     project: 'sdc'
     project-name: 'sdc'
     branch: 'master'
     mvn-settings: 'sdc-settings'
-    mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+    java-version: openjdk11
+    mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
 
 - project:
-    name: sdc-clm-catalog
+    name: sdc-clm
     jobs:
       - gerrit-maven-clm:
           build-timeout: 120
           submodule-timeout: 30
-          mvn-params: '-P catalog -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
     nexus-iq-namespace: 'onap-'
     project: sdc
-    project-name: 'sdc-catalog'
-    build-node: ubuntu1804-docker-8c-8g
-    branch: 'master'
-    mvn-settings: 'sdc-settings'
-
-- project:
-    name: sdc-clm-onboarding
-    jobs:
-      - gerrit-maven-clm:
-          build-timeout: 120
-          submodule-timeout: 30
-          mvn-params: '-P onboarding -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
-    nexus-iq-namespace: 'onap-'
-    project: sdc
-    project-name: 'sdc-onboarding'
+    project-name: 'sdc'
     build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
     mvn-settings: 'sdc-settings'
+    java-version: openjdk11
 
 - project:
     name: sdc-info
     mvn-clean-install: true
     project: 'sdc'
     branch: master
+    java-version: openjdk11
index 0b04a27..d3cc5fe 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version : "mvn36"
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
index ee7c79d..95b1f90 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: "mvn36"
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be
index 428251a..e0cc013 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: "mvn36"
     mvn-settings: 'sdnc-oam-settings'
     maven-version: "mvn35"
     files: '**'
diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml
deleted file mode 100644 (file)
index ae86ef5..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- project:
-    name: sdnc-oom
-    helm-module: 'sdnc'
-    project-name: 'sdnc-oom'
-    project: 'sdnc/oom'
-    jobs:
-      - '{project-name}-{stream}-verify-external-helm'
-      - '{project-name}-{stream}-merge-external-helm':
-          build_script: '{oom_build_script}'
-          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
-          files: '**'
-    stream:
-      - 'master':
-          branch: 'master'
-
-    mvn-settings: 'sdnc-oom-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-helm-2c-1g
-    pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
-    oom_build_script: |
-        #!/bin/bash
-        set -e -o pipefail
-        cd kubernetes/
-        make all
-    build_script: |
-        #!/bin/bash
-        cd kubernetes/
-        make common
-        make {helm-module}
-    oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
-
-- project:
-    name: sdnc-oom-info
-    project-name: sdnc-oom
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdnc/oom
-    branch: master
index 87cf07f..a515ee9 100644 (file)
@@ -27,7 +27,6 @@
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
-    java-version: openjdk11
     archive-artifacts: ''
 
 - project:
diff --git a/jjb/testsuite/testsuite-cds.yaml b/jjb/testsuite/testsuite-cds.yaml
new file mode 100644 (file)
index 0000000..50a1558
--- /dev/null
@@ -0,0 +1,8 @@
+---
+- project:
+    name: testsuite-cds-info
+    project: testsuite/cds
+    project-name: testsuite-cds
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
index d435641..ffc6c06 100644 (file)
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#          build-node: ubuntu1804-docker-8c-8g
     project: 'vnfsdk/refrepo'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+                branch: 'master'
+                java-version: openjdk11
+        - 'frankfurt':
+                branch: 'frankfurt'
+                java-version: openjdk8
     mvn-settings: 'vnfsdk-refrepo-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
-#- project:
-#    name: vnfsdk-refrepo-arm64
-#    project-name: 'vnfsdk-refrepo-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-aai-docker-java-daily':
-#          pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
-#          mvn-goals: 'docker:build'
-#          docker-image-name: 'onap/vnfsdk/refrepo'
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: 'vnfsdk/refrepo'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'vnfsdk-refrepo-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#
 - project:
     name: vnfsdk-refrepo-sonar
     jobs:
       - gerrit-maven-sonar
+    java-version: openjdk11
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -81,6 +60,7 @@
 
 - project:
     name: vnfsdk-refrepo-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
index 3d5a602..d7f4b27 100644 (file)
         build-node: centos7-docker-8c-8g
     project: 'vnfsdk/validation'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+            branch: 'master'
+            java-version: openjdk11
+        - 'frankfurt':
+            branch: 'frankfurt'
+            java-version: openjdk8
     mvn-settings: 'vnfsdk-validation-settings'
     files: '**'
     archive-artifacts: ''
@@ -24,6 +28,7 @@
     name: vnfsdk-validation-sonar
     jobs:
       - gerrit-maven-sonar
+    java-version: openjdk11
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -49,6 +54,7 @@
 
 - project:
     name: vnfsdk-validation-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'