Merge "Remove invalid trigger jobs"

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

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index e0a0b72..b1df14f 100644 (file)
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -13,9 +13,9 @@
           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':
@@ -23,30 +23,13 @@
 
     project: 'policy/engine'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-engine-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
-
-- project:
-    name: policy-engine-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
-    project: 'policy/engine'
-    project-name: 'policy-engine'
-    branch: 'master'
-    mvn-settings: 'policy-engine-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: policy-engine-clm
@@ -56,9 +39,10 @@
     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
@@ -67,4 +51,4 @@
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
     project: policy/engine
-    branch: master
+    branch: frankfurt