Fix dcae build errors

datalake is in POC state; disabled new release specific jobs

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

7 files changed, 24 insertions, 26 deletions

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 7f962a99a..cc8ab2af7 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -23,12 +23,12 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+          mvn-goals: 'clean install -Ddocker.skip'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
-          mvn-goals: 'clean install docker:build docker:push'
 
 - project:
     name: dcaegen2-collectors-hv-ves-clm
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 3a5249c3c..b7f5204f0 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -13,7 +13,7 @@
           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'
+          mvn-goals: 'clean package docker:build -DpushImageTag'
 
     project: 'dcaegen2/collectors/restconf'
     stream:
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 2d772d7c3..384982c6a 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -13,7 +13,7 @@
           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'
+          mvn-goals: 'clean package docker:build -DpushImageTag'
 
     project: 'dcaegen2/collectors/ves'
     stream:
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index 38741e150..e24155cdd 100644
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -32,6 +32,7 @@
           version-properties-file: 'components/bbs-event-processor/version.properties'
           mvn-pom: 'components/bbs-event-processor/pom.xml'
           mvn-params: '-f components/bbs-event-processor/pom.xml'
+          mvn-goals: 'clean package -Ddockerfile.skip -f components/bbs-event-processor/pom.xml'
           pattern: 'components/bbs-event-processor/**'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 9fce045a3..44f8155b0 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -20,26 +20,25 @@
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
 
-- project:
-    name: dcaegen2-services-datalake-handler-release
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-datalake-handler'
-    jobs:
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-          mvn-pom: 'components/datalake-handler/pom.xml'
-          mvn-params: '-f components/datalake-handler/pom.xml'
-          version-properties-file: 'components/datalake-handler/version.properties'
-          pattern: 'components/datalake-handler/**'
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
-          mvn-goals: 'clean package docker:build -DpushImage -f components/datalake-handler/pom.xml'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          pattern: 'components/datalake-handler/**'
-
+#- project:
+#    name: dcaegen2-services-datalake-handler-release
+#    project: 'dcaegen2/services'
+#    project-name: 'dcaegen2-services-datalake-handler'
+#    jobs:
+#      - gerrit-maven-stage:
+#          sign-artifacts: true
+#          build-node: centos7-builder-4c-4g
+#          maven-versions-plugin: true
+#          mvn-pom: 'components/datalake-handler/pom.xml'
+#          mvn-params: '-f components/datalake-handler/pom.xml'
+#          version-properties-file: 'components/datalake-handler/version.properties'
+#          pattern: 'components/datalake-handler/**'
+#      - gerrit-maven-docker-stage:
+#          build-node: ubuntu1604-docker-8c-8g
+#          mvn-goals: 'clean package docker:build -DpushImage -f components/datalake-handler/pom.xml'
+#          container-public-registry: 'nexus3.onap.org:10001'
+#          container-staging-registry: 'nexus3.onap.org:10003'
+#          pattern: 'components/datalake-handler/**'
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index 8e6db3508..41cb2f169 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -19,8 +19,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-mapper-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index a2c56f032..bd375a659 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -13,7 +13,7 @@
           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'
+          mvn-goals: 'clean package docker:build -DpushImageTag'
 
     project: 'dcaegen2/services/son-handler'
     stream: