Merge "Migrate to gerrit-maven-stage (SDC)-1"

diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index 5b4449e..f8ad73f 100644 (file)
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          mvn-params: '-f champ-service/pom.xml docker:build -Dmaven.test.skip=true'
+          mvn-params: 'docker:build -Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'

diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 7bb29b7..a293e92 100644 (file)
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -35,10 +35,11 @@
     name: aai-search-data-service-searchguard
     project-name: 'aai-search-data-service-searchguard'
     jobs:
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'elasticsearch-sg/pom.xml'
-          mvn-goals: 'docker:build'
+      - gerrit-maven-docker-stage:
+          mvn-params: 'docker:build -B -Dmaven.test.skip=true'
           build-node: ubuntu1604-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:

diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 11295ea..16f5a76 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          mvn-params: '-f sparky-onap-service/pom.xml docker:build -B -Dmaven.test.skip=true'
+          mvn-params: '-f sparkybe-onap-application/pom.xml docker:build -B -Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 43a2fbf..b14d819 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -13,6 +13,12 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+      - 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: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
 
     sign-artifacts: true
     project: 'ccsdk/apps'

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 8afb2ee..d190371 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -7,6 +7,12 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+      - 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: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
 
     sign-artifacts: true
     project: 'ccsdk/cds'

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 6c396fb..89b4c4f 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -7,6 +7,12 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+      - 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: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
     sign-artifacts: true
     project: 'ccsdk/distribution'
     stream:

diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml
index 83bdffc..2fc39b8 100644 (file)
--- a/jjb/ci-management/ci-management-coverity.yaml
+++ b/jjb/ci-management/ci-management-coverity.yaml
@@ -26,7 +26,7 @@
     node: '{build-node}'
     branch: master
     build-days-to-keep: 7
-    build-timeout: 60
+    build-timeout: 240
     cron: '@daily'
     disabled: false
     git-url: '$GIT_URL/$PROJECT'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 7cc2dbd..90525f6 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -21,18 +21,12 @@
           mvn-goals: 'clean install'
       - '{project-name}-{stream}-merge-java':
           mvn-goals: 'clean deploy'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean deploy -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
-          # No-op
-          script: '/bin/true'
       - 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:
-          sign-artifacts: true
-          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-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'

diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 586ba64..de6d9ac 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -5,18 +5,11 @@
     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
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          sign-artifacts: true
           build-node: centos7-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 8de9d2b..33da0ac 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -19,20 +19,16 @@
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-verify-java':
         mvn-goals: 'clean install'
       - '{project-name}-{stream}-merge-java':
         mvn-goals: 'clean deploy'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          script: '/bin/true'
       - 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:
-          sign-artifacts: true
-          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 install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version'

diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index a342447..f69f3d8 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -5,7 +5,6 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index faf9afa..57f4a1a 100644 (file)
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -11,10 +11,6 @@
     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:
           build-node: ubuntu1604-docker-8c-8g
           mvn-goals: 'clean package -P docker docker:build docker:push'

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index bc83e98..ca94ded 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -4,16 +4,6 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      #
-      # see DMAAP-334 for more details, but
-      #     - '{project-name}-{stream}-docker-java-daily':
-      # doesn't support mvn-goals override, so trying this...
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean package -P docker docker:build docker:push'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g

diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml
index 0de9ec3..c131b89 100644 (file)
--- a/jjb/dmaap/dmaap-kafka-docker.yaml
+++ b/jjb/dmaap/dmaap-kafka-docker.yaml
@@ -4,10 +4,6 @@
     name: dmaap-kafka-docker
     project-name: 'dmaap-kafka-docker'
     jobs:
-      - '{project-name}-{stream}-docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           maven-versions-plugin: true

diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index bc171cb..2fe4ee7 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -5,7 +5,6 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g

diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index f189c4e..d55e92b 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -4,10 +4,6 @@
     name: dmaap-messagerouter-docker
     project-name: 'dmaap-messagerouter-docker'
     jobs:
-      - '{project-name}-{stream}-docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           mvn-params: '-P docker -Dmaven.test.skip=true'

diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 2f59b7a..c64a9b5 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -5,7 +5,6 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g

diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 82077fa..d1d0f54 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -5,7 +5,6 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g

diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 69ab4d3..8dd517c 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -5,7 +5,6 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g

diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml
index 47c7f32..0b275f4 100644 (file)
--- a/jjb/dmaap/dmaap-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-zookeeper.yaml
@@ -14,10 +14,6 @@
     name: dmaap-zookeeper-docker
     project-name: 'dmaap-zookeeper-docker'
     jobs:
-      - '{project-name}-{stream}-docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           mvn-params: '-P docker -Dmaven.test.skip=true'

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
index 2dd843f..9f71877 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
@@ -9,18 +9,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
     project: logging-analytics/pomba/pomba-aai-context-builder
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
 
     mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
     files: '**'

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
index 2fbfff6..ee01951 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
@@ -9,13 +9,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
     project: logging-analytics/pomba/pomba-audit-common
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
index 091b9a4..a992704 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
@@ -9,19 +9,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'docker:build'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
     project: logging-analytics/pomba/pomba-context-aggregator
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
index f41625f..709c374 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
@@ -9,18 +9,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
     project: logging-analytics/pomba/pomba-network-discovery-context-builder
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
index cd1d05c..c4bc170 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
@@ -9,18 +9,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
     project: logging-analytics/pomba/pomba-sdnc-context-builder
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 95de71c..50f042d 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -15,18 +15,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'logging-analytics'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'logging-analytics-settings'
     files: '**'
     archive-artifacts: ''
@@ -82,7 +74,6 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g

diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh
deleted file mode 100755 (executable)
index bdb5a84..0000000
--- a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-echo '========================== Building docker for vesagent =========================='
-chmod 755 ./vesagent/docker/*.*
-./vesagent/docker/docker-build.sh

diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index b90b929..7ac4fca 100644 (file)
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -20,13 +20,13 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
+      - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
+          maven-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-2g

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index c2b72cf..7a17cdb 100644 (file)
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -19,17 +19,17 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          maven-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
deleted file mode 100644 (file)
index 0066522..0000000
--- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- project:
-    name: multicloud-openstack-vmware-vesagent-java
-    project-name: 'multicloud-openstack-vmware-vesagent'
-    project: 'multicloud/openstack/vmware'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-    subproject:
-      - 'vesagent':
-          pom: 'vesagent/pom.xml'
-          pattern: 'vesagent/**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-#- project:
-#    name: multicloud-openstack-vmware-vesagent-arm64-java
-#    project-name: 'multicloud-openstack-vmware-vesagent-arm64'
-#    project: 'multicloud/openstack/vmware'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'multicloud-openstack-vmware-settings'
-#    subproject:
-#      - 'vesagent':
-#          pom: 'vesagent/pom.xml'
-#          pattern: 'vesagent/**'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-version-shell-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-goals: 'install'
-#          script:
-#            !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
-#    files: '**'
-#    archive-artifacts: ''

diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
deleted file mode 100644 (file)
index ca22904..0000000
--- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
-    name: multicloud-openstack-vmware-vesagent-python
-    project-name: 'multicloud-openstack-vmware-vesagent'
-    project: 'multicloud/openstack/vmware'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
-    subproject:
-      - 'vesagent':
-          path: 'vesagent'
-          pattern: 'vesagent/**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 9947419..9d6e58a 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -66,13 +66,13 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
+      - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
+          maven-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-memcached-4c-4g'

diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml
index 110d1ec..b0a373b 100644 (file)
--- a/jjb/optf/optf-fgps.yaml
+++ b/jjb/optf/optf-fgps.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: optf-fgps
+    name: optf-fgps-engine
     project-name: 'optf-fgps'
     project: 'optf/fgps'
     stream:
@@ -8,10 +8,6 @@
           branch: 'master'
     mvn-settings: 'optf-fgps-settings'
     subproject:
-      - 'valetapi':
-          path: 'valetapi'
-          pattern: 'valetapi/**'
-          pom: 'pom.xml'
       - 'engine':
           path: 'engine'
           pattern: 'engine/**'
@@ -19,7 +15,6 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
@@ -29,6 +24,26 @@
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
 
+- project:
+    name: optf-fgps-valetapi
+    project-name: 'optf-fgps'
+    project: 'optf/fgps'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'optf-fgps-settings'
+    subproject:
+      - 'valetapi':
+          path: 'valetapi'
+          pattern: 'valetapi/**'
+          pom: 'pom.xml'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-builder-4c-4g'
+
 - project:
     name: optf-fgps-docker
     project-name: 'optf-fgps'

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index cf747e7..8553eae 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -14,7 +14,12 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+      - 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: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
 
     project: 'sdnc/apps'
     stream:

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 7e0f5de..6d626b8 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -8,7 +8,6 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'sdnc/northbound'
     stream:

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 2b29994..8cc4774 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -9,7 +9,12 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+      - 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: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
     project: 'sdnc/oam'
     stream:
       - 'master':

diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 1f7092e..30a1de5 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -9,7 +9,6 @@
         sign-artifacts: true
         build-node: centos7-builder-4c-4g
         maven-versions-plugin: true
-    - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'vnfsdk/functest'
     stream:

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 07e9dc8..b15f4d8 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -16,17 +16,11 @@
           mvn-pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
-          mvn-goals: 'docker:build'
-          docker-image-name: 'onap/vnfsdk/refrepo'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+#      - '{project-name}-{stream}-docker-version-java-daily':
+#          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#          build-node: ubuntu1604-docker-8c-8g
     project: 'vnfsdk/refrepo'
     stream:
       - 'master':

diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index efd7555..1709243 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -9,7 +9,6 @@
         sign-artifacts: true
         build-node: centos7-builder-4c-4g
         maven-versions-plugin: true
-    - '{project-name}-{stream}-release-version-java-daily'
     project: 'vnfsdk/validation'
     stream:
       - 'master':

diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index 0044317..6611f5e 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -11,7 +11,6 @@
           mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-java-daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g