summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2019-07-15 17:50:16 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-15 17:50:16 +0000
commit0f48f4583304c1bfddf7cf4d41ce89bcee9583c9 (patch)
treedb7f2b4b9eb47240959d8c2d11002d0767d8e614
parent8e4008534e3a22273022565eb7cfc2de3b5ef9f3 (diff)
parent8c73eee3fbfc09e7df4cc585e0f47024ed14757d (diff)
Merge "Migrate to gerrit-maven-stage (SDC)-1"
-rw-r--r--jjb/sdc/sdc-jtosca.yaml6
-rw-r--r--jjb/sdc/sdc-sdc-distribution-client.yaml6
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml6
-rw-r--r--jjb/sdc/sdc.yaml17
4 files changed, 26 insertions, 9 deletions
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index bda26b76a..62896212f 100644
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -10,8 +10,12 @@
project-name: 'sdc-jtosca'
jobs:
- '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+
project: 'sdc/jtosca'
stream:
- 'master':
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 69c6e4a8c..557962fc3 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -10,8 +10,12 @@
project-name: 'sdc-sdc-distribution-client'
jobs:
- '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+
project: 'sdc/sdc-distribution-client'
stream:
- 'master':
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index f1ef58c98..55633ee41 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -10,8 +10,12 @@
project-name: 'sdc-sdc-tosca'
jobs:
- '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+
project: 'sdc/sdc-tosca'
stream:
- 'master':
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index a6e2dd58b..431135f0d 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -34,13 +34,18 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
- - '{project-name}-{stream}-release-version-java-daily':
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
- - '{project-name}-{stream}-docker-version-java-daily':
- build-node: 'ubuntu1604-docker-8c-8g'
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1604-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+
project: 'sdc'
stream:
- 'master':