Merge "Python 3.9 support"

diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
deleted file mode 100644 (file)
index d273e07..0000000
--- a/jjb/aai/aai-data-router.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- project:
-    name: aai-data-router-project-view
-    project-name: aai-data-router
-    views:
-      - project-view
-
-- project:
-    name: aai-data-router-master
-    project-name: 'aai-data-router'
-    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
-      - gerrit-maven-docker-stage:
-          mvn-params: '-P docker -B -Dmaven.test.skip=true'
-          build-node: ubuntu1804-docker-8c-8g
-          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: 'aai/data-router'
-    stream:
-      - 'guilin':
-          branch: 'guilin'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-data-router-settings'
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    name: aai-data-router-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: 'aai/data-router'
-    project-name: 'aai-data-router'
-    branch: 'master'
-    mvn-settings: 'aai-data-router-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: aai-data-router-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/data-router'
-    project-name: 'aai-data-router'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-data-router-settings'
-
-- project:
-    name: aai-data-router-info
-    project-name: aai-data-router
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/data-router
-    branch: master

diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
deleted file mode 100644 (file)
index b6139d2..0000000
--- a/jjb/aai/aai-search-data-service.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
----
-- project:
-    name: aai-search-data-service-project-view
-    project-name: aai-search-data-service
-    views:
-      - project-view
-
-- project:
-    name: aai-search-data-service-master
-    project-name: 'aai-search-data-service'
-    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
-      - gerrit-maven-docker-stage:
-          mvn-params: '-Pdocker -B -Dmaven.test.skip=true'
-          build-node: ubuntu1804-docker-8c-8g
-          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: 'aai/search-data-service'
-    docker-image-name: 'onap/search-data-service'
-    stream:
-      - 'guilin':
-          branch: 'guilin'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-search-data-service-settings'
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    name: aai-search-data-service-searchguard
-    project-name: 'aai-search-data-service-searchguard'
-    jobs:
-      - gerrit-maven-docker-stage:
-          mvn-params: '-Pdocker -B -Dmaven.test.skip=true'
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-    project: 'aai/search-data-service'
-    docker-image-name: 'onap/elasticsearch-sg'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-search-data-service-settings'
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    name: aai-search-data-service-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: 'aai/search-data-service'
-    project-name: 'aai-search-data-service'
-    branch: 'master'
-    mvn-settings: 'aai-search-data-service-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: aai-search-data-service-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/search-data-service'
-    project-name: 'aai-search-data-service'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-search-data-service-settings'
-
-- project:
-    name: aai-search-data-service-info
-    project-name: aai-search-data-service
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/search-data-service
-    branch: master
-
-- project:
-    name: 'aai-search-data-service-whitesource'
-    project-name: 'aai-search-data-service'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan
-    mvn-settings: 'aai-search-data-service-settings'
-    wss-product-name: 'aai'
-    mvn-clean-install: true
-    project: 'aai/search-data-service'
-    branch: master

diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index ecabee0..5f3b2cd 100644 (file)
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -2,9 +2,19 @@
 - project:
     name: ccsdk-distribution-csit
     jobs:
-      - '{project-name}-{stream}-project-csit'
-      - '{project-name}-review-verification-{stream}'
-      - '{project-name}-merge-verification-{stream}'
+      - '{project-name}-review-verification-maven-{stream}':
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-snapshot-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+          maven-versions-plugin: true
+      - '{project-name}-merge-verification-maven-{stream}':
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-snapshot-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+          maven-versions-plugin: true
+
     project-name: 'ccsdk-distribution'
     recipients: 'dtimoney@att.com'
     # project name in gerrit
@@ -12,7 +22,6 @@
     stream:
       - 'master':
           branch: 'master'
-    artifact-type: 'maven'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 7b98112..27d146c 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -37,6 +37,24 @@
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
+- project:
+    name: ccsdk-oran-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'ccsdk/oran'
+    project-name: 'ccsdk-oran'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'ccsdk-oran-settings'
+    mvn-opts: '-Ddocker.skip=true'
+    build-node: ubuntu1804-builder-4c-4g
+
 - project:
     name: ccsdk-oran-info
     project: ccsdk/oran

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 5593b10..9dd6e54 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -25,7 +25,7 @@
       project-name: 'cps'
       branch: 'master'
       mvn-settings: 'cps-settings'
-      build-node: ubuntu1804-builder-4c-4g
+      build-node: centos7-docker-8c-8g
 
 - project:
     name: cps

diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index dfa440b..a71b9fa 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -15,7 +15,7 @@
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
     subproject:
       - 'policy-handler':
-          pattern: 'policyhandler/**'
+          pattern: '**'
           path: 'policyhandler'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'

diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
new file mode 100644 (file)
index 0000000..cb83ce3
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: dcaegen2-platform-ves-openapi-manager-project-view
+    project-name: dcaegen2-platform-ves-openapi-manager
+    views:
+      - project-view
+
+- project:
+    name: dcaegen2-platform-ves-openapi-manager-info
+    project: dcaegen2/platform/ves-openapi-manager
+    project-name: dcaegen2-platform-ves-openapi-manager
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml
index be97b29..d4e5424 100644 (file)
--- a/jjb/doc/doc-templates-rtd.yaml
+++ b/jjb/doc/doc-templates-rtd.yaml
@@ -82,8 +82,7 @@
           mv  docs/_build/html "$WORKSPACE/archives/"
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for merging/publishing Sphinx/Restructured Text at RTD
@@ -160,6 +159,4 @@
       - shell: !include-raw: doc-post-rtd.sh
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
+      - lf-infra-publish

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 13afecf..0c614bf 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -239,35 +239,6 @@
               new-normal: 1
               new-low: 1
 
-- publisher:
-    name: infra-shiplogs
-    # lf-infra macro to finish up a build.
-    #
-    # Handles the following:
-    #   - Shipping logs to Nexus logs site repository
-    #   - Cleanup workspace
-    publishers:
-      - postbuildscript:
-          builders:
-            - role: BOTH
-              build-on:
-                - ABORTED
-                - FAILURE
-                - NOT_BUILT
-                - SUCCESS
-                - UNSTABLE
-              build-steps:
-                - lf-infra-sysstat
-                - lf-infra-ship-logs
-          mark-unstable-if-failed: true
-      - workspace-cleanup:
-          exclude:
-            # Do not clean up *.jenkins-trigger files for jobs that use a
-            # properties file as input for triggering another build.
-            - '**/*.jenkins-trigger'
-          fail-build: false
-
-
 # SCMS
 - scm:
     name: git-scm

diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index a1a051f..c340b1e 100644 (file)
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -301,6 +301,9 @@
                 PARENT_JOB_NAME=$JOB_NAME
                 DOCKERHUB_REGISTRY=docker.io
 
+    publishers:
+      - lf-infra-publish
+
 - job-template:
     # Job template for tagging snapshot docker images
     # identified by given unique tag as STAGING
@@ -347,6 +350,4 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
+      - lf-infra-publish

diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index d29528a..b19fe38 100644 (file)
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -68,8 +68,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Golang verify jobs with subproject support
@@ -139,8 +138,7 @@
           make deploy
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
@@ -199,8 +197,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building and pushing uniquely tagged
@@ -254,5 +251,4 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index f2e0888..ff021db 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -75,8 +75,7 @@
           global-settings-type: cfp
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Java verify jobs running checkstyle at the end
@@ -93,9 +92,9 @@
 
     <<: *verify_java_defaults
     name: '{project-name}-{stream}-verify-java-checkstyle'
+
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
       - checkstyle-result
 
 - job-template:
@@ -204,9 +203,9 @@
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
+
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
       - checkstyle-result-daily
 
 - job-template:
@@ -281,8 +280,7 @@
           global-settings-type: cfp
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template: &merge_java_defaults
     # Job template for Java merge jobs
@@ -325,8 +323,9 @@
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - infra-wrappers:
+      - lf-infra-wrappers:
           build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
       - gerrit-trigger-patch-merged:
@@ -364,8 +363,7 @@
           properties: '{obj:mvn_properties}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Java merge jobs based on
@@ -505,8 +503,7 @@
           mvn-params: '{mvn-params}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Docker daily jobs
@@ -591,8 +588,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
@@ -660,8 +656,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
@@ -736,8 +731,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
@@ -815,8 +809,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template: &docker_version_java_defaults
     # Job template for building & pushing docker images
@@ -893,8 +886,7 @@
           mvn-params: '{mvn-params}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
@@ -1004,8 +996,7 @@
       - shell: !include-raw-escape: include-docker-push.sh
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Java merge jobs for SDC specific repos

diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 6480daa..6f3c836 100644 (file)
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -68,9 +68,7 @@
           tox
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
+      - lf-infra-publish
 
 - job-template:
     # Job template for docker daily jobs for 3 SCMs
@@ -130,6 +128,6 @@
           properties-file: version.properties
       - docker-login
       - shell: '{script}'
+
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish

diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 831c770..20735ae 100644 (file)
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -124,10 +124,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-
+      - lf-infra-publish
 
 # vim: sw=2 ts=2 sts=2 et :
 
@@ -197,8 +194,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for two scm and script trigger - for docker daily release
@@ -265,5 +261,4 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index f07e6e4..86206db 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -192,6 +192,256 @@
           notify-every-unstable-build: false
           send-to-individuals: true
 
+- job-template:
+    # Job template for unified review verification jobs in
+    # project-specific CSIT flow for projects built with maven
+    #
+    # The purpose of this job template is to:
+    #  1. build local snapshot docker images with maven
+    #  2. run CSIT job with the local images
+    #  3. give a verify vote to the triggering review
+    #
+
+    name: '{project-name}-review-verification-maven-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    branch: master
+    build-days-to-keep: 30 # 30 days in case a release takes long to get approved.
+    build-timeout: 60
+    disable-job: false
+    git-url: "$GIT_URL/$PROJECT"
+    github-url: "https://github.com"
+    maven-versions-plugin: false
+    version-properties-file: version.properties
+    mvn-central: false
+    mvn-global-settings: global-settings
+    mvn-goals: clean deploy
+    mvn-opts: ""
+    mvn-params: ""
+    maven-version: mvn36
+    ossrh-profile-id: ""
+    mvn-pom: ""
+    stream: master
+    submodule-recursive: true
+    submodule-timeout: 10
+    submodule-disable: false
+
+    disabled: '{disabled}'
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
+
+    project-type: freestyle
+    node: '{build-node}'
+    java-version: 'openjdk11'
+
+    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}'
+      - lf-infra-maven-parameters:
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
+      - maven-exec:
+          maven-version: '{maven-version}'
+      - maven-params:
+          mvn-params: '{mvn-params}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: "{archive-artifacts}"
+          description: Artifacts to archive to the logs server.
+      - integration-test-options:
+          test-options: '{robot-options}'
+
+    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}'
+    builders:
+      - lf-infra-pre-build
+      - lf-jacoco-nojava-workaround
+      - lf-maven-install:
+          mvn-version: "{mvn-version}"
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+      - lf-infra-docker-login:
+          global-settings-file: "{mvn-global-settings}"
+          settings-file: "{mvn-settings}"
+      # must provide maven settings AFTER docker-login due to its cleanup
+      - lf-provide-maven-settings:
+          global-settings-file: "{mvn-global-settings}"
+          settings-file: "{mvn-settings}"
+      - lf-maven-versions-plugin:
+          maven-versions-plugin: "{maven-versions-plugin}"
+          version-properties-file: "{version-properties-file}"
+          mvn-version: "{mvn-version}"
+          mvn-pom: "{mvn-pom}"
+          mvn-settings: "{mvn-settings}"
+      - inject:
+          properties-content: |
+            CONTAINER_PULL_REGISTRY={container-public-registry}
+            CONTAINER_PUSH_REGISTRY={container-snapshot-registry}
+      - lf-maven-build:
+          mvn-goals: "{mvn-goals}"
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-project-test
+      - lf-provide-maven-settings-cleanup
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    # Job template for unified merge verification jobs in
+    # project-specific CSIT flow for projects built with maven
+    #
+    # The purpose of this job template is to:
+    #  1. build local snapshot docker images from master with maven
+    #  2. run CSIT job with the local images
+    #
+
+    name: '{project-name}-merge-verification-maven-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    branch: master
+    build-days-to-keep: 30 # 30 days in case a release takes long to get approved.
+    build-timeout: 60
+    disable-job: false
+    git-url: "$GIT_URL/$PROJECT"
+    github-url: "https://github.com"
+    maven-versions-plugin: false
+    version-properties-file: version.properties
+    mvn-central: false
+    mvn-global-settings: global-settings
+    mvn-goals: clean deploy
+    mvn-opts: ""
+    mvn-params: ""
+    maven-version: mvn36
+    ossrh-profile-id: ""
+    mvn-pom: ""
+    sign-artifacts: false
+    sign-mode: serial
+    stream: master
+    submodule-recursive: true
+    submodule-timeout: 10
+    submodule-disable: false
+
+    disabled: '{disabled}'
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
+    project-type: freestyle
+    node: '{build-node}'
+    java-version: 'openjdk11'
+
+    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}'
+      - lf-infra-maven-parameters:
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
+      - maven-exec:
+          maven-version: '{maven-version}'
+      - maven-params:
+          mvn-params: '{mvn-params}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: "{archive-artifacts}"
+          description: Artifacts to archive to the logs server.
+      - integration-test-options:
+          test-options: '{robot-options}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+    builders:
+      - lf-infra-pre-build
+      - lf-jacoco-nojava-workaround
+      - lf-maven-install:
+          mvn-version: "{mvn-version}"
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+      - lf-infra-docker-login:
+          global-settings-file: "{mvn-global-settings}"
+          settings-file: "{mvn-settings}"
+      # must provide maven settings AFTER docker-login due to its cleanup
+      - lf-provide-maven-settings:
+          global-settings-file: "{mvn-global-settings}"
+          settings-file: "{mvn-settings}"
+      - lf-maven-versions-plugin:
+          maven-versions-plugin: "{maven-versions-plugin}"
+          version-properties-file: "{version-properties-file}"
+          mvn-version: "{mvn-version}"
+          mvn-pom: "{mvn-pom}"
+          mvn-settings: "{mvn-settings}"
+      - inject:
+          properties-content: |
+            CONTAINER_PULL_REGISTRY={container-public-registry}
+            CONTAINER_PUSH_REGISTRY={container-snapshot-registry}
+      - lf-maven-build:
+          mvn-goals: "{mvn-goals}"
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-project-test
+      - lf-provide-maven-settings-cleanup
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+    publishers:
+      - lf-infra-publish
+
 - job-template:
     # Job template for review verification jobs in 
     # project-specific CSIT flow

diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index 9c2682d..a0fafde 100644 (file)
--- a/jjb/integration/integration-templates-docker.yaml
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -59,8 +59,7 @@
             - docker.push.registry=nexus3.onap.org:10003
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-verify'
@@ -124,8 +123,7 @@
       - shell: '{post-docker-verify-script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-compose-verify'

diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index 2fbbf70..ec44e68 100644 (file)
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -4,9 +4,10 @@
     project-name: 'policy-clamp'
     jobs:
       - gerrit-maven-stage:
-          build-node: ubuntu1804-docker-8c-16g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
           sign-artifacts: true
+          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
@@ -17,7 +18,8 @@
           mvn-params: '-P docker'
           build-node: ubuntu1804-docker-8c-16g
       - '{project-name}-{stream}-merge-java':
-         mvn-params: '-P docker'
+          build-node: ubuntu1804-docker-8c-16g
+          mvn-params: '-P docker'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -25,10 +27,6 @@
     stream:
         - 'master':
               branch: 'master'
-        - 'frankfurt':
-              branch: 'frankfurt'
-        - 'guilin':
-              branch: 'guilin'
         - 'tosca-poc':
               branch: 'tosca-poc'
     mvn-settings: 'policy-clamp-settings'

diff --git a/jjb/testsuite/testsuite-cds-mock-odl.yaml b/jjb/testsuite/testsuite-cds-mock-odl.yaml
new file mode 100644 (file)
index 0000000..72b3c34
--- /dev/null
+++ b/jjb/testsuite/testsuite-cds-mock-odl.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: testsuite-cds-mock-odl-project-view
+    project-name: testsuite-cds-mock-odl
+    views:
+      - project-view
+
+- project:
+    name: testsuite-cds-mock-odl-info
+    project: testsuite/cds-mock-odl
+    project-name: testsuite-cds-mock-odl
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/testsuite/testsuite-cds-mock-server.yaml b/jjb/testsuite/testsuite-cds-mock-server.yaml
new file mode 100644 (file)
index 0000000..b68e5fd
--- /dev/null
+++ b/jjb/testsuite/testsuite-cds-mock-server.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: testsuite-cds-mock-server-project-view
+    project-name: testsuite-cds-mock-server
+    views:
+      - project-view
+
+- project:
+    name: testsuite-cds-mock-server-info
+    project: testsuite/cds-mock-server
+    project-name: testsuite-cds-mock-server
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/testsuite/testsuite-cds-mock-ssh.yaml b/jjb/testsuite/testsuite-cds-mock-ssh.yaml
new file mode 100644 (file)
index 0000000..4d124e9
--- /dev/null
+++ b/jjb/testsuite/testsuite-cds-mock-ssh.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: testsuite-cds-mock-ssh-project-view
+    project-name: testsuite-cds-mock-ssh
+    views:
+      - project-view
+
+- project:
+    name: testsuite-cds-mock-ssh-info
+    project: testsuite/cds-mock-ssh
+    project-name: testsuite-cds-mock-ssh
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/usecase/usecase-ui-nlp.yaml b/jjb/usecase/usecase-ui-nlp.yaml
new file mode 100644 (file)
index 0000000..6528d3b
--- /dev/null
+++ b/jjb/usecase/usecase-ui-nlp.yaml
@@ -0,0 +1,14 @@
+---
+- 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/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml
index 69f158c..0df13c5 100644 (file)
--- a/jjb/vnfrqts/build-and-upload.yaml
+++ b/jjb/vnfrqts/build-and-upload.yaml
@@ -66,5 +66,4 @@
       - lf-provide-maven-settings-cleanup
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish