X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpolicy%2Fpolicy-drools-applications.yaml;h=905958d6984487876f6783c1594075b9149902d8;hb=refs%2Fchanges%2F37%2F131337%2F1;hp=97cc6ab28383aaed2be5b01a71e32064a305f366;hpb=65f642c857a044caaa77a73329d858b5f9c152d1;p=ci-management.git

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 97cc6ab28..7cbce5688 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -4,57 +4,58 @@
     project-name: 'policy-drools-applications'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'drools-apps-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
+      - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'drools-apps-docker-release.sh'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
+          mvn-profile: 'docker'
+          mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          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: 'policy/drools-applications'
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-drools-applications-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: ubuntu1804-docker-8c-8g
 
-- project:
-    name: policy-drools-applications-casablanca
-    project-name: 'policy-drools-applications-casablanca'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
-
-    project: 'policy/drools-applications'
-    stream:
-      - 'casablanca':
-          branch: 'casablanca'
-    mvn-settings: 'policy-drools-applications-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
 
 - project:
     name: policy-drools-applications-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/drools-applications'
     project-name: 'policy-drools-applications'
     branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
+    java-version: openjdk11
+    java-opts: '-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -65,13 +66,25 @@
     nexus-iq-namespace: 'onap-'
     project: policy/drools-applications
     project-name: 'policy-drools-applications'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-drools-applications-settings'
+    mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    java-version: openjdk11
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-drools-applications-info
     project-name: policy-drools-applications
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/drools-applications
     branch: master