Build VID from dublin branch

- Add "dublin" build jobs
- Revert "Migrate to gerrit-maven-stage (VID)"
- Revert "Switch release jobs for VID."

This reverts commits 442f526a, a9131da3

Issue-ID: CIMAN-234

Change-Id: I7e09924417035786f626858e9f0770589b522d58
Signed-off-by: Ittay Stern <ittay.stern@att.com>

diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
index 23afa74..b8d0b0a 100644 (file)
--- a/jjb/vid/vid-csit.yaml
+++ b/jjb/vid/vid-csit.yaml
@@ -8,6 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'healthCheck':
           trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'

diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 1380ed2..db9624a 100644 (file)
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -11,17 +11,14 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-docker-stage:
-          build-node: queue-docker-4c-4g
-          maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-{stream}-release-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     project: 'vid'
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
@@ -38,6 +35,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''