Merge "[DCAE] Add automated review for VESCollector"

diff --git a/global-jjb b/global-jjb
index 18d90a9..ff3ea7c 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 18d90a9e0b74515b6aa2ac8fc4a17b9d98a7680e
+Subproject commit ff3ea7c20d4ea68079502f20efa885b298bc6cb2

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
index 50b2941..17525af 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20220420-200651.484
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220428-144254.000
 LABELS=ubuntu1804-helm-2c-1g
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/managed-config-files/mavenSettings/dcae-utils-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/dcae-utils-settings/serverCredentialMappings.yaml
index 33a3248..af112b7 100644 (file)
--- a/jenkins-config/managed-config-files/mavenSettings/dcae-utils-settings/serverCredentialMappings.yaml
+++ b/jenkins-config/managed-config-files/mavenSettings/dcae-utils-settings/serverCredentialMappings.yaml
@@ -6,6 +6,8 @@ serverCredentialMappings:
     credentialsId: *cred
   - serverId: "ecomp-staging"
     credentialsId: *cred
+  - serverId: "ecomp-raw"
+    credentialsId: *cred
   - serverId: "nexus3.onap.org:10001"
     credentialsId: "read-only-docker"
   - serverId: "nexus3.onap.org:10002"

diff --git a/jenkins-config/managed-config-files/mavenSettings/dcaegen2-utils-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/dcaegen2-utils-settings/serverCredentialMappings.yaml
index 3e30446..d7078ff 100644 (file)
--- a/jenkins-config/managed-config-files/mavenSettings/dcaegen2-utils-settings/serverCredentialMappings.yaml
+++ b/jenkins-config/managed-config-files/mavenSettings/dcaegen2-utils-settings/serverCredentialMappings.yaml
@@ -6,6 +6,8 @@ serverCredentialMappings:
     credentialsId: *cred
   - serverId: "ecomp-staging"
     credentialsId: *cred
+  - serverId: "ecomp-raw"
+    credentialsId: *cred
   - serverId: "nexus3.onap.org:10001"
     credentialsId: "read-only-docker"
   - serverId: "nexus3.onap.org:10002"

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 13976b7..fb69552 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -31,6 +31,8 @@
                 mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0'
             - '{project-name}-gerrit-release-jobs':
                 mvn-params: '-Drevision=3.0.0'
+      - 'honolulu':
+          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
       - 'jakarta':
@@ -56,6 +58,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
       - 'jakarta':

diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
deleted file mode 100644 (file)
index a36be28..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-blueprints
-    project-name: 'dcaegen2-platform-blueprints'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'dcaegen2/platform/blueprints'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
-    mvn-settings: 'dcaegen2-platform-blueprints-settings'
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
-
-- project:
-    name: dcaegen2-platform-blueprints-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform/blueprints
-    build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-platform-blueprints'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-blueprints-settings'
-
-- project:
-    name: dcaegen2-platform-blueprints-info
-    project-name: dcaegen2-platform-blueprints
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/platform/blueprints
-    branch: master

diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
deleted file mode 100644 (file)
index ff838dd..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-configbinding
-    # git repo
-    project: dcaegen2/platform/configbinding
-    # jenkins job prefix
-    project-name: dcaegen2-platform-configbinding
-    # push credentials
-    mvn-settings: dcaegen2-platform-configbinding-settings
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-    # used by tox-install.sh to specify the interpreter used to install tox
-    python-version: python3
-    jobs:
-      # clm and tox
-      - '{project-name}-python-jobs'
-      # build docker image
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - gerrit-release-verify:
-          build-node: centos7-docker-8c-8g
-      - gerrit-release-merge:
-          build-node: centos7-docker-8c-8g
-    stream:
-      - master:
-          branch: master
-      - istanbul:
-          branch: istanbul
-      - honolulu:
-          branch: honolulu
-
-- project:
-    name: dcaegen2-platform-configbinding-sonar
-    jobs:
-      - gerrit-tox-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-docker-8c-8g
-    project: 'dcaegen2/platform/configbinding'
-    project-name: 'dcaegen2-platform-configbinding'
-    branch: 'master'
-    # used by tox-install.sh to specify the interpreter used to install tox
-    python-version: python3
-    mvn-settings: 'dcaegen2-platform-configbinding-settings'
-    mvn-goals: 'clean test'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-
-- project:
-    name: dcaegen2-platform-configbinding-info
-    project: dcaegen2/platform/configbinding
-    project-name: dcaegen2-platform-configbinding
-    branch: master
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
deleted file mode 100644 (file)
index e50fc88..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-mod-bpgenerator
-    project: 'dcaegen2/platform'
-    project-name: 'dcaegen2-platform-mod'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          project-name: dcaegen2-platform-mod-bpgenerator
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-          version-properties-file: 'mod/bpgenerator/version.properties'
-          mvn-pom: 'mod/bpgenerator/pom.xml'
-          mvn-params: '-f mod/bpgenerator/pom.xml'
-          pattern: 'mod/bpgenerator/**'
-    subproject:
-      - 'bpgenerator':
-          pom: 'mod/bpgenerator/pom.xml'
-          pattern: 'mod/bpgenerator/**'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
-    java-version: openjdk11
-    mvn-settings: 'dcaegen2-platform-settings'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
-
-- project:
-    name: dcaegen2-platform-mod-bpgenerator-sonar
-    java-version: openjdk11
-    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-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: 'dcaegen2-platform-mod-bpgenerator'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
-    mvn-params: '-f mod/bpgenerator/pom.xml'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
deleted file mode 100644 (file)
index 74dc768..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-plugins
-    project-name: 'dcaegen2-platform-plugins'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'dcaegen2/platform/plugins'
-    stream:
-      - 'master':
-          branch: 'master'
-          python-version: python3
-      - 'honolulu':
-          branch: 'honolulu'
-          python-version: python3
-      - 'istanbul':
-          branch: 'istanbul'
-          python-version: python3
-    mvn-settings: 'dcaegen2-platform-plugins-settings'
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'centos7-redis-4c-4g'
-
-- project:
-    name: dcaegen2-platform-plugins-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: centos7-redis-4c-4g
-    project: 'dcaegen2/platform/plugins'
-    project-name: 'dcaegen2-platform-plugins'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-plugins-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-platform-plugins-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform/plugins
-    build-node: centos7-redis-4c-4g
-    project-name: 'dcaegen2-platform-plugins'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-plugins-settings'
-
-- project:
-    name: dcaegen2-platform-plugins-info
-    project-name: dcaegen2-platform-plugins
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/platform/plugins
-    branch: master

diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
deleted file mode 100644 (file)
index f70c722..0000000
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: dcaegen2-bbs-event-processor-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcaegen2-services-bbs-event-processor'
-    recipients: 'vv770d@att.com stavros.kanarakis@nokia.com piotr.wielebski@nokia.com kornel.janiak@nokia.com'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - 'bbs-testsuites':
-          trigger_jobs:
-            - 'dcaegen2-services-{stream}-bbs-event-processor-merge-java'
-    robot-options: ''

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index df2ef5c..475efa0 100644 (file)
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -115,7 +115,7 @@
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
       - oom-create-netrc:
@@ -164,7 +164,7 @@
           properties-content: 'HELM_MODULE={helm-module}'
       - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
 
@@ -207,10 +207,10 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
-      - lf-infra-create-netrc:
+      - oom-create-netrc:
           server-id: oom-helm
       - inject:
           properties-content: |
@@ -252,10 +252,10 @@
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
-      - lf-infra-create-netrc:
+      - oom-create-netrc:
           server-id: oom-helm
       - inject:
           properties-content: |
@@ -273,7 +273,7 @@
     builders:
       - lf-infra-pre-build
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
@@ -288,7 +288,7 @@
     builders:
       - lf-infra-pre-build
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - inject:
@@ -319,7 +319,7 @@
     builders:
       - lf-infra-pre-build
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index c1597cd..ebe21ea 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -38,6 +38,8 @@
           branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-apex-pdp-settings'
     java-version: openjdk11
     files: '**'
@@ -75,6 +77,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-apex-pdp-settings'
     java-version: openjdk11
 

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 19f6893..02ac0d8 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -32,6 +32,8 @@
           branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-api-settings'
     java-version: openjdk11
     files: '**'
@@ -69,6 +71,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-api-settings'
     java-version: openjdk11
 

diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index d06d3af..331540d 100644 (file)
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -31,6 +31,8 @@
               branch: 'honolulu'
         - 'istanbul':
               branch: 'istanbul'
+        - 'jakarta':
+              branch: 'jakarta'
     mvn-settings: 'policy-clamp-settings'
     java-version: openjdk11
     files: '**'
@@ -68,6 +70,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-clamp-settings'
     build-node: ubuntu1804-docker-8c-8g
     java-version: openjdk11

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 05a4989..4f359bc 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -23,6 +23,8 @@
           branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-common-settings'
     java-version: openjdk11
     files: '**'
@@ -60,6 +62,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-common-settings'
     java-version: openjdk11
 

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index f423d00..94c55a3 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -11,6 +11,10 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     functionality:
       - 'distribution'
     trigger_jobs:
@@ -32,6 +36,8 @@
           branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     functionality:
       - 'xacml-pdp'
     trigger_jobs:
@@ -51,6 +57,10 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     functionality:
       - 'drools-applications'
     trigger_jobs:
@@ -70,6 +80,10 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     functionality:
       - 'drools-pdp'
     trigger_jobs:
@@ -89,6 +103,10 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     functionality:
       - 'apex-pdp'
     trigger_jobs:
@@ -108,6 +126,10 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     functionality:
       - 'pap'
     trigger_jobs:
@@ -127,6 +149,10 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     functionality:
       - 'api'
     trigger_jobs:
@@ -146,6 +172,10 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     functionality:
       - 'clamp'
     trigger_jobs:

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 8cbc3ac..507f15a 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -32,6 +32,8 @@
           branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-distribution-settings'
     java-version: openjdk11
     files: '**'
@@ -69,6 +71,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-distribution-settings'
     java-version: openjdk11
 

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 15d77e6..434be5f 100644 (file)
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -28,6 +28,8 @@
           branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
@@ -45,6 +47,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-docker-settings'
 
 - project:

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index f4f9ef6..7000692 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -32,6 +32,8 @@
           branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-drools-applications-settings'
     java-version: openjdk11
     files: '**'
@@ -70,6 +72,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-drools-applications-settings'
     java-version: openjdk11
     build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index f52d81d..513496e 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -32,6 +32,8 @@
           branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-drools-pdp-settings'
     java-version: openjdk11
     files: '**'
@@ -70,6 +72,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-drools-pdp-settings'
     java-version: openjdk11
 

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index bf306b5..f730693 100644 (file)
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -28,6 +28,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-gui-settings'
     java-version: openjdk11
     files: '**'
@@ -66,6 +68,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-gui-settings'
     java-version: openjdk11
 

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 3894787..8656b97 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -26,6 +26,8 @@
           branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-models-settings'
     java-version: openjdk11
     files: '**'
@@ -63,6 +65,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-models-settings'
     java-version: openjdk11
 

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index b875209..f12af7d 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -32,6 +32,8 @@
           branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-pap-settings'
     java-version: openjdk11
     files: '**'
@@ -69,6 +71,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-pap-settings'
     java-version: openjdk11
 

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index c0c5132..d5dae2c 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -23,6 +23,8 @@
           branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-parent-settings'
     java-version: openjdk11
     files: '**'
@@ -41,6 +43,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-parent-settings'
     java-version: openjdk11
 

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 6f8b43b..ca85809 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -32,6 +32,8 @@
           branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-xacml-pdp-settings'
     java-version: openjdk11
     files: '**'
@@ -69,6 +71,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-xacml-pdp-settings'
     java-version: openjdk11