diff options
40 files changed, 256 insertions, 347 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 86f795aaa..ccd0f8af6 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -27,7 +27,7 @@ files: "**" archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g - java-version: openjdk8 + java-version: openjdk11 - project: name: aai-aai-common-sonar @@ -46,7 +46,7 @@ mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" mvn-version: "mvn35" - java-version: openjdk8 + java-version: openjdk11 - project: name: aai-aai-common-clm @@ -62,7 +62,7 @@ mvn-params: "" mvn-settings: "aai-aai-common-settings" mvn-version: "mvn35" - java-version: openjdk8 + java-version: openjdk11 - project: name: "aai-aai-common-docker" @@ -87,4 +87,4 @@ mvn-version: "mvn35" files: "Dockerfiles/aai-common/**" build-node: ubuntu1804-docker-8c-8g - java-version: openjdk8 + java-version: openjdk11 diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 18622c6d5..2995b4761 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -33,7 +33,7 @@ files: "**" archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g - java-version: openjdk8 + java-version: openjdk11 - project: name: aai-graphadmin-sonar @@ -51,7 +51,7 @@ mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" mvn-version: "mvn35" - java-version: openjdk8 + java-version: openjdk11 - project: name: aai-graphadmin-clm @@ -65,4 +65,4 @@ branch: "master" mvn-settings: "aai-graphadmin-settings" mvn-version: "mvn35" - java-version: openjdk8 + java-version: openjdk11 diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index ba29a79ec..61f99141e 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -13,7 +13,6 @@ - gerrit-maven-merge: - gerrit-maven-stage: sign-artifacts: true - build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: @@ -31,7 +30,7 @@ mvn-settings: "aai-model-loader-settings" files: "**" archive-artifacts: "" - build-node: ubuntu1804-builder-4c-4g + build-node: centos8-docker-4c-4g mvn-version: "mvn36" java-version: openjdk11 nexus-snapshot-repo: "snapshots" diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 19aa0bdf7..c62d8165c 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -37,7 +37,7 @@ files: "**" archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g - java-version: openjdk8 + java-version: openjdk11 - project: name: aai-resources-sonar @@ -55,7 +55,7 @@ mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" mvn-version: "mvn35" - java-version: openjdk8 + java-version: openjdk11 - project: name: aai-resources-clm @@ -69,4 +69,4 @@ branch: "master" mvn-settings: "aai-resources-settings" mvn-version: "mvn35" - java-version: openjdk8 + java-version: openjdk11 diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index b10dafe34..6fd44f1d7 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -36,7 +36,7 @@ files: "**" archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g - java-version: openjdk8 + java-version: openjdk11 - project: name: aai-traversal-sonar @@ -54,7 +54,7 @@ mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" mvn-version: "mvn35" - java-version: openjdk8 + java-version: openjdk11 - project: name: aai-traversal-clm @@ -68,4 +68,4 @@ branch: "master" mvn-settings: "aai-traversal-settings" mvn-version: "mvn35" - java-version: openjdk8 + java-version: openjdk11 diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index f728bcbc2..53e7b8c8e 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -30,6 +30,8 @@ project: "ccsdk/apps" stream: + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" java-version: openjdk17 diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 8c7ddb686..5fe35c9a9 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -15,10 +15,10 @@ stream: - "master": branch: "master" + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" - - "london": - branch: "london" mvn-settings: "ccsdk-distribution-settings" mvn-version: "mvn38" robot-options: "" @@ -32,12 +32,16 @@ - "{project-name}-merge-verification-maven-{stream}": mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker" project-name: "ccsdk-oran" - recipients: "bjorn.magnusson@est.tech martin.c.yan@est.tech" + recipients: "John.Keeney@est.tech" # project name in gerrit project: "ccsdk/oran" stream: - "master": branch: "master" + - "newdelhi": + branch: "newdelhi" + - "montreal": + branch: "montreal" - "london": branch: "london" java-version: openjdk17 diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 97e80332e..2c4c87d35 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -24,6 +24,8 @@ build-node: centos7-docker-2c-1g project: "ccsdk/oran" stream: + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" - "london": diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 0c5431f26..b8d9833bd 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -23,6 +23,8 @@ project: "ccsdk/cds" stream: + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" java-version: openjdk17 diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 2b724916b..c8310ba79 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -25,6 +25,9 @@ project: "ccsdk/distribution" stream: + - "newdelhi": + branch: "newdelhi" + java-version: openjdk17 - "montreal": branch: "montreal" java-version: openjdk17 diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 69a5320d8..0c40403b4 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -18,6 +18,9 @@ project: "ccsdk/features" stream: + - "newdelhi": + branch: "newdelhi" + mvn-opts: "-Xmx3072m" - "montreal": branch: "montreal" mvn-opts: "-Xmx3072m" diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml index cef17dca5..09695ffe1 100644 --- a/jjb/ccsdk/odl-legacy.yaml +++ b/jjb/ccsdk/odl-legacy.yaml @@ -26,6 +26,8 @@ stream: - "master": branch: "master" + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" java-version: openjdk17 diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 6ca6c587a..a4f525c48 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -20,6 +20,8 @@ nexus-snapshot-repo: "snapshots" project: "ccsdk/parent" stream: + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" java-version: openjdk17 diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index 845c5d299..5e3cf6b95 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -18,6 +18,8 @@ project: "ccsdk/sli" stream: + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" java-version: openjdk17 diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml deleted file mode 100644 index d247b3891..000000000 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ /dev/null @@ -1,71 +0,0 @@ ---- -- project: - name: dmaap-datarouter-java-17 - project-name: "dmaap-datarouter" - jobs: - - "{project-name}-{stream}-verify-java" - - "{project-name}-{stream}-merge-java" - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-goals: "clean package -P docker docker:build docker:push" - container-public-registry: "nexus3.onap.org:10001" - container-staging-registry: "nexus3.onap.org:10003" - cron: "" - - "{project-name}-gerrit-release-jobs": - build-node: centos7-docker-2c-1g - project: "dmaap/datarouter" - stream: - - "master": - branch: "master" - mvn-settings: "dmaap-datarouter-settings" - files: "**" - archive-artifacts: "" - java-version: openjdk17 - -- project: - name: dmaap-datarouter-csit-ssl - jobs: - - "{project-name}-review-verification-maven-{stream}": - mvn-goals: clean package - mvn-params: "-P docker docker:build -DskipTests=false" - - "{project-name}-merge-verification-maven-{stream}": - mvn-goals: clean package - mvn-params: "-P docker docker:build" - project-name: "dmaap-datarouter" - recipients: "fiachra.corcoran@est.tech" - project: "dmaap/datarouter" - stream: - - "master": - branch: "master" - mvn-settings: "dmaap-datarouter-settings" - robot-options: "" - -- project: - name: dmaap-datarouter-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: "{sonarcloud_project_organization}" - sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" - sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: ubuntu1804-builder-4c-4g - project: "dmaap/datarouter" - project-name: "dmaap-datarouter" - branch: "master" - mvn-settings: "dmaap-datarouter-settings" - mvn-goals: "clean install" - java-version: openjdk17 - -- project: - name: dmaap-datarouter-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: "onap-" - project: dmaap/datarouter - project-name: "dmaap-datarouter" - branch: "master" - mvn-settings: "dmaap-datarouter-settings" - java-version: openjdk17 - mvn-version: "mvn36" - maven-version: "mvn36" diff --git a/jjb/dmaap/dmaap-kafka-client.yaml b/jjb/dmaap/dmaap-kafka-client.yaml deleted file mode 100644 index 6c07340de..000000000 --- a/jjb/dmaap/dmaap-kafka-client.yaml +++ /dev/null @@ -1,50 +0,0 @@ ---- -- project: - name: dmaap-kafka-client - project-name: "dmaap-kafka-client" - jobs: - - "{project-name}-{stream}-verify-java" - - "{project-name}-{stream}-merge-java" - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos8-docker-4c-4g - maven-versions-plugin: true - cron: "" - - "{project-name}-gerrit-release-jobs": - build-node: centos7-docker-2c-1g - project: "dmaap/kafka11aaf" - stream: - - "master": - branch: "master" - mvn-settings: "dmaap-kafka11aaf-settings" - files: "**" - archive-artifacts: "" - java-version: openjdk11 - -- project: - name: dmaap-kafka-client-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: "{sonarcloud_project_organization}" - sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" - sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: ubuntu1804-builder-4c-4g - project: "dmaap/kafka11aaf" - project-name: "dmaap-kafka-client" - branch: "master" - mvn-settings: "dmaap-kafka11aaf-settings" - mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - java-version: openjdk11 - -- project: - name: dmaap-kafka-client-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: "onap-" - project: "dmaap/kafka11aaf" - project-name: "dmaap-kafka-client" - branch: "master" - mvn-settings: "dmaap-kafka11aaf-settings" - java-version: openjdk11 diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 25f9de340..0fbcee08d 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -46,6 +46,8 @@ stream: - "master": branch: "master" + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml index d92e58247..5b86aecbd 100644 --- a/jjb/oom/oom-main-linter.yaml +++ b/jjb/oom/oom-main-linter.yaml @@ -7,10 +7,6 @@ jobs: - oom-linters subproject: - - "commit": - tox-dir: "." - tox-envs: "gitlint" - pattern: "**" - "doc8": tox-dir: "." tox-envs: "doc8" @@ -31,5 +27,7 @@ stream: - "master": branch: "master" + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index c512064ee..82c83dce9 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -63,6 +63,26 @@ mvn-settings: "policy-apex-pdp-settings" java-version: openjdk17 mvn-goals: "clean install" + cron: "@daily" + +- project: + name: policy-apex-pdp-sonar-verify + jobs: + - gerrit-maven-sonar-verify + sonarcloud: true + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + build-node: ubuntu1804-builder-4c-4g + project: "policy/apex-pdp" + project-name: "policy-apex-pdp" + branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-apex-pdp-settings" + java-version: openjdk17 + mvn-goals: "clean install" + sonarcloud-qualitygate-wait: true - project: name: policy-apex-pdp-clm diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 482bbf0a0..4707aa935 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -57,6 +57,26 @@ mvn-version: "mvn36" maven-version: "mvn36" mvn-goals: "clean install" + cron: "@daily" + +- project: + name: policy-api-sonar-verify + jobs: + - gerrit-maven-sonar-verify + sonarcloud: true + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + build-node: ubuntu1804-builder-4c-4g + project: "policy/api" + project-name: "policy-api" + branch: "master" + mvn-settings: "policy-api-settings" + java-version: openjdk17 + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-goals: "clean install" + sonarcloud-qualitygate-wait: true - project: name: policy-api-clm diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml index 51a4d2cdf..aa54c4e12 100644 --- a/jjb/policy/policy-clamp.yaml +++ b/jjb/policy/policy-clamp.yaml @@ -57,6 +57,26 @@ mvn-settings: "policy-clamp-settings" mvn-goals: "clean install" java-version: openjdk17 + cron: "@daily" + +- project: + name: policy-clamp-sonar-verify + jobs: + - gerrit-maven-sonar-verify + sonarcloud: true + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + build-node: ubuntu1804-docker-8c-8g + project: "policy/clamp" + project-name: "policy-clamp" + branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-clamp-settings" + mvn-goals: "clean install" + java-version: openjdk17 + sonarcloud-qualitygate-wait: true - project: name: policy-clamp-clm diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index d4cde4e35..db54db2f0 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -47,6 +47,26 @@ mvn-settings: "policy-common-settings" java-version: openjdk17 mvn-goals: "clean install" + cron: "@daily" + +- project: + name: policy-common-sonar-verify + jobs: + - gerrit-maven-sonar-verify + sonarcloud: true + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + build-node: ubuntu1804-docker-8c-8g + project: "policy/common" + project-name: "policy-common" + branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-common-settings" + mvn-goals: "clean install" + java-version: openjdk17 + sonarcloud-qualitygate-wait: true - project: name: policy-common-clm diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml index 04acfc7c8..75118d461 100644 --- a/jjb/policy/policy-csit-jobs.yaml +++ b/jjb/policy/policy-csit-jobs.yaml @@ -92,8 +92,6 @@ jenkins-ssh-credential: "{jenkins-ssh-credential}" triggers: - - reverse: - jobs: "{project-name}-{stream}-verify-java" - gerrit-trigger-patch-submitted: server: "{server-name}" project: "{project}" diff --git a/jjb/policy/policy-csit-verify.yaml b/jjb/policy/policy-csit-verify.yaml index 6447b579b..0338f7484 100644 --- a/jjb/policy/policy-csit-verify.yaml +++ b/jjb/policy/policy-csit-verify.yaml @@ -126,15 +126,3 @@ branch: "newdelhi" functionality: - "clamp" - -- project: - name: policy-apex-pdp-postgres-project-csit-verify - jobs: - - "{project-name}-{stream}-project-csit-verify-{functionality}" - project-name: "policy-apex-pdp" - project: "policy/docker" - stream: - - "master": - branch: "master" - functionality: - - "apex-pdp-postgres" diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index d88070ab7..b85e97b09 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -134,16 +134,3 @@ branch: "newdelhi" functionality: - "clamp" - -- project: - name: policy-apex-pdp-postgres-project-csit - jobs: - - "{project-name}-{stream}-project-csit-{functionality}" - project-name: "policy-apex-pdp" - recipients: "jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com" - project: "policy/docker" - stream: - - "master": - branch: "master" - functionality: - - "apex-pdp-postgres" diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index f213926f6..b5ea48823 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -57,6 +57,26 @@ mvn-settings: "policy-distribution-settings" java-version: openjdk17 mvn-goals: "clean install" + cron: "@daily" + +- project: + name: policy-distribution-sonar-verify + jobs: + - gerrit-maven-sonar-verify + sonarcloud: true + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + build-node: ubuntu1804-docker-8c-8g + project: "policy/distribution" + project-name: "policy-distribution" + branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-distribution-settings" + mvn-goals: "clean install" + java-version: openjdk17 + sonarcloud-qualitygate-wait: true - project: name: policy-distribution-clm diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 7715beb30..552d627fc 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -58,6 +58,27 @@ java-version: openjdk17 java-opts: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" mvn-goals: "clean install" + cron: "@daily" + +- project: + name: policy-drools-applications-sonar-verify + jobs: + - gerrit-maven-sonar-verify + sonarcloud: true + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + build-node: ubuntu1804-docker-8c-8g + project: "policy/drools-applications" + project-name: "policy-drools-applications" + branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-drools-applications-settings" + mvn-goals: "clean install" + java-version: openjdk17 + java-opts: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" + sonarcloud-qualitygate-wait: true - project: name: policy-drools-applications-clm diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index fdded00de..46c9c8154 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -57,6 +57,26 @@ mvn-settings: "policy-drools-pdp-settings" java-version: openjdk17 mvn-goals: "clean install" + cron: "@daily" + +- project: + name: policy-drools-pdp-sonar-verify + jobs: + - gerrit-maven-sonar-verify + sonarcloud: true + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + build-node: ubuntu1804-docker-8c-8g + project: "policy/drools-pdp" + project-name: "policy-drools-pdp" + branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-drools-pdp-settings" + mvn-goals: "clean install" + java-version: openjdk17 + sonarcloud-qualitygate-wait: true - project: name: policy-drools-pdp-clm diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml deleted file mode 100644 index bbf1bddeb..000000000 --- a/jjb/policy/policy-gui.yaml +++ /dev/null @@ -1,76 +0,0 @@ ---- -- project: - name: policy-gui-java-17 - project-name: "policy-gui" - jobs: - - "{project-name}-{stream}-verify-java" - - "{project-name}-{stream}-merge-java": - docker-pom: "pom.xml" - mvn-params: "-P docker" - build-node: ubuntu1804-docker-8c-8g - - gerrit-maven-stage: - sbom-generator: true - sign-artifacts: true - build-node: centos8-docker-4c-4g - maven-versions-plugin: true - mvn-params: "-Dmaven.test.skip=true" - - gerrit-maven-docker-stage: - sbom-generator: true - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - 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-2c-1g - - project: "policy/gui" - stream: - - "master": - branch: "master" - - "montreal": - branch: "montreal" - - "newdelhi": - branch: "newdelhi" - mvn-version: "mvn36" - maven-version: "mvn36" - mvn-settings: "policy-gui-settings" - java-version: openjdk17 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-builder-4c-4g - -- project: - name: policy-gui-sonar - jobs: - - gerrit-maven-sonar-prescan-script - sonarcloud: true - sonarcloud-project-organization: "{sonarcloud_project_organization}" - sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" - sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: ubuntu1804-builder-4c-4g - project: "policy/gui" - project-name: "policy-gui" - branch: "master" - mvn-version: "mvn36" - maven-version: "mvn36" - mvn-settings: "policy-gui-settings" - java-version: openjdk17 - mvn-goals: "clean install" - sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - -- project: - name: policy-gui-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: "onap-" - project: policy/gui - project-name: "policy-gui" - stream: - - "master": - branch: "master" - mvn-version: "mvn36" - maven-version: "mvn36" - mvn-settings: "policy-gui-settings" - mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - java-version: openjdk17 diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index e795fb091..d0a1d3eb2 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -57,6 +57,26 @@ mvn-settings: "policy-models-settings" java-version: openjdk17 mvn-goals: "clean install" + cron: "@daily" + +- project: + name: policy-models-sonar-verify + jobs: + - gerrit-maven-sonar-verify + sonarcloud: true + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + build-node: ubuntu1804-docker-8c-8g + project: "policy/models" + project-name: "policy-models" + branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-models-settings" + mvn-goals: "clean install" + java-version: openjdk17 + sonarcloud-qualitygate-wait: true - project: name: policy-models-clm diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 8e0c2cb2d..8b129a9ca 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -57,6 +57,26 @@ mvn-settings: "policy-pap-settings" java-version: openjdk17 mvn-goals: "clean install" + cron: "@daily" + +- project: + name: policy-pap-sonar-verify + jobs: + - gerrit-maven-sonar-verify + sonarcloud: true + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + build-node: ubuntu1804-docker-8c-8g + project: "policy/pap" + project-name: "policy-pap" + branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-pap-settings" + mvn-goals: "clean install" + java-version: openjdk17 + sonarcloud-qualitygate-wait: true - project: name: policy-pap-clm diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 36c35b0af..fcc64d183 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -57,6 +57,26 @@ mvn-settings: "policy-xacml-pdp-settings" java-version: openjdk17 mvn-goals: "clean install" + cron: "@daily" + +- project: + name: policy-xacml-pdp-sonar-verify + jobs: + - gerrit-maven-sonar-verify + sonarcloud: true + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + build-node: ubuntu1804-docker-8c-8g + project: "policy/xacml-pdp" + project-name: "policy-xacml-pdp" + branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-xacml-pdp-settings" + mvn-goals: "clean install" + java-version: openjdk17 + sonarcloud-qualitygate-wait: true - project: name: policy-xacml-pdp-clm diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 856ddc7b4..6f725453a 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -81,6 +81,8 @@ project: "sdnc/apps" stream: + - "newdelhi": + branch: "newdelhi" - "master": branch: "master" java-version: openjdk17 diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index 571cbb756..98058d94d 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -15,6 +15,8 @@ stream: - "master": branch: "master" + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" mvn-settings: "sdnc-oam-settings" diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 479fed277..ce481bab5 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -15,6 +15,8 @@ project: "sdnc/northbound" stream: + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" java-version: openjdk17 diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 7f8f48ee3..ae52fd75c 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -23,6 +23,8 @@ build-node: centos7-docker-2c-1g project: "sdnc/oam" stream: + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" java-version: openjdk17 diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 4acef672f..1d5cd9791 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -36,10 +36,10 @@ - "java17": branch: "java17" java-version: openjdk17 - gerrit-maven-stage: - build-node: centos8-docker-8c-8g - gerrit-maven-docker-stage: - build-node: centos8-docker-8c-8g + build-node: centos8-docker-8c-8g + # Define maven version for both ONAP and global-jjb jobs + maven-version: mvn38 + mvn-version: mvn38 mvn-settings: "so-settings" files: "**" archive-artifacts: "" diff --git a/jjb/vvp/pre-build-csv.sh b/jjb/vvp/pre-build-csv.sh deleted file mode 100644 index f17b3db3c..000000000 --- a/jjb/vvp/pre-build-csv.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -python3 -m venv $WORKSPACE/venv-tox -source $WORKSPACE/venv-tox/bin/activate -pip3 install --upgrade pip -pip3 install --no-use-pep517 -r requirements.txt -ls -wget -O $WORKSPACE/ice_validator/heat_requirements.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json" && echo "Copied newest needs." || exit 1 -cd ice_validator/ -pytest --self-test tests/
\ No newline at end of file diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml deleted file mode 100644 index 8287c4811..000000000 --- a/jjb/vvp/vvp-test-engine.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- project: - name: vvp-test-engine-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: "{sonarcloud_project_organization}" - sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" - sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: ubuntu1804-docker-8c-8g - project: "vvp/test-engine" - project-name: "vvp-test-engine" - branch: "master" - mvn-settings: "vvp-test-engine-settings" - mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - -- project: - name: vvp-test-engine-verify - project-name: "vvp-test-engine" - project: "vvp/test-engine" - stream: - - "master": - branch: "master" - mvn-settings: "vvp-test-engine-settings" - build-node: "centos8-builder-4c-4g" - subproject: - - "onap-client": - path: "onap-client" - pattern: "onap-client/**" - jobs: - - "{project-name}-{stream}-{subproject}-verify-python" diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml deleted file mode 100644 index 4e7f45f5d..000000000 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ /dev/null @@ -1,55 +0,0 @@ ---- -- project: - name: vvp-validation-scripts - project-name: "vvp-validation-scripts" - project: "vvp/validation-scripts" - stream: - - "master": - branch: "master" - subproject: - - validation-scripts: - path: "." - pattern: "**" - mvn-settings: "vvp-validation-scripts-settings" - build-node: ubuntu1804-docker-8c-8g - jobs: - - "{project-name}-{stream}-{subproject}-verify-python" - - "{project-name}-{stream}-docker-java-daily": - mvn-params: "-Dmaven.test.skip=true" - - "{project-name}-gerrit-release-jobs": - build-node: centos7-docker-2c-1g - docker-pom: "pom.xml" - mvn-profile: "default" - -- project: - name: vvp-validation-scripts-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: "{sonarcloud_project_organization}" - sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" - sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: ubuntu1804-docker-8c-8g - project: "vvp/validation-scripts" - project-name: "vvp-validation-scripts" - branch: "master" - mvn-settings: "vvp-validation-scripts-settings" - mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - -- project: - name: vvp-validation-scripts-tracability-matrix - project: "vvp/validation-scripts" - project-name: "vvp-validation-scripts" - build-node: ubuntu1804-docker-8c-8g - mvn-settings: "vvp-validation-scripts-settings" - mvn-global-settings: "global-settings" - stream: - - "master": - branch: "master" - jobs: - - "{project-name}-{stream}-build-and-upload": - pre_script: !include-raw-escape: pre-build-csv.sh - artifact_name: traceability.csv rst.csv - project_id: org.onap.vvp.validation-scripts - post_script: !include-raw-escape: ../vnfrqts/post-upload-artifact.sh |