Merge "Use new ubuntu images"

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/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-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
index bf094b5..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
@@ -4,20 +4,17 @@
       project-name: 'integration-simulators-nf-simulator-avcn-manager'
       java-version: openjdk11
       jobs:
-          - '{project-name}-{stream}-verify-java':
-                mvn-goals: 'clean install -P docker -DskipDockerPush=true'
-          - '{project-name}-{stream}-merge-java':
-                mvn-goals: 'clean deploy'
+          - '{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
                 container-public-registry: 'nexus3.onap.org:10001'
                 container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-goals: 'clean install -P docker -DskipDockerPush=false'
+                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-simulator-cli.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
index a20556a..e260745 100644 (file)
--- 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
@@ -3,11 +3,11 @@
       name: integration-simulators-nf-simulator-simulator-cli
       project-name: 'integration-simulators-nf-simulator'
       python-version: python3
-      tox-dir: './simulator-cli'
+      tox-dir: '.'
       tox-envs: ''
       subproject:
           - simulator-cli:
-                path: '.'
+                path: './simulator-cli'
                 pattern: '**'
       project: 'integration/simulators/nf-simulator'
       stream:

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/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/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/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",