From 3e985c7286b2919947197883f19b36116c5f7fcf Mon Sep 17 00:00:00 2001
From: dglFromAtt <dgl@research.att.com>
Date: Sun, 4 Mar 2018 08:23:18 -0500
Subject: Consolidate jjb for buscontroller

This removes duplicate jobs.
Also should create Docker container.
Added correction to Patch 1 typo

Change-Id: I18a93fae4478cbe0cdec8248e6a8679083a91258
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-325
Signed-off-by: dglFromAtt <dgl@research.att.com>
---
 jjb/dmaap/dmaap-buscontroller-docker.yaml | 22 ----------------------
 jjb/dmaap/dmaap-buscontroller.yaml        |  8 +++++++-
 2 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 jjb/dmaap/dmaap-buscontroller-docker.yaml

(limited to 'jjb/dmaap')

diff --git a/jjb/dmaap/dmaap-buscontroller-docker.yaml b/jjb/dmaap/dmaap-buscontroller-docker.yaml
deleted file mode 100644
index a862a19bf..000000000
--- a/jjb/dmaap/dmaap-buscontroller-docker.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-
-- project:
-    name: dmaap-buscontroller-docker
-    project-name: 'dmaap-buscontroller-docker'
-    jobs:
-      - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily'
-    project: 'dmaap/buscontroller'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dmaap-buscontroller-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: 'docker'
-    build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 591b88649..d06314e16 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -1,4 +1,5 @@
 ---
+
 - project:
     name: dmaap-buscontroller
     project-name: 'dmaap-buscontroller'
@@ -10,7 +11,12 @@
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
-          mvn-goals: 'clean install'
+          mvn-goals: 'clean install docker:build'
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-goals: 'clean install docker:build'
+          build-node: ubuntu1604-docker-8c-8g
     project: 'dmaap/buscontroller'
     stream:
       - 'master':
-- 
cgit 1.2.3-korg