summaryrefslogtreecommitdiffstats
path: root/jjb/policy
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/policy')
-rw-r--r--jjb/policy/policy-apex-pdp.yaml2
-rw-r--r--jjb/policy/policy-api.yaml2
-rw-r--r--jjb/policy/policy-common.yaml2
-rw-r--r--jjb/policy/policy-csit.yaml14
-rw-r--r--jjb/policy/policy-distribution.yaml2
-rw-r--r--jjb/policy/policy-docker-base-common.yaml12
-rw-r--r--jjb/policy/policy-drools-applications.yaml3
-rw-r--r--jjb/policy/policy-drools-pdp.yaml2
-rw-r--r--jjb/policy/policy-engine.yaml27
-rw-r--r--jjb/policy/policy-models.yaml2
-rw-r--r--jjb/policy/policy-pap.yaml2
-rw-r--r--jjb/policy/policy-parent.yaml2
-rw-r--r--jjb/policy/policy-xacml-pdp.yaml2
13 files changed, 45 insertions, 29 deletions
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 34a7a6448..8d8321c88 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -31,6 +31,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-apex-pdp-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 4c4c47d66..3c9579685 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -25,6 +25,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-api-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 006ad3b95..e3e0ce80e 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-common-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 38759ff5f..16025c0a8 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -9,6 +9,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'apex-pdp'
trigger_jobs:
@@ -26,6 +28,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'distribution'
trigger_jobs:
@@ -42,6 +46,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'api'
trigger_jobs:
@@ -59,6 +65,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'xacml-pdp'
trigger_jobs:
@@ -76,6 +84,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'pap'
trigger_jobs:
@@ -92,6 +102,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'drools-pdp'
trigger_jobs:
@@ -108,6 +120,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'drools-applications'
trigger_jobs:
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 9cb4ca0b6..8788f5da1 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -25,6 +25,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-distribution-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 61ac6feed..96e9c17fe 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: policy-docker-base-common-elalto
+ name: policy-docker-base-common
project-name: 'policy-docker'
jobs:
- '{project-name}-{stream}-verify-java'
@@ -20,15 +20,15 @@
project: 'policy/docker'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'master':
+ branch: 'master'
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1804-builder-4c-4g
- project:
- name: policy-docker-base-common
+ name: policy-docker-base-common-frankfurt
project-name: 'policy-docker'
jobs:
- '{project-name}-{stream}-verify-java'
@@ -77,8 +77,8 @@
project: 'policy/docker'
stream:
- - 'master':
- branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index d255266f4..166f5ca09 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -25,12 +25,15 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-drools-applications-settings'
java-version: openjdk11
files: '**'
archive-artifacts: ''
build-node: ubuntu1804-docker-8c-8g
+
- project:
name: policy-drools-applications-sonar
jobs:
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 6440e3578..cc056ce93 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -25,6 +25,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-drools-pdp-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 9f8030a79..b1df14f7a 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -23,8 +23,8 @@
project: 'policy/engine'
stream:
- - 'master':
- branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-engine-settings'
java-version: openjdk11
files: '**'
@@ -32,25 +32,6 @@
build-node: 'ubuntu1804-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: ubuntu1804-builder-4c-4g
- project: 'policy/engine'
- project-name: 'policy-engine'
- branch: 'master'
- mvn-settings: 'policy-engine-settings'
- java-version: openjdk11
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
-
-- project:
name: policy-engine-clm
jobs:
- gerrit-maven-clm:
@@ -58,7 +39,7 @@
nexus-iq-namespace: 'onap-'
project: policy/engine
project-name: 'policy-engine'
- branch: 'master'
+ branch: 'frankfurt'
mvn-settings: 'policy-engine-settings'
java-version: openjdk11
build-node: 'ubuntu1804-builder-4c-4g'
@@ -70,4 +51,4 @@
- gerrit-info-yaml-verify
build-node: centos7-builder-2c-1g
project: policy/engine
- branch: master
+ branch: frankfurt
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 0b9e63799..a3a7b31e2 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-models-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 75c9e22ea..3bf16e61a 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -25,6 +25,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-pap-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 7901d4fd5..8d803fa5d 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-parent-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index a4982aaae..4607aec95 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -25,6 +25,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-xacml-pdp-settings'
java-version: openjdk11
files: '**'