Merge "Remove clamp from JJB"

diff --git a/global-jjb b/global-jjb
index bee1d11..5beb455 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit bee1d1152f7fd19e81ef23344011541d1d66a091
+Subproject commit 5beb45586451cb772982de881cd09fd97360be87

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
index f850632..4ea16cc 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
 LABELS=centos7-builder-2c-1g
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=v3-standard-2
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
index 9d757fd..27f0cbe 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
 LABELS=centos7-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
index 73ebed0..f306339 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200224-195343.324
 LABELS=centos7-docker-8c-8g
-HARDWARE_ID=v2-highcpu-8
+HARDWARE_ID=v3-standard-8
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
index f84207f..8bb7c03 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=CentOS 7 - redis -  - 50880808-8011
 LABELS=centos7-redis-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
 VOLUME_SIZE=50

diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
index e93c0d4..9f9d867 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -1,6 +1,6 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210306-131321.125
 LABELS=queue-docker-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
 INSTANCE_CAP=1
 NUM_EXECUTORS=4
 RETENTION_TIME=4320

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
index 27251e5..f36cf96 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20210317-233509.164
 LABELS=ubuntu1804-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
index a84f9a9..adc76ac 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210317-220033.605
 LABELS=ubuntu1804-docker-8c-16g
-HARDWARE_ID=v2-highcpu-16
+HARDWARE_ID=v3-standard-16
 VOLUME_SIZE=40

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 81b9539..efb5787 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 - 20210317-220033.605
 LABELS=ubuntu1804-docker-8c-8g
-HARDWARE_ID=v2-highcpu-8
+HARDWARE_ID=v3-standard-8
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
index f72ecc1..26892ac 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20210318-054700.866
 LABELS=ubuntu1804-helm-2c-1g
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=v3-standard-2
 VOLUME_SIZE=50

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
index cc1ec6b..5610c6a 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=Ubuntu 18.04 - memcached -  - 120780707-7003
 LABELS=ubuntu1804-memcached-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
 VOLUME_SIZE=50

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/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/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 5531bb9..3136272 100644 (file)
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -64,8 +64,6 @@
     stream:
       - 'master':
             branch: 'master'
-      - 'honolulu':
-            branch: 'honolulu'
     mvn-settings: 'dmaap-buscontroller-settings'
     robot-options: ''
 

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 406962b..4b57060 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -31,8 +31,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
       - 'guilin':
           branch: 'guilin'
       - 'honolulu':

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 3ef1b6c..3746aed 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -25,8 +25,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
       - 'guilin':
           branch: 'guilin'
       - 'honolulu':

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 8625cf4..1ca5db6 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -16,8 +16,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
       - 'guilin':
           branch: 'guilin'
       - 'honolulu':

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 ebc34a4..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':
@@ -14,10 +15,12 @@
       - 'distribution'
     trigger_jobs:
       - 'policy-distribution-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
 
 - 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'
@@ -31,10 +34,12 @@
       - 'xacml-pdp'
     trigger_jobs:
       - 'policy-xacml-pdp-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
 
 - 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'
@@ -48,10 +53,12 @@
       - 'drools-applications'
     trigger_jobs:
       - 'policy-drools-applications-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
 
 - 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'
@@ -65,13 +72,15 @@
       - 'drools-pdp'
     trigger_jobs:
       - 'policy-drools-pdp-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
 
 - 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':
@@ -82,13 +91,15 @@
       - 'apex-pdp'
     trigger_jobs:
       - 'policy-apex-pdp-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
 
 - 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':
@@ -99,13 +110,15 @@
       - 'pap'
     trigger_jobs:
       - 'policy-pap-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
 
 - 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':
@@ -116,6 +129,7 @@
       - 'api'
     trigger_jobs:
       - 'policy-api-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
 
 - project:
     name: policy-api-csit
@@ -124,9 +138,8 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
+    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
     stream:
-      - 'frankfurt':
-          branch: frankfurt
       - 'guilin':
           branch: guilin
     functionality:
@@ -142,10 +155,8 @@
       - '{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:
-      - 'frankfurt':
-          branch: frankfurt
       - 'guilin':
           branch: guilin
     functionality:
@@ -161,10 +172,8 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
-    recipients: 'ram.krishna.verma@est.tech'
+    recipients: 'ram_krishna.verma@bell.ca'
     stream:
-      - 'frankfurt':
-          branch: frankfurt
       - 'guilin':
           branch: guilin
     functionality:
@@ -180,10 +189,8 @@
       - '{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:
-      - 'frankfurt':
-          branch: frankfurt
       - 'guilin':
           branch: guilin
     functionality:
@@ -199,10 +206,8 @@
       - '{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:
-      - 'frankfurt':
-          branch: frankfurt
       - 'guilin':
           branch: guilin
     functionality:
@@ -218,9 +223,8 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
+    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
     stream:
-      - 'frankfurt':
-          branch: frankfurt
       - 'guilin':
           branch: guilin
     functionality:
@@ -236,9 +240,8 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
+    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
     stream:
-      - 'frankfurt':
-          branch: frankfurt
       - 'guilin':
           branch: guilin
     functionality:

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 40562db..f614feb 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -25,8 +25,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
       - 'guilin':
           branch: 'guilin'
       - 'honolulu':

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 3d9be5d..cf8b967 100644 (file)
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -31,63 +31,6 @@
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
-- project:
-    name: policy-docker-base-common-frankfurt
-    project-name: 'policy-docker'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          project-name: 'policy-docker-amd64'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1804-docker-8c-8g
-          pattern: 'do_not_match_any_file'
-      - '{project-name}-{stream}-merge-java':
-          project-name: 'policy-docker-arm64'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1804-docker-arm64-4c-2g
-          pattern: 'do_not_match_any_file'
-      - '{project-name}-multiarch-{stream}-merge-java'
-      - gerrit-maven-docker-stage:
-          project-name: 'policy-docker-arm64'
-          build-node: ubuntu1804-docker-arm64-4c-2g
-          maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          container-public-registry: 'docker.io'
-          container-staging-registry: 'docker.io'
-          cron: ''
-          gerrit_trigger_file_paths:
-             - compare-type: REG_EXP
-               pattern: 'do_not_match_any_file'
-      - gerrit-maven-docker-stage:
-          project-name: 'policy-docker-amd64'
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          container-public-registry: 'docker.io'
-          container-staging-registry: 'docker.io'
-          cron: ''
-          gerrit_trigger_file_paths:
-             - compare-type: REG_EXP
-               pattern: 'do_not_match_any_file'
-      - '{project-name}-docker-manifest-{stream}':
-          build-node: ubuntu1804-docker-8c-8g
-      - '{project-name}-multiarch-docker-stage-{stream}'
-#      - '{project-name}-gerrit-release-jobs':
-#          build-node: centos7-docker-8c-8g
-
-    project: 'policy/docker'
-    stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'policy-docker-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
 - project:
     name: policy-docker-clm
     jobs:

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 848ca6d..81bc61a 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -25,8 +25,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
       - 'guilin':
           branch: 'guilin'
       - 'honolulu':

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index e73edca..c27aab8 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -25,8 +25,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
       - 'guilin':
           branch: 'guilin'
       - 'honolulu':

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
deleted file mode 100644 (file)
index b1df14f..0000000
--- a/jjb/policy/policy-engine.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-- project:
-    name: policy-engine
-    project-name: 'policy-engine'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: "-P docker"
-      - 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
-          maven-versions-plugin: true
-          mvn-params: '-P docker  -Dmaven.test.skip=true'
-          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: 'policy/engine'
-    stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'policy-engine-settings'
-    java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
-
-- project:
-    name: policy-engine-clm
-    jobs:
-      - gerrit-maven-clm:
-         build-timeout: 40
-    nexus-iq-namespace: 'onap-'
-    project: policy/engine
-    project-name: 'policy-engine'
-    branch: 'frankfurt'
-    mvn-settings: 'policy-engine-settings'
-    java-version: openjdk11
-    build-node: 'ubuntu1804-builder-4c-4g'
-
-- project:
-    name: policy-engine-info
-    project-name: policy-engine
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: policy/engine
-    branch: frankfurt

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 6c52903..c2d5b48 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -19,8 +19,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
       - 'guilin':
           branch: 'guilin'
       - 'honolulu':

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 31a2287..a7a7ce5 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -25,8 +25,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
       - 'guilin':
           branch: 'guilin'
       - 'honolulu':

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index a2ad31e..2ec9cb0 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -16,8 +16,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
       - 'guilin':
           branch: 'guilin'
       - 'honolulu':

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 4d59908..d8abd90 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -25,8 +25,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
       - 'guilin':
           branch: 'guilin'
       - 'honolulu':

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'