summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2019-06-04 21:03:24 +0000
committerGerrit Code Review <gerrit@onap.org>2019-06-04 21:03:24 +0000
commitea0eb58420e8082dae92b600578aaec0482d4578 (patch)
tree5e2e00d50373f241148a3128919c3396a6b7246f
parentc1093625e311754bfc5138f48958c490c95630fe (diff)
parent478b62f1ed6ccb68c6acb96a4e0de556cdeb872f (diff)
Merge changes from topic "gerrit-maven-stage"
* changes: Remove deprecated music release jobs Remove old release jobs USECASEUI
-rw-r--r--jjb/music/music-mdbc.yaml1
-rw-r--r--jjb/music/music-prom.yaml11
-rw-r--r--jjb/music/music.yaml11
-rw-r--r--jjb/usecaseui/usecase-ui-server.yaml1
-rw-r--r--jjb/usecaseui/usecase-ui.yaml1
5 files changed, 12 insertions, 13 deletions
diff --git a/jjb/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml
index cd0e24624..273efcf15 100644
--- a/jjb/music/music-mdbc.yaml
+++ b/jjb/music/music-mdbc.yaml
@@ -9,7 +9,6 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-release-version-java-daily'
project: 'music/mdbc'
stream:
- 'master':
diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
index 7025c95e0..e36fa38a5 100644
--- a/jjb/music/music-prom.yaml
+++ b/jjb/music/music-prom.yaml
@@ -9,11 +9,12 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- - '{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'
+ - gerrit-maven-docker-stage:
+ build-node: centos7-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 -P docker'
project: 'music/prom'
stream:
- 'master':
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index 816f83ca3..a69bb7eb3 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -15,11 +15,12 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- - '{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'
+ - gerrit-maven-docker-stage:
+ build-node: centos7-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 -P docker'
project: 'music'
stream:
- 'master':
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index e4b2850af..b7055947e 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -15,7 +15,6 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index c4084bbef..1e034bf4b 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -20,7 +20,6 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
build-node: ubuntu1604-docker-8c-8g