Merge "[DMAAP] Refactor dmaap jobs"

diff --git a/global-jjb b/global-jjb
index 43e8d01..eb2415e 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 43e8d01716072314eb7d90cb1da1db4b431bb6cd
+Subproject commit eb2415e3459abd8e3f3dbad90cddc1b03b14b92a

diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
index d3cd46a..e93c0d4 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210223-063615.366
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210306-131321.125
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
index 0ad121a..27251e5 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20210223-063350.962
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20210317-233509.164
 LABELS=ubuntu1804-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
index 7ad0f8a..a84f9a9 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210223-063615.366
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210317-220033.605
 LABELS=ubuntu1804-docker-8c-16g
 HARDWARE_ID=v2-highcpu-16
 VOLUME_SIZE=40

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
index b2c8e2b..81b9539 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210223-063615.366
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210317-220033.605
 LABELS=ubuntu1804-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg
index e49f0a6..cd44cbc 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711
 LABELS=ubuntu1804-docker-arm64-4c-2g
 HARDWARE_ID=lf-standard-2
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg
index 90de5db..47fa5e7 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711
 LABELS=ubuntu1804-docker-arm64-4c-4g
 HARDWARE_ID=lf-standard-4
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
index 2be74d1..97fb2ca 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210223-063615.366
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210317-220033.605
 LABELS=ubuntu1804-docker-v1-8c-8g
 HARDWARE_ID=v1-standard-8
 VOLUME_SIZE=50

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
index 2b8e968..f72ecc1 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20210216-210751.145
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20210318-054700.866
 LABELS=ubuntu1804-helm-2c-1g
 HARDWARE_ID=v2-highcpu-2
 VOLUME_SIZE=50

diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index 4328a27..4d2239f 100644 (file)
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -15,6 +15,8 @@
       stream:
           - 'master':
                 branch: 'master'
+          - 'honolulu':
+                branch: 'honolulu'
       mvn-settings: 'cps-settings'
       robot-options: ''
       branch: 'master'

diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
index 69eb137..fbf33b4 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
@@ -92,9 +92,6 @@
       - dcaegen2-platform-mod-onboardingapi:
           src-dir: mod/onboardingapi
           docker-name: onap/org.onap.dcaegen2.platform.mod.onboardingapi
-      - dcaegen2-platform-oti-event-handler:
-          src-dir: oti/event-handler
-          docker-name: onap/org.onap.dcaegen2.platform.oti.event-handler
     stream:
       - master:
           branch: master
@@ -108,7 +105,5 @@
           project-name: dcaegen2-platform-adapter
       - project-view:
           project-name: dcaegen2-platform-mod
-      - project-view:
-          project-name: dcaegen2-platform-oti
     jobs:
       - dcaegen2-docker-python-jobs

diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
deleted file mode 100644 (file)
index bf5c6c4..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-oti-event-proc
-    project-name: dcaegen2-platform-oti
-    # git repo
-    project: dcaegen2/platform
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java':
-          mvn-goals: 'clean install'
-    subproject:
-      - eventproc:
-          pom: 'oti/event-proc/pom.xml'
-          pattern: 'oti/event-proc/**'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: dcaegen2-platform-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-
-- project:
-    name: dcaegen2-platform-oti-event-proc-release
-    project: 'dcaegen2/platform'
-    project-name: 'dcaegen2-platform-oti-event-proc'
-    jobs:
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
-          maven-versions-plugin: true
-          version-properties-file: 'oti/event-proc/version.properties'
-          mvn-pom: 'oti/event-proc/pom.xml'
-          mvn-params: '-f oti/event-proc/pom.xml'
-          mvn-goals: 'clean deploy -Ddockerfile.skip -f oti/event-proc/pom.xml'
-          pattern: 'oti/event-proc/**'
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package dockerfile:build dockerfile:push -f oti/event-proc/pom.xml'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          pattern: 'oti/event-proc/**'
-
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
-
-- project:
-    name: dcaegen2-platform-oti-event-proc-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: 'dcaegen2-platform-oti-event-proc'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
-    mvn-params: '-f oti/event-proc/pom.xml'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-
-- project:
-    name: dcaegen2-platform-oti-event-proc-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: dcaegen2-platform-oti-event-proc-clm
-    mvn-params: '-f oti/event-proc/pom.xml'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
-

diff --git a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
new file mode 100644 (file)
index 0000000..a067acf
--- /dev/null
+++ b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
@@ -0,0 +1,41 @@
+---
+
+- project:
+    name: integration-simulators-A1-policy-enforcement-simulator-info
+    project: integration/simulators/A1-policy-enforcement-simulator
+    project-name: integration-simulators-A1-policy-enforcement-simulator
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-simulators-A1-policy-enforcement-simulator-linters
+    project: integration/simulators/A1-policy-enforcement-simulator
+    project-name: integration-simulators-A1-policy-enforcement-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'
+      - 'python':
+          tox-dir: '.'
+          tox-envs: 'py'
+          pattern: '**/*.py'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'

diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
index 3eb2722..a64a4dc 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
@@ -14,7 +14,7 @@
                 build-node: ubuntu1804-docker-8c-8g
                 container-public-registry: 'nexus3.onap.org:10001'
                 container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-goals: 'clean install -P docker'
+                mvn-goals: 'clean install -P docker -DskipDockerPush=false'
           - '{project-name}-gerrit-release-jobs':
                 build-node: centos7-docker-8c-8g
 

diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
index 7bfc09e..43e3161 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
@@ -14,7 +14,7 @@
                 build-node: ubuntu1804-docker-8c-8g
                 container-public-registry: 'nexus3.onap.org:10001'
                 container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-goals: 'clean install -P docker'
+                mvn-goals: 'clean deploy -P docker -DskipDockerPush=false'
           - '{project-name}-gerrit-release-jobs':
                 build-node: centos7-docker-8c-8g
 

diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
new file mode 100644 (file)
index 0000000..aeb03ee
--- /dev/null
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
@@ -0,0 +1,66 @@
+---
+
+- project:
+      name: integration-simulators-nf-simulator-netconf-server
+      project-name: 'integration-simulators-nf-simulator-netconf-server'
+      python-version: python3.8
+      jobs:
+          - '{project-name}-{stream}-verify-java'
+          - '{project-name}-{stream}-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
+                container-public-registry: 'nexus3.onap.org:10001'
+                container-staging-registry: 'nexus3.onap.org:10003'
+                mvn-goals: 'clean install -P docker -DskipDockerPush=false'
+          - '{project-name}-gerrit-release-jobs':
+                build-node: centos7-docker-8c-8g
+
+      project: 'integration/simulators/nf-simulator/netconf-server'
+      stream:
+          - 'master':
+                branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-netconf-server-settings'
+      # due to a strange macro / variable translation problem this needs
+      # to be passed as a string block to properly get the properties
+      # correctly defined in the job
+      maven-deploy-properties: |
+          deployAtEnd=true
+      files: '**'
+      archive-artifacts: ''
+      build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+      name: integration-simulators-nf-simulator-netconf-server-sonar
+      jobs:
+          - gerrit-maven-sonar
+      sonarcloud: true
+      sonarcloud-project-organization: '{sonarcloud_project_organization}'
+      sonarcloud-api-token: '{sonarcloud_api_token}'
+      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+      sonar-mvn-goal: '{sonar_mvn_goal}'
+      cron: '@daily'
+      build-node: ubuntu1804-docker-8c-8g
+      project: 'integration/simulators/nf-simulator/netconf-server'
+      project-name: 'integration-simulators-nf-simulator-netconf-server'
+      branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-netconf-server-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+      name: integration-simulators-nf-simulator-netconf-server-view
+      project-name: integration-simulators-nf-simulator-netconf-server
+      views:
+          - project-view
+
+- project:
+      name: integration-simulators-nf-simulator-netconf-server-info
+      project: integration/simulators/nf-simulator/netconf-server
+      project-name: integration-simulators-nf-simulator-netconf-server
+      build-node: centos7-builder-2c-1g
+      jobs:
+          - gerrit-info-yaml-verify

diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
new file mode 100644 (file)
index 0000000..e260745
--- /dev/null
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
@@ -0,0 +1,41 @@
+---
+- project:
+      name: integration-simulators-nf-simulator-simulator-cli
+      project-name: 'integration-simulators-nf-simulator'
+      python-version: python3
+      tox-dir: '.'
+      tox-envs: ''
+      subproject:
+          - simulator-cli:
+                path: './simulator-cli'
+                pattern: '**'
+      project: 'integration/simulators/nf-simulator'
+      stream:
+          - 'master':
+                branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-settings'
+      build-node: ubuntu1804-builder-4c-4g
+      jobs:
+          - '{project-name}-{stream}-{subproject}-verify-python'
+
+- project:
+      name: integration-simulators-nf-simulator-sonar
+      jobs:
+          - gerrit-tox-sonar
+      cron: '@daily'
+      build-node: ubuntu1804-builder-4c-4g
+      project: 'integration/simulators/nf-simulator'
+      project-name: 'integration-simulators-nf-simulator'
+      branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+      name: integration-simulators-nf-simulator-info
+      jobs:
+          - gerrit-info-yaml-verify
+      build-node: centos7-builder-2c-1g
+      project: 'integration/simulators/nf-simulator'
+      project-name: 'integration-simulators-nf-simulator'
+      branch: 'master'

diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
index b523801..2994573 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
@@ -14,7 +14,7 @@
                 build-node: ubuntu1804-docker-8c-8g
                 container-public-registry: 'nexus3.onap.org:10001'
                 container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-goals: 'clean install -P docker'
+                mvn-goals: 'clean deploy -P docker -DskipDockerPush=false'
           - '{project-name}-gerrit-release-jobs':
                 build-node: centos7-docker-8c-8g
 

diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml
new file mode 100644 (file)
index 0000000..f61a878
--- /dev/null
+++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml
@@ -0,0 +1,40 @@
+---
+- project:
+    name: integration-usecases-A1-policy-enforcement-r-apps-info
+    project: integration/usecases/A1-policy-enforcement-r-apps
+    project-name: integration-usecases-A1-policy-enforcement-r-apps
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-usecases-A1-policy-enforcement-r-apps-linters
+    project: integration/usecases/A1-policy-enforcement-r-apps
+    project-name: integration-usecases-A1-policy-enforcement-r-apps
+    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'
+      - 'python':
+          tox-dir: '.'
+          tox-envs: 'py'
+          pattern: '**/*.py'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'

diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml
new file mode 100644 (file)
index 0000000..13659e6
--- /dev/null
+++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml
@@ -0,0 +1,41 @@
+---
+
+- project:
+    name: integration-usecases-A1-policy-enforcement-info
+    project: integration/usecases/A1-policy-enforcement
+    project-name: integration-usecases-A1-policy-enforcement
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-usecases-A1-policy-enforcement-linters
+    project: integration/usecases/A1-policy-enforcement
+    project-name: integration-usecases-A1-policy-enforcement
+    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'
+      - 'python':
+          tox-dir: '.'
+          tox-envs: 'py'
+          pattern: '**/*.py'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index e120805..ebc34a4 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -1,3 +1,20 @@
+- project:
+    name: policy-distribution-project-csit
+    jobs:
+      - '{project-name}-{stream}-project-csit-{functionality}'
+    project-name: 'policy-distribution'
+    recipients: 'ram.krishna.verma@est.tech'
+    project: 'policy/docker'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+    functionality:
+      - 'distribution'
+    trigger_jobs:
+      - 'policy-distribution-{stream}-merge-java'
+
 - project:
     name: policy-xacml-pdp-project-csit
     jobs:
@@ -146,14 +163,10 @@
     java-version: openjdk11
     recipients: 'ram.krishna.verma@est.tech'
     stream:
-      - 'master':
-          branch: master
       - 'frankfurt':
           branch: frankfurt
       - 'guilin':
           branch: guilin
-      - 'honolulu':
-          branch: 'honolulu'
     functionality:
       - 'distribution'
     trigger_jobs:

diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml
index 7e92f6b..5b87809 100644 (file)
--- a/jjb/sdc/sdc-sdc-helm-validator.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator.yaml
@@ -12,3 +12,64 @@
     build-node: centos7-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    name: sdc-sdc-helm-validator
+    project-name: 'sdc-sdc-helm-validator'
+    java-version: openjdk11
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-goals: 'clean deploy'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-goals: 'clean install docker:build docker:push'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+    project: 'sdc/sdc-helm-validator'
+    mvn-settings: 'sdc-sdc-helm-validator-settings'
+    stream:
+      - 'master':
+            branch: 'master'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+
+- project:
+    name: sdc-sdc-helm-validator-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: 'sdc/sdc-helm-validator'
+    project-name: 'sdc-sdc-helm-validator'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-helm-validator-settings'
+    mvn-params: '-Dsonar.branch={branch}'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-sdc-helm-validator-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'sdc/sdc-helm-validator'
+    project-name: 'sdc-sdc-helm-validator'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-helm-validator-settings'

diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml
index 869d91e..e0f1fa1 100644 (file)
--- a/jjb/so/so-adapters-so-cnf-adapter.yaml
+++ b/jjb/so/so-adapters-so-cnf-adapter.yaml
@@ -36,6 +36,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     mvn-settings: 'so-adapters-so-cnf-adapter-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
index cf3a8db..86f3f21 100644 (file)
--- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
@@ -36,6 +36,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
index e01c232..2d1a8d5 100644 (file)
--- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
@@ -36,6 +36,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml
index 4babd76..a39a460 100644 (file)
--- a/jjb/so/so-adapters-so-nssmf-adapter.yaml
+++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml
@@ -36,6 +36,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     mvn-settings: 'so-adapters-so-nssmf-adapter-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml
index 96e495a..2138fcf 100644 (file)
--- a/jjb/so/so-adapters-so-oof-adapter.yaml
+++ b/jjb/so/so-adapters-so-oof-adapter.yaml
@@ -36,6 +36,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     mvn-settings: 'so-adapters-so-oof-adapter-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index bd29042..c694f35 100644 (file)
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -14,6 +14,9 @@
       - 'guilin':
           branch: 'guilin'
           java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     functionality:
       - 'integration-testing':
           trigger_jobs:

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 6355cf0..c7d7bb7 100644 (file)
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -19,6 +19,9 @@
       - 'guilin':
           branch: 'guilin'
           java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     mvn-settings: 'so-libs-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

diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml
index 295eddd..7e56144 100644 (file)
--- a/jjb/so/so-so-admin-cockpit.yaml
+++ b/jjb/so/so-so-admin-cockpit.yaml
@@ -36,6 +36,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     mvn-settings: 'so-so-admin-cockpit-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml
index a8ba509..5a54d93 100644 (file)
--- a/jjb/so/so-so-etsi-nfvo.yaml
+++ b/jjb/so/so-so-etsi-nfvo.yaml
@@ -36,6 +36,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     mvn-settings: 'so-so-etsi-nfvo-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 8be62de..6fae06b 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -32,8 +32,8 @@
       - 'guilin':
           branch: 'guilin'
           java-version: openjdk11
-      - 'dynamicBPMN':
-          branch: 'Dynamic_BPMN'
+      - 'honolulu':
+          branch: 'honolulu'
           java-version: openjdk11
     mvn-settings: 'so-settings'
     files: '**'
@@ -113,3 +113,4 @@
     project: so
     branch: master
     branch: guilin
+    branch: honolulu

diff --git a/jjb/testsuite/testsuite-cds-mock-odl.yaml b/jjb/testsuite/testsuite-cds-mock-odl.yaml
index 72b3c34..65c818c 100644 (file)
--- a/jjb/testsuite/testsuite-cds-mock-odl.yaml
+++ b/jjb/testsuite/testsuite-cds-mock-odl.yaml
@@ -12,3 +12,59 @@
     build-node: centos7-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    name: testsuite-cds-mock-odl-linters
+    project: 'testsuite/cds-mock-odl'
+    project-name: 'testsuite-cds-mock-odl'
+    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'
+      - 'python':
+          tox-dir: '.'
+          tox-envs: 'py'
+          pattern: '**/*.py'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
+
+- project:
+    name: 'testsuite-cds-mock-odl-docker'
+    jobs:
+      - gerrit-docker-verify:
+          project-name: 'testsuite-cds-mock-odl'
+          docker-root: .
+          docker-name: 'onap/cds-mock-odl'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-merge:
+          project-name: 'testsuite-cds-mock-odl'
+          docker-root: .
+          docker-name: 'onap/cds-mock-odl'
+          docker-build-args: '-f ./docker/Dockerfile'
+    project: 'testsuite/cds-modk-odl'
+    stream:
+      - 'master':
+            branch: 'master'
+            files: ''
+    docker-root: '$WORKSPACE'
+    mvn-settings: 'testsuite-cds-mock-odl-settings'
+    build-node: ubuntu1804-docker-8c-8g
+    cron: '@daily'
+    container-tag-method: stream

diff --git a/jjb/testsuite/testsuite-cds-mock-server.yaml b/jjb/testsuite/testsuite-cds-mock-server.yaml
index b68e5fd..c6bc7a3 100644 (file)
--- a/jjb/testsuite/testsuite-cds-mock-server.yaml
+++ b/jjb/testsuite/testsuite-cds-mock-server.yaml
@@ -12,3 +12,36 @@
     build-node: centos7-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    name: testsuite-cds-mock-server-linters
+    project: 'testsuite/cds-mock-server'
+    project-name: 'testsuite-cds-mock-server'
+    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'
+      - 'python':
+          tox-dir: '.'
+          tox-envs: 'py'
+          pattern: '**/*.py'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
+

diff --git a/jjb/testsuite/testsuite-cds-mock-ssh.yaml b/jjb/testsuite/testsuite-cds-mock-ssh.yaml
index 4d124e9..9fad20f 100644 (file)
--- a/jjb/testsuite/testsuite-cds-mock-ssh.yaml
+++ b/jjb/testsuite/testsuite-cds-mock-ssh.yaml
@@ -12,3 +12,36 @@
     build-node: centos7-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    name: testsuite-cds-mock-ssh-linters
+    project: 'testsuite/cds-mock-ssh'
+    project-name: 'testsuite-cds-mock-ssh'
+    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'
+      - 'python':
+          tox-dir: '.'
+          tox-envs: 'py'
+          pattern: '**/*.py'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
+

diff --git a/jjb/usecase/usecase-ui-nlp.yaml b/jjb/usecase/usecase-ui-nlp.yaml
deleted file mode 100644 (file)
index 6528d3b..0000000
--- a/jjb/usecase/usecase-ui-nlp.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: usecase-ui-nlp-project-view
-    project-name: usecase-ui-nlp
-    views:
-      - project-view
-
-- project:
-    name: usecase-ui-nlp-info
-    project: usecase-ui/nlp
-    project-name: usecase-ui-nlp
-    build-node: centos7-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify

diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml
new file mode 100644 (file)
index 0000000..bb984ae
--- /dev/null
+++ b/jjb/usecaseui/usecase-ui-nlp.yaml
@@ -0,0 +1,71 @@
+---
+
+- project:
+    name: usecase-ui-nlp
+    project-name: 'usecase-ui-nlp'
+    project: 'usecase-ui/nlp'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'usecase-ui-nlp-settings'
+    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-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: usecase-ui-nlp-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: 'usecase-ui/nlp'
+    project-name: 'usecase-ui-nlp'
+    branch: 'master'
+    mvn-settings: 'usecase-ui-nlp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: usecase-ui-nlp-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: usecase-ui/nlp
+    project-name: 'usecase-ui-nlp'
+    build-node: ubuntu1804-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'usecase-ui-nlp-settings'
+
+- project:
+    name: usecase-ui-nlp-info
+    project-name: usecase-ui-nlp
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: usecase-ui/nlp
+    branch: master
+
+- project:
+    name: usecase-ui-nlp-project-view
+    project-name: usecase-ui-nlp
+    views:
+      - project-view

diff --git a/packer/common-packer b/packer/common-packer
index 38f8109..74b6be7 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 38f810974c2fdb9b4eb998b5efee93362904cced
+Subproject commit 74b6be7301b5c407d1ccf4cf6093b3b8cd308ad7

diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index 932c01f..18017b8 100644 (file)
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -67,6 +67,7 @@
           - python3.9
           - python3.9-dev
           - python3.9-tk
+          - python3.9-distutils
       become: true
       when: ansible_distribution == 'Ubuntu'
 

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index ca9db41..5d9b7c3 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -121,6 +121,7 @@
           - python3.9
           - python3.9-dev
           - python3.9-tk
+          - python3.9-distutils
       become: true
       when: ansible_distribution == 'Ubuntu'
 

diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index 51a151c..93f9161 100644 (file)
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -14,7 +14,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - helm - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-builder-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",

diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
index 5bf1783..cd6daee 100644 (file)
--- a/packer/templates/memcached.json
+++ b/packer/templates/memcached.json
@@ -14,7 +14,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "{{user `distro`}} - memcached - {{user `arch`}} - {{isotime \"20180101-1003\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",

diff --git a/packer/templates/redis.json b/packer/templates/redis.json
index 87caeee..b52a8ac 100644 (file)
--- a/packer/templates/redis.json
+++ b/packer/templates/redis.json
@@ -14,7 +14,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "{{user `distro`}} - redis - {{user `arch`}} - {{isotime \"20180101-1003\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",