Merge "Increase doc merge timeout"

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index cc26000..fd25f14 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -54,7 +54,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'ccsdk/oran'
     project-name: 'ccsdk-oran'
     branch: 'master'

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
new file mode 100644 (file)
index 0000000..5a5115b
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
@@ -0,0 +1,22 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-assembly
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - assembly:
+          pom: 'mod2/assembly/pom.xml'
+          pattern: 'mod2/assembly/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
new file mode 100644 (file)
index 0000000..b0f256e
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
@@ -0,0 +1,55 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-auth-service
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - auth-service:
+          pom: 'mod2/auth-service/pom.xml'
+          pattern: 'mod2/auth-service/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod2-auth-service-sonar
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod2-auth-service'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod2/auth-service/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-mod2-auth-service-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-mod2-auth-service-clm
+    mvn-params: '-f mod2/auth-service/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
new file mode 100644 (file)
index 0000000..163dfa4
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
@@ -0,0 +1,55 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-catalog-service
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - catalog-service:
+          pom: 'mod2/catalog-service/pom.xml'
+          pattern: 'mod2/catalog-service/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod2-catalog-service-sonar
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod2-catalog-service'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod2/catalog-service/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-mod2-catalog-service-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-mod2-catalog-service-clm
+    mvn-params: '-f mod2/catalog-service/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
new file mode 100644 (file)
index 0000000..64471cc
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
@@ -0,0 +1,55 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-ui
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - ui:
+          pom: 'mod2/ui/pom.xml'
+          pattern: 'mod2/ui/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod2-ui-sonar
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod2-ui'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod2/ui/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-mod2-ui-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-mod2-ui-clm
+    mvn-params: '-f mod2/ui/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'

diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index dca4daa..ea80103 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -3,9 +3,9 @@
     name: dcaegen2-platform-policy-handler
     project-name: 'dcaegen2-platform-policy-handler'
     project: 'dcaegen2/platform/policy-handler'
-    python-version: python3.6
+    python-version: python3
     tox-dir: '.'
-    tox-envs: ''
+    tox-envs: 'py3'
     stream:
       - 'master':
           branch: 'master'

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 5b8fc98..b634404 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -87,6 +87,38 @@
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'
 
+- project:
+    name: dcaegen2-services-datalake-handler-des-release
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-datalake-handler-des'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'components/datalake-handler/pom.xml'
+          mvn-params: '-f components/datalake-handler/pom.xml'
+          version-properties-file: 'components/datalake-handler/version.properties'
+          pattern: 'components/datalake-handler/**'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/des/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'components/datalake-handler/**'
+    stream:
+      - 'master':
+         branch: 'master'
+         java-version: openjdk11
+      - 'frankfurt':
+          branch: 'frankfurt'
+    mvn-settings: 'dcaegen2-services-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
+
 - project:
     name: dcaegen2-services-datalake-handler-sonar
     java-version: openjdk11

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index b315bc4..410a025 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -53,3 +53,27 @@
     jobs:
       - gerrit-docker-verify
       - gerrit-docker-merge
+
+- project:
+    name: integration-docker-aai-simulator
+    project-name: 'integration'
+    jobs:
+      - integration-docker-merge
+      - integration-docker-verify
+    project: 'integration'
+    stream:
+      - 'master':
+          branch: 'master'
+    subproject:
+      - 'aai-simulator':
+          pom: 'test/mocks/aai-simulator/pom.xml'
+          pattern: 'test/mocks/aai-simulator/**'
+          mvn-goals: 'mvn clean install -Dcheckstyle.skip'
+          post-docker-verify-script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/test/mocks/aai-simulator
+              tox
+    mvn-settings: 'integration-settings'
+    files: '**'
+    archive-artifacts: ''

diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
index 7e634a1..5cbce4e 100644 (file)
--- a/jjb/integration/xtesting/integration-xtesting.yaml
+++ b/jjb/integration/xtesting/integration-xtesting.yaml
@@ -88,26 +88,6 @@
           docker-root: ./smoke-usecases-robot
           docker-name: 'onap/xtesting-smoke-usecases-robot'
           docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-verify:
-          project-name: 'integration-xtesting-benchmarking'
-          docker-root: ./benchmarking
-          docker-name: 'onap/xtesting-benchmarking'
-          docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-merge:
-          project-name: 'integration-xtesting-benchmarking'
-          docker-root: ./benchmarking
-          docker-name: 'onap/xtesting-benchmarking'
-          docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-verify:
-          project-name: 'integration-xtesting-candidate-usecases'
-          docker-root: ./candidate-usecases
-          docker-name: 'onap/xtesting-candidate-usecases'
-          docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-merge:
-          project-name: 'integration-xtesting-candidate-usecases'
-          docker-root: ./candidate-usecases
-          docker-name: 'onap/xtesting-candidate-usecases'
-          docker-build-args: '-f ./docker/Dockerfile'
       - gerrit-docker-verify:
           project-name: 'integration-xtesting-security'
           docker-root: ./security
@@ -130,3 +110,4 @@
     mvn-settings: 'integration-settings'
     build-node: ubuntu1804-docker-8c-8g
     cron: '@daily'
+    container-tag-method: stream

diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
index 33d89f9..a3a0d60 100644 (file)
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
@@ -12,4 +12,7 @@
           - "certservice":
                 trigger_jobs:
                     - "oom-platform-cert-service-{stream}-merge-java"
+          - "truststoremerger":
+                trigger_jobs:
+                    - "oom-platform-cert-service-{stream}-merge-java"
       robot-options: ""