Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / policy / policy-parent.yaml

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 7722b81..bf54cd0 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -9,35 +9,25 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+          mvn-params: '-Dmaven.test.skip=true'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/parent'
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-parent-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-parent-dublin
-    project-name: 'policy-parent-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
-
-    project: 'policy/parent'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-parent-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-parent-clm
@@ -46,13 +36,21 @@
     nexus-iq-namespace: 'onap-'
     project: policy/parent
     project-name: 'policy-parent'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-parent-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-parent-info
     project-name: policy-parent
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/parent
     branch: master