summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2018-03-04 08:23:18 -0500
committerdglFromAtt <dgl@research.att.com>2018-03-04 08:36:07 -0500
commit3e985c7286b2919947197883f19b36116c5f7fcf (patch)
tree67f39368b9b66348d1cf1d8bf2fa3f01c98620d4 /jjb
parent7c8380e89cfc00cb0002e9c08aec0f9aeaf2ea98 (diff)
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>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/dmaap/dmaap-buscontroller-docker.yaml22
-rw-r--r--jjb/dmaap/dmaap-buscontroller.yaml8
2 files changed, 7 insertions, 23 deletions
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':