Merge "Added Jenking Job Configuration for FGPS"
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index 9987f57..38e683d 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -17,6 +17,8 @@
stream:
- 'master':
branch: 'master'
+ - 'dublin':
+ branch: 'dublin'
mvn-settings: 'dcaegen2-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 66e40e5..574e17e 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -11,19 +11,17 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - gerrit-maven-docker-stage:
+ - gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
+ mvn-params: '-Dmaven.test.skip=true'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1604-docker-8c-8g
+ maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=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'
+ mvn-params: '-Dmaven.test.skip=true -P docker'
project: 'externalapi/nbi'
stream:
- 'master':