Merge "Add the missing docker profile for aai-common"

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 9f24c4b..e9c0098 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 - 20210129-195200.311
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210202-193426.087
 LABELS=ubuntu1804-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8
 VOLUME_SIZE=20

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 2750c3c..0a61d7c 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -36,7 +36,9 @@
     project: 'cps'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: "-P docker"
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
@@ -90,4 +92,4 @@
     mvn-clean-install: true
     project: cps
     branch: master
-
+    build-node: centos7-docker-8c-8g

diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
index cb83ce3..04c26c0 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -1,4 +1,57 @@
 ---
+- project:
+      name: dcaegen2-platform-ves-openapi-manager
+      project-name: 'dcaegen2-platform-ves-openapi-manager'
+      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
+          - 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 package docker:build -DpushImageTag'
+          - '{project-name}-gerrit-release-jobs':
+                build-node: centos7-docker-8c-8g
+
+      project: 'dcaegen2/platform/ves-openapi-manager'
+      stream:
+          - 'master':
+                branch: 'master'
+      mvn-settings: 'dcaegen2-platform-ves-openapi-manager-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: dcaegen2-platform-ves-openapi-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/ves-openapi-manager'
+      project-name: 'dcaegen2-platform-ves-openapi-manager'
+      branch: 'master'
+      mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+
 - project:
     name: dcaegen2-platform-ves-openapi-manager-project-view
     project-name: dcaegen2-platform-ves-openapi-manager

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index fea8402..f039447 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -42,7 +42,7 @@
           server: '{server-name}'
           project: 'integration/csit'
           branch: '{branch}'
-          files: '**/{project-name}/**'
+          files: '*/{project-name}/**'
 
     builders:
       - lf-update-java-alternatives:
@@ -105,7 +105,7 @@
           server: '{server-name}'
           project: 'integration/csit'
           branch: '{branch}'
-          files: '**/{project-name}/**'
+          files: '*/{project-name}/**'
       - timed: '@daily'
       - reverse:
           jobs: '{obj:trigger_jobs}'

diff --git a/jjb/integration/integration-terraform.yaml b/jjb/integration/integration-terraform.yaml
index 2a7fc5d..252e2d3 100644 (file)
--- a/jjb/integration/integration-terraform.yaml
+++ b/jjb/integration/integration-terraform.yaml
@@ -8,20 +8,33 @@
       - gerrit-info-yaml-verify
 
 - project:
-    name: integration-terraform-validate
+    name: integration-terraform-linters
     project: integration/terraform
     project-name: integration-terraform
+    python-version: python3
     jobs:
-        - integration-terraform-verify
+      - integration-linters
     subproject:
-        - 'openlab':
-              tox-dir: 'openlab'
-              tox-envs: 'terraform'
-              pattern: 'openlab/**'
-        - 'terragrunt':
-              tox-dir: 'terragrunt'
-              tox-envs: 'terragrunt'
-              pattern: 'terragrunt/**'
+      - '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'
+      - 'master':
+          branch: 'master'

diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index 481aca9..f426209 100644 (file)
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -15,7 +15,7 @@
       build-node: ubuntu1804-docker-8c-8g
       jobs:
           - '{project-name}-{stream}-verify-java':
-                mvn-goals: 'clean install'
+                mvn-goals: 'clean install -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true'
           - '{project-name}-{stream}-merge-java':
                 mvn-goals: 'clean deploy'
           -  '{project-name}-gerrit-release-jobs':

diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
new file mode 100644 (file)
index 0000000..a9a91be
--- /dev/null
+++ b/jjb/policy/policy-csit-jobs.yaml
@@ -0,0 +1,59 @@
+- job-template:
+    name: '{project-name}-{stream}-project-csit-{functionality}'
+    disabled: '{disabled}'
+    project-type: freestyle
+    build-node: 'ubuntu1804-docker-8c-8g'
+    node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
+    python-version: python3
+
+    properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-test-options:
+          test-options: '{functionality}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - timed: '@daily'
+      - reverse:
+          jobs: '{obj:trigger_jobs}'
+
+    builders:
+      - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-project-test
+
+    publishers:
+      - integration-project-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
+

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 91fc9ec..be3f5c8 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -1,32 +1,30 @@
 - project:
-    name: policy-apex-pdp-csit
+    name: policy-api-project-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'policy'
-    java-version: openjdk11
-    recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech'
+      - '{project-name}-{stream}-project-csit-{functionality}'
+    project-name: 'policy-api'
+    recipients: 'takamune.cho@att.com'
+    project: 'policy/docker'
     stream:
       - 'master':
-          branch: master
-      - 'frankfurt':
-          branch: frankfurt
+          branch: 'master'
       - 'guilin':
-          branch: guilin
+          branch: 'guilin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     functionality:
-      - 'apex-pdp'
+      - 'api'
     trigger_jobs:
-      - 'policy-apex-pdp-{stream}-merge-java'
-    robot-options: ''
+      - 'policy-api-{stream}-merge-java'
 
 - project:
-    name: policy-distribution-csit
+    name: policy-apex-pdp-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
-    recipients: 'ram.krishna.verma@est.tech'
+    recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
@@ -35,18 +33,19 @@
       - 'guilin':
           branch: guilin
     functionality:
-      - 'distribution'
+      - 'apex-pdp'
     trigger_jobs:
-      - 'policy-distribution-{stream}-merge-java'
+      - 'policy-apex-pdp-{stream}-merge-java'
     robot-options: ''
 
 - project:
-    name: policy-api-csit
+    name: policy-distribution-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
+    recipients: 'ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
@@ -55,9 +54,9 @@
       - 'guilin':
           branch: guilin
     functionality:
-      - 'api'
+      - 'distribution'
     trigger_jobs:
-      - 'policy-api-{stream}-merge-java'
+      - 'policy-distribution-{stream}-merge-java'
     robot-options: ''
 
 - project:

diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
index aee64de..2c58c60 100644 (file)
--- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
@@ -12,3 +12,45 @@
     build-node: centos7-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    name: so-adapters-so-etsi-sol003-adapter
+    project-name: 'so-adapters-so-etsi-sol003-adapter'
+    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}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+    project: 'so/adapters/so-etsi-sol003-adapter'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-v1-8c-8g
+
+- project:
+    name: so-adapters-so-etsi-sol003-adapter-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'
+    max-git-repo-age-hours: 48
+    build-node: ubuntu1804-docker-v1-8c-8g
+    project: 'so/adapters/so-etsi-sol003-adapter'
+    project-name: 'so-adapters-so-etsi-sol003-adapter'
+    branch: 'master'
+    mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml
index ad0325b..8b6ab15 100644 (file)
--- a/jjb/so/so-so-admin-cockpit.yaml
+++ b/jjb/so/so-so-admin-cockpit.yaml
@@ -12,3 +12,45 @@
     build-node: centos7-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    name: so-so-admin-cockpit
+    project-name: 'so-so-admin-cockpit'
+    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}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+    project: 'so/so-admin-cockpit'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: 'so-so-admin-cockpit-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-v1-8c-8g
+
+- project:
+    name: so-so-admin-cockpit-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'
+    max-git-repo-age-hours: 48
+    build-node: ubuntu1804-docker-v1-8c-8g
+    project: 'so/so-admin-cockpit'
+    project-name: 'so-so-admin-cockpit'
+    branch: 'master'
+    mvn-settings: 'so-so-admin-cockpit-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file

diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml
index 27debb7..0c2e5a9 100644 (file)
--- a/jjb/so/so-so-etsi-nfvo.yaml
+++ b/jjb/so/so-so-etsi-nfvo.yaml
@@ -12,3 +12,45 @@
     build-node: centos7-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    name: so-so-etsi-nfvo
+    project-name: 'so-so-etsi-nfvo'
+    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}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+    project: 'so/so-etsi-nfvo'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: 'so-so-etsi-nfvo-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-v1-8c-8g
+
+- project:
+    name: so-so-etsi-nfvo-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'
+    max-git-repo-age-hours: 48
+    build-node: ubuntu1804-docker-v1-8c-8g
+    project: 'so/so-etsi-nfvo'
+    project-name: 'so-so-etsi-nfvo'
+    branch: 'master'
+    mvn-settings: 'so-so-etsi-nfvo-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'