From: dglFromAtt <dgl@research.att.com>
Date: Wed, 8 Jul 2020 17:51:57 +0000 (-0400)
Subject: Add jjb streams for elalto and frankfurt
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F82%2F109982%2F3;p=ci-management.git

Add jjb streams for elalto and frankfurt

Some changes to jjb to kick off elalto job so it can build a new image.

Signed-off-by: dglFromAtt <dgl@research.att.com>
Change-Id: I51eabd586773bc3b520c84800c8736a542d3f071
Issue-ID: DMAAP-1424
---

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index b20bbc5e0..39a6a379c 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -6,7 +6,7 @@
       - project-view
 
 - project:
-    name: dmaap-buscontroller
+    name: dmaap-buscontroller-java11
     project-name: 'dmaap-buscontroller'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -18,15 +18,36 @@
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-
     project: 'dmaap/buscontroller'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dmaap-buscontroller-settings'
     files: '**'
     archive-artifacts: ''
+    java-version: openjdk11
 
+- project:
+    name: dmaap-buscontroller-java8
+    project-name: 'dmaap-buscontroller'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package -P docker docker:build docker:push'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+    project: 'dmaap/buscontroller'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'dmaap-buscontroller-settings'
+    files: '**'
+    archive-artifacts: ''
+    java-version: openjdk8
 
 # removed sonar job from this template because this repo only builds a docker container
 # and the 0% coverage report from Sonar was causing repeated escalations.
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index 38f4a5f9b..4eeafa958 100644
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: dmaap-dbcapi
+    name: dmaap-dbcapi-java11
     project-name: 'dmaap-dbcapi'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -11,13 +11,38 @@
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-
     project: 'dmaap/dbcapi'
     mvn-settings: 'dmaap-dbcapi-settings'
     java-version: openjdk11
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
+    # 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: ''
+
+- project:
+    name: dmaap-dbcapi-java8
+    project-name: 'dmaap-dbcapi'
+    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
+    project: 'dmaap/dbcapi'
+    mvn-settings: 'dmaap-dbcapi-settings'
+    java-version: openjdk8
+    stream:
+      - 'elalto':
+          branch: 'elalto'
     # 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
@@ -26,6 +51,7 @@
     files: '**'
     archive-artifacts: ''
 
+
 - project:
     name: dmaap-dbcapi-sonar
     jobs: