Merge "[INTEGRATION] Add Python ONAP SDK project to CI"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Mon, 24 Oct 2022 17:44:31 +0000 (17:44 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 24 Oct 2022 17:44:31 +0000 (17:44 +0000)
44 files changed:
jjb/aai/aai-aai-common.yaml
jjb/aai/aai-babel.yaml
jjb/aai/aai-graphadmin.yaml
jjb/aai/aai-logging-service.yaml
jjb/aai/aai-model-loader.yaml
jjb/aai/aai-resources.yaml
jjb/aai/aai-rest-client.yaml
jjb/aai/aai-schema-service.yaml
jjb/aai/aai-sparky-be.yaml
jjb/aai/aai-sparky-fe.yaml
jjb/aai/aai-traversal.yaml
jjb/ccsdk/apps.yaml
jjb/ccsdk/ccsdk-csit.yaml
jjb/ccsdk/ccsdk-oran.yaml
jjb/ccsdk/cds.yaml
jjb/ccsdk/distribution.yaml
jjb/ccsdk/features.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/sli.yaml
jjb/ci-management/ci-management-views.yaml
jjb/cps/cps-cps-temporal.yaml
jjb/cps/cps-ncmp-dmi-plugin.yaml
jjb/cps/cps.yaml
jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
jjb/policy/policy-apex-pdp.yaml
jjb/policy/policy-api.yaml
jjb/policy/policy-clamp.yaml
jjb/policy/policy-common.yaml
jjb/policy/policy-csit.yaml
jjb/policy/policy-distribution.yaml
jjb/policy/policy-docker-base-common.yaml
jjb/policy/policy-drools-applications.yaml
jjb/policy/policy-drools-pdp.yaml
jjb/policy/policy-gui.yaml
jjb/policy/policy-models.yaml
jjb/policy/policy-pap.yaml
jjb/policy/policy-parent.yaml
jjb/policy/policy-xacml-pdp.yaml
jjb/sdc/sdc.yaml
jjb/sdnc/sdnc-apps.yaml
jjb/sdnc/sdnc-csit.yaml
jjb/sdnc/sdnc-northbound.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/wss-unified-agent.config [deleted file]

index 4af6105..0327ce2 100644 (file)
@@ -23,8 +23,8 @@
       - 'master':
           branch: 'master'
           mvn-params: '-P spring-boot-2-1'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
           mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: 'Dockerfiles/aai-common/**'
     build-node: ubuntu1804-docker-8c-8g
     java-version: openjdk8
-
-- project:
-    name: 'aai-aai-common-whitesource'
-    project-name: 'aai-aai-common'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan
-    mvn-params: '-P spring-boot-2-1'
-    mvn-settings: 'aai-aai-common-settings'
-    wss-product-name: 'aai'
-    mvn-clean-install: true
-    project: 'aai/aai-common'
-    branch: master
-    java-version: openjdk8
index e751293..3f01a46 100644 (file)
@@ -26,8 +26,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/babel'
     stream:
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-babel-settings'
index 9cd9b7d..a258cbb 100644 (file)
@@ -27,8 +27,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
     files: '**'
index 7f771bf..f401301 100644 (file)
@@ -20,8 +20,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/logging-service'
     stream:
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-logging-service-settings'
index aade6d3..2a87b7e 100644 (file)
@@ -26,8 +26,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/model-loader'
     stream:
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
     build-node: centos8-builder-2c-1g
     project: aai/model-loader
     branch: master
-
-- project:
-    name: 'aai-model-loader-whitesource'
-    project-name: 'aai-model-loader'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan
-    mvn-settings: 'aai-model-loader-settings'
-    wss-product-name: 'aai'
-    mvn-clean-install: true
-    project: 'aai/model-loader'
-    branch: master
-    java-version: openjdk11
-    mvn-version: 'mvn36'
index 378dd34..0250b1b 100644 (file)
@@ -31,8 +31,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     files: '**'
     project: aai/resources
     branch: master
     java-version: openjdk8
-
-- project:
-    name: 'aai-resources-whitesource'
-    project-name: 'aai-resources'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan
-    mvn-settings: 'aai-resources-settings'
-    wss-product-name: 'aai'
-    mvn-clean-install: true
-    project: 'aai/resources'
-    branch: master
index a96c7f0..4dd4663 100644 (file)
@@ -20,8 +20,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/rest-client'
     stream:
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-rest-client-settings'
index 80f5881..4487da3 100644 (file)
@@ -27,8 +27,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'aai-schema-service-settings'
     mvn-version: 'mvn36'
     files: '**'
index 1250011..7e178df 100644 (file)
@@ -26,8 +26,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/sparky-be'
     stream:
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
     build-node: centos8-builder-2c-1g
     project: aai/sparky-be
     branch: master
-
-- project:
-    name: 'aai-sparky-be-whitesource'
-    project-name: 'aai-sparky-be'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan
-    mvn-settings: 'aai-sparky-be-settings'
-    wss-product-name: 'aai'
-    mvn-clean-install: true
-    project: 'aai/sparky-be'
-    branch: master
index 0f0bd8d..d850746 100644 (file)
@@ -14,8 +14,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/sparky-fe'
     stream:
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-fe-settings'
index f586437..5d1ace5 100644 (file)
@@ -30,8 +30,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
     files: '**'
index d830dc5..b44259a 100644 (file)
@@ -38,6 +38,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-apps-settings'
     build-node: centos8-builder-2c-1g
     project: ccsdk/apps
     branch: master
-
-- project:
-    name: ccsdk-apps-whitesource
-    project-name: ccsdk-apps
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-apps-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/apps
-    branch: master
index 4fa7d80..2c107a9 100644 (file)
@@ -19,6 +19,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'ccsdk-distribution-settings'
     mvn-version: 'mvn38'
     robot-options: ''
@@ -42,6 +44,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'ccsdk-oran-settings'
     mvn-version: 'mvn38'
     robot-options: ''
index 6fde8c5..741e744 100644 (file)
@@ -32,6 +32,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-oran-settings'
index ea5066e..06b7213 100644 (file)
@@ -31,6 +31,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
     build-node: centos8-builder-2c-1g
     project: ccsdk/cds
     branch: master
-
-- project:
-    name: ccsdk-cds-whitesource
-    project-name: ccsdk-cds
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-cds-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/cds
-    branch: master
index c47f21e..51039a6 100644 (file)
@@ -33,6 +33,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
     build-node: centos7-builder-2c-1g
     project: ccsdk/distribution
     branch: master
-
-- project:
-    name: ccsdk-distribution-whitesource
-    project-name: ccsdk-distribution
-    build-node: centos7-builder-4c-4g
-    jobs:
-      - gerrit-whitesource-scan:
-          java-opts: '-Xmx2048m'
-    java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-distribution-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/distribution
-    branch: master
index 40e5a8e..fe74392 100644 (file)
@@ -25,6 +25,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
     build-node: centos7-builder-2c-1g
     project: ccsdk/features
     branch: master
-
-- project:
-    name: ccsdk-features-whitesource
-    build-node: centos7-builder-4c-4g
-    project-name: ccsdk-features
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-features-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    project: ccsdk/features
-    branch: master
index 0673e14..c095d7c 100644 (file)
@@ -38,6 +38,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-parent-settings'
     build-node: centos7-builder-2c-1g
     project: ccsdk/parent
     branch: master
-
-- project:
-    name: ccsdk-parent-whitesource
-    project-name: ccsdk-parent
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-parent-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/parent
-    branch: master
index fff8890..57dd9c5 100644 (file)
@@ -25,6 +25,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-sli-settings'
     build-node: centos7-builder-2c-1g
     project: ccsdk/sli
     branch: master
-
-- project:
-    name: ccsdk-sli-whitesource
-    project-name: ccsdk-sli
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-sli-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/sli
-    branch: master
index dfab260..ff3a7a3 100644 (file)
     view-name: Verify-Jobs
     view-description: 'List of Verify jobs'
     view-regex: '^.*-verify-.*'
-
-- project:
-    name: WhiteSource
-    views:
-      - common-view
-    view-name: WhiteSource
-    view-description: 'List of WhiteSource jobs'
-    view-regex: '.*-whitesource-.*'
index 86b26e7..2e32340 100644 (file)
     mvn-settings: 'cps-cps-temporal-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: cps-cps-temporal-whitesource
-    project-name: cps-cps-temporal
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: mvn36
-    mvn-settings: cps-cps-temporal-settings
-    wss-product-name: cps-cps-temporal
-    mvn-clean-install: true
-    project: cps/cps-temporal
-    branch: master
-    build-node: centos7-docker-8c-8g
index 432041f..0b8c3df 100644 (file)
     mvn-settings: 'cps-ncmp-dmi-plugin-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: cps-ncmp-dmi-plugin-whitesource
-    project-name: cps-ncmp-dmi-plugin
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: mvn36
-    mvn-settings: cps-ncmp-dmi-plugin-settings
-    wss-product-name: cps-ncmp-dmi-plugin
-    mvn-clean-install: true
-    project: cps/ncmp-dmi-plugin
-    branch: master
-    build-node: centos7-docker-8c-8g
index 0baf896..6049052 100644 (file)
     mvn-settings: 'cps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: cps-whitesource
-    project-name: cps
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'cps-settings'
-    wss-product-name: cps
-    mvn-clean-install: true
-    project: cps
-    branch: master
-    build-node: centos7-docker-8c-8g
index 6cd4efa..478c61e 100644 (file)
           stream: kohn
           branch: kohn
           cron: ''
-      - gerrit-whitesource-scan:
-          build-timeout: 120
-          submodule-timeout: 30
-          java-opts: '-Xmx2048m'
-          mvn-pom: '{src-dir}/pom.xml'
       - gerrit-tox-sonar:
           # workaround because gerrit-tox-sonar doesn't support mvn-params/opts
           sonar-mvn-goal: '-f {src-dir}/pom.xml sonar:sonar'
index db00457..296a4fe 100644 (file)
@@ -38,6 +38,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-apex-pdp-settings'
     java-version: openjdk11
     files: '**'
index cf81426..49ca4c6 100644 (file)
@@ -32,6 +32,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-api-settings'
     java-version: openjdk11
     files: '**'
index 303a1d2..bbc1ae5 100644 (file)
 
     project: 'policy/clamp'
     stream:
-        - 'master':
-              branch: 'master'
-        - 'honolulu':
-              branch: 'honolulu'
-        - 'istanbul':
-              branch: 'istanbul'
-        - 'jakarta':
-              branch: 'jakarta'
+      - 'master':
+          branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-clamp-settings'
     java-version: openjdk11
     files: '**'
index abcf1e0..3d21e06 100644 (file)
@@ -23,6 +23,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-common-settings'
     java-version: openjdk11
     files: '**'
index 94c55a3..fdb74e9 100644 (file)
@@ -15,6 +15,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     functionality:
       - 'distribution'
     trigger_jobs:
@@ -38,6 +40,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     functionality:
       - 'xacml-pdp'
     trigger_jobs:
@@ -61,6 +65,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     functionality:
       - 'drools-applications'
     trigger_jobs:
@@ -84,6 +90,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     functionality:
       - 'drools-pdp'
     trigger_jobs:
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     functionality:
       - 'apex-pdp'
     trigger_jobs:
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     functionality:
       - 'pap'
     trigger_jobs:
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     functionality:
       - 'api'
     trigger_jobs:
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     functionality:
       - 'clamp'
     trigger_jobs:
index 02eaaa4..725dc9f 100644 (file)
@@ -32,6 +32,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-distribution-settings'
     java-version: openjdk11
     files: '**'
index e77343a..5626e58 100644 (file)
@@ -31,6 +31,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-docker-settings'
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     java-version: openjdk11
index f29fddb..35fc95b 100644 (file)
@@ -32,6 +32,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-drools-applications-settings'
     java-version: openjdk11
     files: '**'
index 3d2dde7..70ad1f1 100644 (file)
@@ -32,6 +32,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-drools-pdp-settings'
     java-version: openjdk11
     files: '**'
index 6c43884..175a79c 100644 (file)
@@ -30,6 +30,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-gui-settings'
     java-version: openjdk11
     files: '**'
index f6e7608..f3b44e6 100644 (file)
@@ -32,6 +32,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-models-settings'
     java-version: openjdk11
     files: '**'
index 71275e4..7bf2bb2 100644 (file)
@@ -32,6 +32,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-pap-settings'
     java-version: openjdk11
     files: '**'
index 9dc0b06..12929be 100644 (file)
@@ -23,6 +23,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-parent-settings'
     java-version: openjdk11
     files: '**'
index 40dffba..c1d0ffc 100644 (file)
@@ -32,6 +32,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-xacml-pdp-settings'
     java-version: openjdk11
     files: '**'
index 64639a3..c5e2e0c 100644 (file)
     build-node: centos7-builder-2c-1g
     project: sdc
     branch: master
-
-- project:
-    name: 'sdc-whitesource'
-    project-name: 'sdc'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan:
-          build-timeout: 120
-          submodule-timeout: 30
-          java-opts: '-Xmx2048m'
-    mvn-settings: 'sdc-settings'
-    wss-product-name: 'sdc'
-    mvn-clean-install: true
-    project: 'sdc'
-    branch: master
-    java-version: openjdk11
index 5cdbeb3..05682b1 100644 (file)
@@ -41,6 +41,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     java-version: openjdk11
     mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
index 55ae34d..bf5be3b 100644 (file)
@@ -19,6 +19,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'sdnc-oam-settings'
     mvn-version: 'mvn38'
     robot-options: ''
index c2b08ec..3a6878d 100644 (file)
@@ -22,6 +22,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     java-version: openjdk11
     mvn-version: "mvn38"
     mvn-settings: 'sdnc-northbound-settings'
index e2a3f1f..0ad1fed 100644 (file)
@@ -31,6 +31,8 @@
           branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     java-version: openjdk11
     mvn-version: "mvn38"
     mvn-settings: 'sdnc-oam-settings'
diff --git a/jjb/wss-unified-agent.config b/jjb/wss-unified-agent.config
deleted file mode 100644 (file)
index 4a9f091..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-####################################################################\r
-# WhiteSource Unified-Agent configuration file\r
-####################################################################\r
-##########################################\r
-# GENERAL SCAN MODE: Files and Package Managers\r
-##########################################\r
-\r
-checkPolicies=false\r
-forceCheckAllDependencies=false\r
-forceUpdate=false\r
-forceUpdate.failBuildOnPolicyViolation=false\r
-offline=false\r
-#ignoreSourceFiles=true\r
-#scanComment=\r
-#updateInventory=false\r
-#resolveAllDependencies=false\r
-#failErrorLevel=ALL\r
-#requireKnownSha1=false\r
-#generateProjectDetailsJson=true\r
-#generateScanReport=true\r
-#scanReportTimeoutMinutes=10\r
-#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model\r
-\r
-#projectPerFolder=true\r
-#projectPerFolderIncludes=\r
-#projectPerFolderExcludes=\r
-\r
-#wss.connectionTimeoutMinutes=60\r
-# Change the below URL to your WhiteSource server.\r
-# Use the 'WhiteSource Server URL' which can be retrieved\r
-# from your 'Profile' page on the 'Server URLs' panel.\r
-# Then, add the '/agent' path to it.\r
-wss.url=https://saas.whitesourcesoftware.com/agent\r
-\r
-#npm.resolveDependencies=false\r
-#npm.ignoreSourceFiles=false\r
-#npm.includeDevDependencies=true\r
-#npm.runPreStep=true\r
-#npm.ignoreNpmLsErrors=true\r
-#npm.ignoreScripts=true\r
-#npm.yarnProject=true\r
-#npm.accessToken=\r
-#npm.identifyByNameAndVersion=true\r
-\r
-#bower.resolveDependencies=false\r
-#bower.ignoreSourceFiles=true\r
-#bower.runPreStep=true\r
-\r
-#nuget.resolvePackagesConfigFiles=false\r
-#nuget.resolveCsProjFiles=false\r
-#nuget.resolveDependencies=false\r
-#nuget.restoreDependencies=true\r
-#nuget.preferredEnvironment=\r
-#nuget.packagesDirectory=\r
-#nuget.ignoreSourceFiles=true\r
-#nuget.runPreStep=true\r
-#nuget.resolveNuspecFiles=false\r
-\r
-#python.resolveDependencies=false\r
-#python.ignoreSourceFiles=false\r
-#python.ignorePipInstallErrors=true\r
-#python.installVirtualenv=true\r
-#python.resolveHierarchyTree=false\r
-#python.requirementsFileIncludes=requirements.txt\r
-#python.resolveSetupPyFiles=true\r
-#python.runPipenvPreStep=true\r
-#python.pipenvDevDependencies=true\r
-#python.IgnorePipenvInstallErrors=true\r
-\r
-#maven.ignoredScopes=test provided\r
-#maven.resolveDependencies=false\r
-#maven.ignoreSourceFiles=true\r
-#maven.aggregateModules=true\r
-#maven.ignorePomModules=false\r
-#maven.runPreStep=true\r
-#maven.ignoreMvnTreeErrors=true\r
-#maven.environmentPath=\r
-#maven.m2RepositoryPath=\r
-\r
-#gradle.ignoredScopes=\r
-#gradle.resolveDependencies=false\r
-#gradle.runAssembleCommand=false\r
-#gradle.runPreStep=true\r
-#gradle.ignoreSourceFiles=true\r
-#gradle.aggregateModules=true\r
-#gradle.preferredEnvironment=wrapper\r
-#gradle.localRepositoryPath=\r
-\r
-#paket.resolveDependencies=false\r
-#paket.ignoredGroups=\r
-#paket.ignoreSourceFiles=false\r
-#paket.runPreStep=true\r
-#paket.exePath=\r
-\r
-#go.resolveDependencies=false\r
-#go.collectDependenciesAtRuntime=true\r
-#go.dependencyManager=\r
-#go.ignoreSourceFiles=true\r
-#go.glide.ignoreTestPackages=false\r
-#go.gogradle.enableTaskAlias=true\r
-\r
-#ruby.resolveDependencies = false\r
-#ruby.ignoreSourceFiles = false\r
-#ruby.installMissingGems = true\r
-#ruby.runBundleInstall = true\r
-#ruby.overwriteGemFile = true\r
-\r
-#sbt.resolveDependencies=false\r
-#sbt.ignoreSourceFiles=true\r
-#sbt.aggregateModules=true\r
-#sbt.runPreStep=true\r
-#sbt.targetFolder=\r
-\r
-#php.resolveDependencies=false\r
-#php.runPreStep=true\r
-#php.includeDevDependencies=true\r
-\r
-#html.resolveDependencies=false\r
-\r
-#cocoapods.resolveDependencies=false\r
-#cocoapods.runPreStep=true\r
-#cocoapods.ignoreSourceFiles=false\r
-\r
-#hex.resolveDependencies=false\r
-#hex.runPreStep=true\r
-#hex.ignoreSourceFiles=false\r
-#hex.aggregateModules=true\r
-\r
-##################################\r
-# Organization tokens:\r
-##################################\r
-apiKey=\r
-\r
-#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option\r
-#userKey=\r
-\r
-projectName=\r
-projectVersion=\r
-projectToken=\r
-\r
-productName=\r
-productVersion=\r
-productToken=\r
-#updateType=APPEND\r
-#requesterEmail=user@provider.com\r
-\r
-#########################################################################################\r
-# Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE\r
-#########################################################################################\r
-includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx **/*.go **/*.py\r
-\r
-#includes=**/*.m **/*.mm  **/*.js **/*.php\r
-#includes=**/*.jar\r
-#includes=**/*.gem **/*.rb\r
-#includes=**/*.dll **/*.cs **/*.nupkg\r
-#includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2\r
-#includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py\r
-\r
-## Exclude file extensions or specific directories by adding **/*.<extension> or **<excluded_dir>/**\r
-excludes=**/*sources.jar **/*javadoc.jar\r
-\r
-case.sensitive.glob=false\r
-followSymbolicLinks=true\r
-\r
-##################################\r
-# Archive properties\r
-##################################\r
-#archiveExtractionDepth=2\r
-#archiveIncludes=**/*.war **/*.ear\r
-#archiveExcludes=**/*sources.jar\r
-\r
-##################################\r
-# Proxy settings\r
-##################################\r
-#proxy.host=\r
-#proxy.port=\r
-#proxy.user=\r
-#proxy.pass=\r
-\r
-##################################\r
-# SCM settings\r
-##################################\r
-#scm.type=\r
-#scm.user=\r
-#scm.pass=\r
-#scm.ppk=\r
-#scm.url=\r
-#scm.branch=\r
-#scm.tag=\r
-#scm.npmInstall=\r
-#scm.npmInstallTimeoutMinutes=\r
-#scm.repositoriesFile=\r
-\r
-##############################################\r
-# SCAN MODE: Linux package manager settings\r
-##############################################\r
-#scanPackageManager=true\r
-\r
-##################################\r
-# SCAN MODE: Docker images\r
-##################################\r
-#docker.scanImages=true\r
-#docker.includes=.*.*\r
-#docker.excludes=\r
-#docker.pull.enable=true\r
-#docker.pull.images=.*.*\r
-#docker.pull.maxImages=10\r
-#docker.pull.tags=.*.*\r
-#docker.pull.digest=\r
-#docker.delete.force=true\r
-#docker.login.sudo=false\r
-\r
-#docker.aws.enable=true\r
-#docker.aws.registryIds=\r
-\r
-#docker.azure.enable=true\r
-#docker.azure.userName=\r
-#docker.azure.userPassword=\r
-#docker.azure.registryNames=\r
-\r
-##################################\r
-# SCAN MODE: Docker containers\r
-##################################\r
-#docker.scanContainers=true\r
-#docker.containerIncludes=.*.*\r
-#docker.containerExcludes=\r
-\r
-################################\r
-# Serverless settings\r
-################################\r
-#serverless.provider=\r
-#serverless.scanFunctions=true\r
-#serverless.includes=\r
-#serverless.excludes=\r
-#serverless.region=\r
-#serverless.maxFunctions=10\r