summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2019-07-15 22:24:50 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-15 22:24:50 +0000
commit89aa5c0e186f27edf84853ec90c9e5f5fa4fef41 (patch)
tree4541d122a4447cfedfdf59d9f61aae76033089ce /jjb
parentf4d47cd50dd92d64e572ba21c614aec4ceb95374 (diff)
parentcd4818ef7f8fdd30c294f8f93f2d85082ec9dbea (diff)
Merge "Migrate gerrit-maven-stage (DCAEGEN)-3"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml8
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-datafile.yaml5
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-restconf.yaml5
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-ves.yaml5
-rw-r--r--jjb/dcaegen2/dcaegen2-services-mapper.yaml14
-rw-r--r--jjb/dcaegen2/dcaegen2-services-prh.yaml5
-rw-r--r--jjb/dcaegen2/dcaegen2-services-son-handler.yaml5
7 files changed, 33 insertions, 14 deletions
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 6d0d2dcb4..778324c51 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -18,11 +18,11 @@
- '{project-name}-{stream}-verify-java':
- '{project-name}-{stream}-merge-java':
mvn-goals: 'clean install'
- - '{project-name}-{stream}-docker-java-shell-daily':
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1604-docker-8c-8g
mvn-goals: 'clean deploy docker:build -DpushImage'
- # No-op
- script: '/bin/true'
- build-node: 'ubuntu1604-docker-8c-8g'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
- project:
name: dcaegen2-analytics-tca-gen2-sonar
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 7f065240c..861d57124 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -17,7 +17,10 @@
archive-artifacts: ''
build-node: ubuntu1604-docker-8c-8g
jobs:
- - '{project-name}-{stream}-release-version-java-daily'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
- '{project-name}-{stream}-verify-java':
mvn-goals: 'clean install'
- '{project-name}-{stream}-merge-java':
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 1be57266b..08b3dfb5d 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -5,7 +5,10 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
project: 'dcaegen2/collectors/restconf'
stream:
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index d7bc96472..2c2f6464e 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -5,7 +5,10 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
project: 'dcaegen2/collectors/ves'
stream:
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index e319e68a6..8e6db3508 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -5,12 +5,16 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-docker-java-shell-daily':
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1604-docker-8c-8g
mvn-goals: 'clean package docker:build -DpushImage'
- # No-op
- script: '/bin/true'
- build-node: 'ubuntu1604-docker-8c-8g'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+
project: 'dcaegen2/services/mapper'
stream:
- 'master':
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 8e3047f7e..7cb2d03e9 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -5,7 +5,10 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
project: 'dcaegen2/services/prh'
stream:
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index b4d2b5c5b..3318b48b0 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -5,7 +5,10 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
project: 'dcaegen2/services/son-handler'
stream: