X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpolicy%2Fpolicy-engine.yaml;h=b1df14f7aeed6ee9a1c0ceb84dc76f21eb33191f;hb=f4bb4800cf2bc3f364f6c5bebdc8b0cd7788d498;hp=ab7b8aadd25e3841c793f19389bbcffa2f75bf34;hpb=94f332b3dfafdd6b6a01f65e4bca2ad1ab528e5e;p=ci-management.git

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index ab7b8aadd..b1df14f7a 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -8,70 +8,28 @@
          docker-pom: 'pom.xml'
          mvn-profile: 'docker'
          mvn-params: "-P docker"
-      - '{project-name}-{stream}-docker-version-java-daily':
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: '-P docker'
-         disabled: true
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
+          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/engine'
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-engine-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
-
-- project:
-    name: policy-engine-dublin
-    project-name: 'policy-engine-dublin'
-    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: 'include-raw-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'policy/engine'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-engine-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
-
-- project:
-    name: policy-engine-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'policy/engine'
-    project-name: 'policy-engine'
-    branch: 'master'
-    mvn-settings: 'policy-engine-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: policy-engine-clm
@@ -81,14 +39,16 @@
     nexus-iq-namespace: 'onap-'
     project: policy/engine
     project-name: 'policy-engine'
-    branch: 'master'
+    branch: 'frankfurt'
     mvn-settings: 'policy-engine-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    java-version: openjdk11
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: policy-engine-info
     project-name: policy-engine
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/engine
-    branch: master
+    branch: frankfurt