boostrap rls job + elalto job cleanup

[ci-management.git] / jjb / dcaegen2 / dcaegen2-collectors-hv-ves.yaml

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 7cc2dbd..d101fba 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,8 +6,7 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+          java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
@@ -21,24 +20,22 @@
           mvn-goals: 'clean install'
       - '{project-name}-{stream}-merge-java':
           mvn-goals: 'clean deploy'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean deploy -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
-          # No-op
-          script: '/bin/true'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+          mvn-goals: 'clean deploy -Ddocker.skip'
       - gerrit-maven-docker-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
 
 - project:
     name: dcaegen2-collectors-hv-ves-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
@@ -48,10 +45,12 @@
     build-node: ubuntu1604-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
 
+
 - project:
     name: dcaegen2-collectors-hv-ves-info
     project-name: dcaegen2-collectors-hv-ves
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors/hv-ves
     branch: master