Merge "Move node builder for linters to ubuntu1804"
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index c8e76d9..4b43e2c 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -39,8 +39,6 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
pattern: 'components/datalake-handler/**'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
stream:
- 'master':
branch: 'master'
@@ -70,39 +68,6 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
pattern: 'components/datalake-handler/**'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-services-settings'
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
-
-- project:
- name: dcaegen2-services-datalake-handler-db-init-release
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-datalake-handler-db-init'
- jobs:
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- mvn-pom: 'components/datalake-handler/pom.xml'
- mvn-params: '-f components/datalake-handler/pom.xml'
- version-properties-file: 'components/datalake-handler/version.properties'
- pattern: 'components/datalake-handler/**'
- - gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
- mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/init_db/pom.xml'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- pattern: 'components/datalake-handler/**'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
stream:
- 'master':
branch: 'master'
diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml
index e610e47..b09e30e 100644
--- a/jjb/dmaap/dmaap-kafka-docker.yaml
+++ b/jjb/dmaap/dmaap-kafka-docker.yaml
@@ -10,6 +10,8 @@
mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'dmaap/kafka11aaf'
stream:
- 'master':
diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml
index 3b18d08..e17fbe0 100644
--- a/jjb/dmaap/dmaap-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-zookeeper.yaml
@@ -20,6 +20,8 @@
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'dmaap/zookeeper'
stream:
- 'master':