Merge "[PMSH] Move old branches to maintainence"

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 5e4dab4..0b4b464 100644 (file)
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -59,24 +59,6 @@
 #    files: '**'
 #    archive-artifacts: ''
 
-- project:
-    name: aaf-authz-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: 'aaf/authz'
-    project-name: 'aaf-authz'
-    branch: 'master'
-    mvn-settings: 'aaf-authz-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
 - project:
     name: aaf-authz-clm
     jobs:

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index b53b378..77d07a3 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -9,9 +9,12 @@
     name: aai-resources
     project-name: 'aai-resources'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-verify-java':
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-{stream}-merge-java':
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          mvn-params: '-DskipTests'
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
@@ -44,7 +47,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: 'aai/resources'
     project-name: 'aai-resources'
     branch: 'master'

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 7774e76..249c46b 100644 (file)
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -9,9 +9,12 @@
     name: aai-traversal-master
     project-name: 'aai-traversal'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-verify-java':
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-{stream}-merge-java':
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          mvn-params: '-DskipTests'
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
@@ -44,7 +47,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: 'aai/traversal'
     project-name: 'aai-traversal'
     branch: 'master'

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 74d02d6..75a6a5a 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -26,7 +26,7 @@
     branch: 'master'
     build-timeout: '60'
     build-node: 'centos7-builder-2c-1g'
-    jjb-version: 2.9.1
+    jjb-version: 3.5.0
     # configure the gerrit-jjb-verify job
     build-node-label-check: true
     build-node-label-list: ""

diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml
deleted file mode 100644 (file)
index bd8a69b..0000000
--- a/jjb/clamp/clamp-csit.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- project:
-    name: clamp-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'clamp'
-    disabled: true
-    recipients: 'gervais-martial.ngueko@intl.att.com'
-    stream:
-        - 'master':
-              branch: 'master'
-    functionality:
-      - 'APIs':
-          trigger_jobs:
-      - 'UIs':
-          trigger_jobs:
-    robot-options: ''

diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
deleted file mode 100644 (file)
index fad773d..0000000
--- a/jjb/clamp/clamp.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-- project:
-    name: clamp-project-view
-    project-name: clamp
-    views:
-      - project-view
-
-- project:
-    name: clamp
-    project-name: 'clamp'
-    jobs:
-      - gerrit-maven-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-      - '{project-name}-{stream}-verify-java-checkstyle':
-          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
-          build-node: ubuntu1804-docker-8c-16g
-      - '{project-name}-{stream}-merge-properties-java':
-         mvn_properties:
-            - docker.pull.registry=nexus3.onap.org:10001
-            - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'clamp'
-    stream:
-        - 'master':
-              branch: 'master'
-        - 'frankfurt':
-              branch: 'frankfurt'
-        - 'guilin':
-              branch: 'guilin'
-        - 'tosca-poc':
-              branch: 'tosca-poc'
-    mvn-settings: 'clamp-settings'
-    java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-
-- project:
-    name: clamp-sonar
-    jobs:
-      - gerrit-maven-sonar:
-          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
-    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: 'clamp'
-    project-name: 'clamp'
-    branch: 'master'
-    mvn-settings: 'clamp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    java-version: openjdk11
-
-- project:
-    name: clamp-clm
-    jobs:
-      - gerrit-maven-clm:
-         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
-    nexus-iq-namespace: 'onap-'
-    project: 'clamp'
-    project-name: 'clamp'
-    branch: 'master'
-    mvn-settings: 'clamp-settings'
-    build-node: ubuntu1804-docker-8c-8g
-    build-timeout: 120
-    java-version: openjdk11
-
-- project:
-    name: clamp-info
-    project-name: clamp
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: clamp
-    branch: master

diff --git a/jjb/clamp/dashboard/clamp-dashboard.yaml b/jjb/clamp/dashboard/clamp-dashboard.yaml
deleted file mode 100644 (file)
index ce70c19..0000000
--- a/jjb/clamp/dashboard/clamp-dashboard.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- project:
-    name: clamp-dashboard-project-view
-    project-name: clamp-dashboard
-    views:
-      - project-view
-
-- project:
-    name: clamp-dashboard
-    project-name: 'clamp-dashboard'
-    jobs:
-      - gerrit-maven-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-      - '{project-name}-{stream}-verify-java-checkstyle':
-         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
-      - '{project-name}-{stream}-merge-properties-java':
-         mvn_properties:
-            - docker.pull.registry=nexus3.onap.org:10001
-            - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'clamp/dashboard'
-    stream:
-        - 'master':
-              branch: 'master'
-    mvn-settings: 'clamp-settings'
-    java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-
-#- project:
-#    name: clamp-dashboard-sonar
-#    jobs:
-#      - gerrit-maven-sonar:
-#          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
-#    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: 'clamp/dashboard'
-#    project-name: 'clamp-dashboard'
-#    branch: 'master'
-#    mvn-settings: 'clamp-settings'
-#    mvn-goals: 'clean install'
-#    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-#    java-version: openjdk11
-#
-- project:
-    name: clamp-dashboard-clm
-    jobs:
-      - gerrit-maven-clm:
-         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
-    nexus-iq-namespace: 'onap-'
-    project: 'clamp/dashboard'
-    project-name: 'clamp-dashboard'
-    branch: 'master'
-    mvn-settings: 'clamp-settings'
-    build-node: ubuntu1804-docker-8c-8g
-    build-timeout: 120
-    java-version: openjdk11

diff --git a/jjb/clamp/dashboard/info-clamp-dashboard.yaml b/jjb/clamp/dashboard/info-clamp-dashboard.yaml
deleted file mode 100644 (file)
index efff6fc..0000000
--- a/jjb/clamp/dashboard/info-clamp-dashboard.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- project:
-    name: clamp-dashboard-info
-    project-name: clamp-dashboard
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: clamp/dashboard
-    branch: master

diff --git a/jjb/clamp/ui/info-clamp-ui.yaml b/jjb/clamp/ui/info-clamp-ui.yaml
deleted file mode 100644 (file)
index c532356..0000000
--- a/jjb/clamp/ui/info-clamp-ui.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- project:
-    name: clamp-ui-info
-    project-name: clamp-ui
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: clamp/ui
-    branch: master

diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml
index 129e299..a6172e1 100644 (file)
--- a/jjb/cps/cps-cps-temporal.yaml
+++ b/jjb/cps/cps-cps-temporal.yaml
@@ -23,12 +23,11 @@
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
     jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
-          maven-versions-plugin: true
+      - gerrit-maven-docker-verify:
+          container-public-registry: nexus3.onap.org:10001
+      - gerrit-maven-docker-merge:
+          container-public-registry: nexus3.onap.org:10001
+          container-snapshot-registry: nexus3.onap.org:10003
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true

diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index a265e84..4c8a981 100644 (file)
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -4,10 +4,10 @@
       jobs:
           - '{project-name}-review-verification-maven-{stream}':
                 mvn-goals: clean install
-                mvn-params: '-Dmaven.test.skip=true -Dnexus.repository='
+                mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push='
           - '{project-name}-merge-verification-maven-{stream}':
                 mvn-goals: clean install
-                mvn-params: '-Dmaven.test.skip=true -Dnexus.repository='
+                mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push='
       project-name: 'cps'
       recipients: 'toine.siebelink@est.tech'
       # project name in gerrit

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
index 0a9e77f..c9b4b85 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
@@ -27,26 +27,6 @@
     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

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 7ef2950..d78d785 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -53,24 +53,6 @@
 #    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 
-- project:
-    name: logging-analytics-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: 'logging-analytics'
-    project-name: 'logging-analytics'
-    branch: 'master'
-    mvn-settings: 'logging-analytics-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
 - project:
     name: logging-analytics-pylog
     project-name: 'logging-analytics'

diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
deleted file mode 100644 (file)
index e816422..0000000
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-- project:
-    name: modeling-toscaparsers-nfvparser
-    project-name: 'modeling-toscaparsers-nfvparser'
-    project: 'modeling/toscaparsers'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'modeling-toscaparsers-settings'
-    build-node: ubuntu1804-builder-4c-4g
-    subproject:
-      - 'nfvparser':
-          path: 'nfvparser/'
-          pattern: 'nfvparser/**'
-          pom: 'nfvparser/pom.xml'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-pom: 'nfvparser/pom.xml'
-          mvn-params: '-f nfvparser/pom.xml'
-
-- project:
-    name: modeling-toscaparsers-nfvparser-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: 'modeling/toscaparsers'
-    project-name: 'modeling-toscaparsers-nfvparser'
-    branch: 'master'
-    mvn-params: '-f nfvparser/pom.xml'
-    mvn-settings: 'modeling-toscaparsers-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: modeling-toscaparsers-nfvparser-clm
-    jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f nfvparser/pom.xml'
-    nexus-iq-namespace: 'onap-'
-    project: modeling/toscaparsers
-    project-name: 'modeling-toscaparsers-nfvparser'
-    branch: 'master'
-    mvn-settings: 'modeling-toscaparsers-settings'

diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
index 0615907..d188915 100644 (file)
--- a/jjb/policy/policy-csit-jobs.yaml
+++ b/jjb/policy/policy-csit-jobs.yaml
@@ -57,3 +57,64 @@
           notify-every-unstable-build: false
           send-to-individuals: true
 
+- job-template:
+    name: '{project-name}-{stream}-project-csit-verify-{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:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**/csit/**'
+
+    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 205a731..7df8ae3 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -1,9 +1,10 @@
 - project:
     name: policy-distribution-project-csit
     jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
     project-name: 'policy-distribution'
-    recipients: 'ram.krishna.verma@est.tech'
+    recipients: 'ram_krishna.verma@bell.ca'
     project: 'policy/docker'
     stream:
       - 'master':
@@ -19,6 +20,7 @@
 - project:
     name: policy-xacml-pdp-project-csit
     jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
     project-name: 'policy-xacml-pdp'
     recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
@@ -37,6 +39,7 @@
 - project:
     name: policy-drools-applications-project-csit
     jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
     project-name: 'policy-drools-applications'
     recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
@@ -55,6 +58,7 @@
 - project:
     name: policy-drools-pdp-project-csit
     jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
     project-name: 'policy-drools-pdp'
     recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
@@ -73,9 +77,10 @@
 - project:
     name: policy-apex-pdp-project-csit
     jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
     project-name: 'policy-apex-pdp'
-    recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech'
+    recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca'
     project: 'policy/docker'
     stream:
       - 'master':
@@ -91,9 +96,10 @@
 - project:
     name: policy-pap-project-csit
     jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
     project-name: 'policy-pap'
-    recipients: 'jrh3@att.com ram.krishna.verma@est.tech'
+    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
     project: 'policy/docker'
     stream:
       - 'master':
@@ -109,9 +115,10 @@
 - project:
     name: policy-api-project-csit
     jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
     project-name: 'policy-api'
-    recipients: 'takamune.cho@att.com'
+    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
     project: 'policy/docker'
     stream:
       - 'master':
@@ -131,6 +138,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
+    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
     stream:
       - 'guilin':
           branch: guilin
@@ -147,7 +155,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
-    recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech'
+    recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca'
     stream:
       - 'guilin':
           branch: guilin
@@ -164,7 +172,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
-    recipients: 'ram.krishna.verma@est.tech'
+    recipients: 'ram_krishna.verma@bell.ca'
     stream:
       - 'guilin':
           branch: guilin
@@ -181,7 +189,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
-    recipients: 'ah999m@att.com'
+    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
     stream:
       - 'guilin':
           branch: guilin
@@ -198,7 +206,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
-    recipients: 'jrh3@att.com ram.krishna.verma@est.tech'
+    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
     stream:
       - 'guilin':
           branch: guilin
@@ -215,6 +223,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
+    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
     stream:
       - 'guilin':
           branch: guilin
@@ -231,6 +240,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
+    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
     stream:
       - 'guilin':
           branch: guilin

diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index b2f3769..71f7180 100644 (file)
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -1,18 +1,20 @@
 ---
 - project:
-    name: sdnc-csit
+    name: sdnc-oam-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'sdnc'
+      - '{project-name}-review-verification-maven-{stream}':
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+          maven-versions-plugin: true
+      - '{project-name}-merge-verification-maven-{stream}':
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+          maven-versions-plugin: true
+    project-name: 'sdnc-oam'
     recipients: 'dtimoney@att.com'
+    # project name in gerrit
+    project: 'sdnc/oam'
     stream:
       - 'master':
           branch: 'master'
-    functionality:
-      - 'healthcheck':
-          trigger_jobs:
-      - 'sdnc_netconf_tls_post_deploy':
-          trigger_jobs:
+    mvn-settings: 'sdnc-oam-settings'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
index b1b3f54..1486ba9 100644 (file)
--- a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
+++ b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
@@ -43,3 +43,7 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'