dcaegen2 jobs updates for jjb migration

1) Removed dublin branches across all jobs
2) Switched to centos7-docker-8c-8g for docker dependent builds
3) Removed dcaegen2-service clm (subproject has own clm job)
4) Cleaned up old release job (replaced by gerrit-maven jobs)

Change-Id: If77bdf431e0189d774d80b285ec1b0ca98c09d6b
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-1669
Issue-ID: DCAEGEN2-1578
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>

diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
index a0abcbc..2e2c9e3 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/analytics/tca'
     mvn-settings: 'dcaegen2-analytics-tca-settings'
@@ -19,7 +17,6 @@
     build-node: ubuntu1604-builder-4c-4g
 
     jobs:
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-verify-java':
           mvn-params: '-DskipTests=true'
       - '{project-name}-{stream}-merge-java'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
index 6740dae..6be71b3 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'ManagementInterface-suite':
           trigger_jobs:
@@ -17,4 +15,4 @@
           trigger_jobs:
            - '{project-name}-{stream}-docker-java-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 861d571..104dfbf 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,8 +6,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/collectors/datafile'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
@@ -19,7 +17,7 @@
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-{stream}-verify-java':
           mvn-goals: 'clean install'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
index 7108503..749d01e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'testsuites':
           trigger_jobs:

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 90525f6..f8dd9e0 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,8 +6,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 08b3dfb..a1237ce 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -7,15 +7,13 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
 
     project: 'dcaegen2/collectors/restconf'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-restconf-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 79dab04..0ef35e6 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 2c2f646..5911e3e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -7,15 +7,13 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
 
     project: 'dcaegen2/collectors/ves'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index 5dee646..f1943d4 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-deployments-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index 285d4e0..6d35e18 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-blueprints-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
index 5a75199..5e4e33e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
@@ -6,8 +6,6 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
-            version-properties: 'blueprint-generator/version.properties'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g

diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 8f753b4..4b161fb 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-configbinding-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index b6bb261..8f2c351 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index de6d9ac..a5acd4d 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -7,10 +7,10 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImage'
@@ -19,8 +19,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 3d7e40e..1d94f6c 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -52,26 +52,3 @@
       - gerrit-info-yaml-verify
     project: dcaegen2/platform/plugins
     branch: master
-
-#job added to retain dublin plugin build under ubuntu
-- project:
-    name: dcaegen2-platform-plugins-dublin
-    project-name: 'dcaegen2-platform-plugins'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'dcaegen2/platform/plugins'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'dcaegen2-platform-plugins-settings'
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index cb19425..a93fd57 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index a810fea..5c76222 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -5,18 +5,12 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean package docker:build -DpushImage'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImage'

diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
index 94e7e2e..392879e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'bbs-testsuites':
           trigger_jobs:

diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index 78f758f..3dfb537 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -13,8 +13,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -45,8 +43,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true

diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index 3527ffd..ff7f9ae 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-heartbeat-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-services-java.yaml b/jjb/dcaegen2/dcaegen2-services-java.yaml
deleted file mode 100644 (file)
index 525a9fa..0000000
--- a/jjb/dcaegen2/dcaegen2-services-java.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- project:
-    name: dcaegen2-services-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-docker-8c-8g
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 33da0ac..8015e00 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -7,9 +7,6 @@
       - 'master':
           branch: 'master'
           mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version'
-      - 'dublin':
-          branch: 'dublin'
-          mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-version'
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'

diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
index 1d4bcf2..fc34f99 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
@@ -7,9 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-
     functionality:
       - 'pmmapper':
           trigger_jobs:

diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 7cb2d03..1d4afc4 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -7,15 +7,13 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
 
     project: 'dcaegen2/services/prh'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index f69f3d8..f191fbc 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -14,8 +14,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-sdk-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 3318b48..3c80e05 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -7,15 +7,13 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
 
     project: 'dcaegen2/services/son-handler'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-son-handler-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index d91b378..4e579b6 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -13,8 +13,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-utils-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
index 4c610e1..1c3d660 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'testsuites'
     trigger_jobs: