Merge "Add CSIT verify jobs to DMaaP"

diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml
index 2b87b1c..e60cd01 100644 (file)
--- a/jjb/aai/aai-oom.yaml
+++ b/jjb/aai/aai-oom.yaml
@@ -17,8 +17,6 @@
           post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: '**'
     stream:
-      - 'master':
-          branch: 'master'
       - 'guilin':
           branch: 'guilin'
 
@@ -31,10 +29,10 @@
         #!/bin/bash
         set -e -o pipefail
         cd kubernetes/
-        make HELM_BIN=helm3 all
+        make HELM_BIN=helm3.3 all
     build_script: |
         #!/bin/bash
         cd kubernetes/
-        make HELM_BIN=helm3 common
-        make HELM_BIN=helm3 {helm-module}
+        make HELM_BIN=helm3.3 common
+        make HELM_BIN=helm3.3 {helm-module}
     oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh

diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 0a46478..a8e4573 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -31,6 +31,8 @@
     mvn-settings: 'aai-sparky-be-settings'
     files: '**'
     archive-artifacts: ''
+    mvn-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: aai-sparky-be-sonar
@@ -49,6 +51,8 @@
     mvn-settings: 'aai-sparky-be-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: aai-sparky-be-clm
@@ -61,6 +65,8 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
+    mvn-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: aai-sparky-be-info

diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml
new file mode 100644 (file)
index 0000000..5806a5c
--- /dev/null
+++ b/jjb/cps/cps-cps-tbdmt.yaml
@@ -0,0 +1,81 @@
+---
+- project:
+    name: cps-tbdmt-project-view
+    project-name: cps-cps-tbdmt
+    views:
+      - project-view
+
+- project:
+    name: cps-tbdmt-info
+    project: cps/cps-tbdmt
+    project-name: cps-cps-tbdmt
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+      name: cps-tbdmt-clm
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      jobs:
+          - gerrit-maven-clm
+      nexus-iq-namespace: 'onap-'
+      project: cps/cps-tbdmt
+      project-name: cps-cps-tbdmt
+      branch: 'master'
+      mvn-settings: 'cps-cps-tbdmt-settings'
+      build-node: centos7-docker-8c-8g
+
+- project:
+      name: cps-tbdmt
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      project-name: cps-cps-tbdmt
+      project: cps/cps-tbdmt
+      mvn-snapshot-id: 'ecomp-snapshots'
+      nexus-snapshot-repo: 'snapshots'
+      jobs:
+          - gerrit-maven-verify
+          - gerrit-maven-merge
+          - gerrit-maven-stage:
+                sign-artifacts: true
+                build-node: centos7-docker-8c-8g
+                maven-versions-plugin: true
+          - gerrit-maven-docker-stage:
+                build-node: centos7-docker-8c-8g
+                maven-versions-plugin: true
+                mvn-params: '-P docker'
+                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
+      stream:
+          - 'master':
+                branch: 'master'
+      mvn-settings: 'cps-cps-tbdmt-settings'
+      files: '**'
+      archive-artifacts: ''
+      build-node: centos7-docker-8c-8g
+
+- project:
+      name: cps-tbdmt-sonar
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      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: cps/cps-tbdmt
+      project-name: cps-cps-tbdmt
+      branch: 'master'
+      mvn-settings: 'cps-cps-tbdmt-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml
index 93d8d1b..129e299 100644 (file)
--- a/jjb/cps/cps-cps-temporal.yaml
+++ b/jjb/cps/cps-cps-temporal.yaml
@@ -12,3 +12,84 @@
     build-node: centos7-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    name: cps-cps-temporal
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    project-name: cps-cps-temporal
+    project: cps/cps-temporal
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
+    jobs:
+      - gerrit-maven-verify
+      - gerrit-maven-merge
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: -Pdocker
+          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
+    stream:
+      - 'master':
+          branch: master
+    mvn-settings: cps-cps-temporal-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: centos7-docker-8c-8g
+
+- project:
+    name: cps-cps-temporal-clm
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: onap-
+    project: cps/cps-temporal
+    project-name: cps-cps-temporal
+    branch: master
+    mvn-settings: cps-cps-temporal-settings
+    build-node: centos7-docker-8c-8g
+
+- project:
+    name: cps-cps-temporal-sonar
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    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: cps/cps-temporal
+    project-name: cps-cps-temporal
+    branch: master
+    mvn-settings: cps-cps-temporal-settings
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: cps-cps-temporal-whitesource
+    project-name: cps-cps-temporal
+    jobs:
+      - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: mvn36
+    mvn-settings: cps-cps-temporal-settings
+    wss-product-name: cps-cps-temporal
+    mvn-clean-install: true
+    project: cps/cps-temporal
+    branch: master
+    build-node: centos7-docker-8c-8g

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index a1d7378..0e4baef 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -43,10 +43,11 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+          mvn-params: '-DprocessAllModules'
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
+          mvn-params: '-P cps-xnf-docker'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':

diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 7c938f0..a78dcd6 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -14,20 +14,19 @@
     build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
     jobs:
-      - gerrit-tox-verify
-      - gerrit-docker-verify
-      - gerrit-docker-merge
+      - '{project-name}-python-jobs'
       - '{project-name}-{stream}-release-version-java-daily'
-    files: '**'
     archive-artifacts: ''
     container-tag-method: latest
-    docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
     nexus-iq-namespace: 'onap-'
-    docker-root: '.'
-    docker-name: onap/org.onap.dcaegen2.collectors.snmptrap
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '**'
+        pattern: '.*'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
+    files: '**'
 
 
 - project:
@@ -48,17 +47,6 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- project:
-    name: dcaegen2-collectors-snmptrap-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/collectors/snmptrap
-    build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-collectors-snmptrap'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
-
 - project:
     name: dcaegen2-collectors-snmptrap-info
     project-name: dcaegen2-collectors-snmptrap

diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index a71b9fa..aa59095 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -13,16 +13,38 @@
           branch: 'guilin'
     build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
-    subproject:
-      - 'policy-handler':
-          pattern: '**'
-          path: 'policyhandler'
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{subproject}-python-staging-{stream}'
-      - '{project-name}-{subproject}-python-release-{stream}'
-    files: '**'
+      - '{project-name}-python-jobs'
+      - gerrit-docker-verify
+      - gerrit-docker-merge:
+          post_docker_build_script: |
+              #!/bin/bash
+              set -uex -o pipefail
+              DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
+              DNAME={container-snapshot-registry}/{docker-name}
+              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
+              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
+              docker push $DNAME:$DOCKER_IMAGE_TAG2
+              docker push $DNAME:latest
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
     archive-artifacts: ''
+    nexus-iq-namespace: 'onap-'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
+    files: '**'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '.*'
+    container-tag-method: latest
+    docker-root: '.'
+    docker-name: onap/org.onap.dcaegen2.platform.policy-handler
+    docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh
+
+
 
 - project:
     name: dcaegen2-platform-policy-handler-sonar

diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
index 63e1b07..b68e769 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
@@ -11,5 +11,7 @@
     functionality:
       - 'pmmapper':
           trigger_jobs:
+      - 'files-processing-config-pmmapper':
+          trigger_jobs:
     robot-options: ''
     branch: 'master'

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 7d4541f..4f7db33 100644 (file)
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -51,12 +51,11 @@
 # JOB TEMPLATES #
 #################
 - job-template:
-    name: '{project-name}-{stream}-verify-helm'
+    name: '{project-name}-{stream}-verify-{helm_bin}'
     # Job template for helm verify jobs
 
     <<: *helm_job_boiler_plate
     concurrent: true
-    helm_bin: helm3
 
     scm:
       - gerrit-trigger-scm:
@@ -75,8 +74,8 @@
 
     builders:
       - lf-infra-pre-build
-      - inject:
-          properties-content: 'HELM_BIN={helm_bin}'
+      - shell: |
+          echo "export HELM_BIN={helm_bin}" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
 
@@ -104,6 +103,8 @@
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
       - lf-infra-create-netrc:
@@ -151,6 +152,8 @@
       - inject:
           properties-content: 'HELM_MODULE={helm-module}'
       - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
 
@@ -192,6 +195,8 @@
       - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
       - lf-infra-create-netrc:
@@ -225,6 +230,8 @@
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
       - lf-infra-create-netrc:
@@ -244,6 +251,8 @@
     disabled: true
     builders:
       - lf-infra-pre-build
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
@@ -257,6 +266,8 @@
     disabled: true
     builders:
       - lf-infra-pre-build
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
@@ -283,6 +294,8 @@
 
     builders:
       - lf-infra-pre-build
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 6a3fed2..eeeab15 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -10,14 +10,15 @@
     pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
     oom_build_script: |
       #!/bin/bash
+      source helm.prop
       set -e -o pipefail
       cd kubernetes/
-      make all
+      make HELM_BIN=$HELM_BIN all
     subproject_build_script: |
       #!/bin/bash
       cd kubernetes/
-      make common
-      make {subproject}
+      make HELM_BIN=$HELM_BIN common
+      make HELM_BIN=$HELM_BIN {subproject}
 
     stream:
       - "master":
@@ -37,23 +38,35 @@
       - "robot":
           files: "kubernetes/robot/**"
 
+    helm_bin:
+      - helm3.5
+      - helm3.3
+
+    exclude:
+      - stream: guilin
+        helm_bin: helm3.5
+      - stream: frankfurt
+        helm_bin: helm3.5
+      - stream: frankfurt
+        helm_bin: helm3.3
+      - stream: dublin
+        helm_bin: helm3.5
+      - stream: dublin
+        helm_bin: helm3.3
+      - stream: casablanca
+        helm_bin: helm3.5
+      - stream: casablanca
+        helm_bin: helm3.3
     jobs:
       - "{project-name}-{stream}-image-verify":
           files: "**"
       - "{project-name}-{stream}-verify-helm2":
           files: "**"
           build-timeout: 360
-      - "{project-name}-{stream}-verify-helm":
-          build_script: "{oom_build_script}"
-          files: "**"
-          build-timeout: 360
-          stream: master
-      - "{project-name}-{stream}-verify-helm":
+      - "{project-name}-{stream}-verify-{helm_bin}":
           build_script: "{oom_build_script}"
           files: "**"
           build-timeout: 360
-          stream: guilin
-          helm_bin: "helm3.3"
       - "{project-name}-{stream}-merge-helm":
           build_script: "{oom_build_script}"
           files: "**"

diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index 0b24b19..479be53 100644 (file)
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -9,7 +9,7 @@
     kubectl_version: 1.15.11
     helm_version: 2.16.6
     helm3_3_version: 3.3.4
-    helm3_version: 3.5.1
+    helm3_5_version: 3.5.1
     chartmuseum_version: 0.12.0
 
   tasks:
@@ -71,7 +71,7 @@
              which helm3.3
           become: true
 
-    - name: 'Install Helm 3.5 {{helm3_version}}'
+    - name: 'Install Helm3.5 {{helm3_5_version}}'
       block:
         - name: 'Create directory /tmp/helm3.5'
           file:
@@ -79,11 +79,11 @@
             state: directory
         - name: 'Fetch tar.gz for Helm 3.5'
           get_url:
-            url: "https://get.helm.sh/helm-v{{helm3_version}}-linux-amd64.tar.gz"
+            url: "https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz"
             dest: /tmp/helm3.5
         - name: 'Unarchive Helm 3.5'
           unarchive:
-            src: "/tmp/helm3.5/helm-v{{helm3_version}}-linux-amd64.tar.gz"
+            src: "/tmp/helm3.5/helm-v{{helm3_5_version}}-linux-amd64.tar.gz"
             dest: /tmp/helm3.5
             remote_src: true
           become: yes
@@ -98,8 +98,8 @@
         - name: 'Install Helm 3.5'
           shell: |
              echo "----> Installing helm3.5"
-             wget 'https://get.helm.sh/helm-v{{helm3_version}}-linux-amd64.tar.gz'
-             tar -xvf 'https://get.helm.sh/helm-v{{helm3_version}}-linux-amd64.tar.gz'
+             wget 'https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz'
+             tar -xvf 'https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz'
              mv linux-amd64/helm /usr/local/bin/helm3.5
              which helm3.5
           become: true

diff --git a/shell/helm-repo-init.sh b/shell/helm-repo-init.sh
index 9583bad..d899043 100755 (executable)
--- a/shell/helm-repo-init.sh
+++ b/shell/helm-repo-init.sh
@@ -5,5 +5,6 @@ set -e -o pipefail
 mkdir -p ".chartstorage"
 
 chartmuseum --port=6464 --storage="local" --storage-local-rootdir=".chartstorage" &> /dev/null &
-helm3 plugin install https://github.com/chartmuseum/helm-push.git
-helm3 repo add local http://localhost:6464
+source helm.prop
+$HELM_BIN plugin install https://github.com/chartmuseum/helm-push.git
+$HELM_BIN repo add local http://localhost:6464