diff options
| -rw-r--r-- | jjb/cps/cps-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/cps/cps-ncmp-dmi-plugin-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/cps/cps-ncmp-dmi-plugin.yaml | 2 | ||||
| -rw-r--r-- | jjb/cps/cps.yaml | 2 | ||||
| -rw-r--r-- | jjb/policy/policy-apex-pdp.yaml | 37 | ||||
| -rw-r--r-- | jjb/policy/policy-api.yaml | 37 | ||||
| -rw-r--r-- | jjb/policy/policy-clamp.yaml | 38 | ||||
| -rw-r--r-- | jjb/policy/policy-common.yaml | 27 | ||||
| -rw-r--r-- | jjb/policy/policy-csit.yaml | 55 | ||||
| -rw-r--r-- | jjb/policy/policy-distribution.yaml | 37 | ||||
| -rw-r--r-- | jjb/policy/policy-docker-base-common.yaml | 33 | ||||
| -rw-r--r-- | jjb/policy/policy-drools-applications.yaml | 39 | ||||
| -rw-r--r-- | jjb/policy/policy-drools-pdp.yaml | 37 | ||||
| -rw-r--r-- | jjb/policy/policy-gui.yaml | 37 | ||||
| -rw-r--r-- | jjb/policy/policy-models.yaml | 37 | ||||
| -rw-r--r-- | jjb/policy/policy-pap.yaml | 37 | ||||
| -rw-r--r-- | jjb/policy/policy-parent.yaml | 27 | ||||
| -rw-r--r-- | jjb/policy/policy-xacml-pdp.yaml | 37 | ||||
| -rw-r--r-- | jjb/portal-ng/portal-ng-bff.yaml | 22 | ||||
| -rw-r--r-- | jjb/portal-ng/portal-ng-history.yaml | 15 | ||||
| -rw-r--r-- | jjb/portal-ng/portal-ng-preferences.yaml | 15 | ||||
| -rw-r--r-- | jjb/portal-ng/portal-ng-ui.yaml | 15 |
22 files changed, 103 insertions, 487 deletions
diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml index 118b94d25..e10494a0b 100644 --- a/jjb/cps/cps-csit.yaml +++ b/jjb/cps/cps-csit.yaml @@ -42,6 +42,8 @@ stream: - "master": branch: "master" + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" mvn-settings: "cps-settings" diff --git a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml index c9238f6cb..9c18c5255 100644 --- a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml +++ b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml @@ -39,6 +39,8 @@ stream: - "master": branch: "master" + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" mvn-settings: "cps-ncmp-dmi-plugin-settings" diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml index 2895b2a2b..57af7f292 100644 --- a/jjb/cps/cps-ncmp-dmi-plugin.yaml +++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml @@ -34,6 +34,8 @@ stream: - "master": branch: master + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" cron: "" diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index 629d4463f..401d5487b 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -82,6 +82,8 @@ stream: - "master": branch: "master" + - "newdelhi": + branch: "newdelhi" - "montreal": branch: "montreal" mvn-settings: "cps-settings" diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 62b6ed76b..c512064ee 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -36,6 +36,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" mvn-version: "mvn36" maven-version: "mvn36" mvn-settings: "policy-apex-pdp-settings" @@ -45,41 +47,6 @@ build-node: ubuntu1804-docker-8c-8g - project: - name: policy-apex-pdp - project-name: "policy-apex-pdp" - jobs: - - "{project-name}-{stream}-verify-java" - - "{project-name}-{stream}-merge-java": - docker-pom: "pom.xml" - mvn-profile: "docker" - mvn-params: "-P docker" - - 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/apex-pdp" - stream: - - "london": - branch: "london" - mvn-settings: "policy-apex-pdp-settings" - java-version: openjdk11 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-docker-8c-8g - -- project: name: policy-apex-pdp-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index a1a6c15f2..482bbf0a0 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -30,6 +30,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" mvn-version: "mvn36" maven-version: "mvn36" mvn-settings: "policy-api-settings" @@ -39,41 +41,6 @@ build-node: ubuntu1804-builder-4c-4g - project: - name: policy-api-java11 - project-name: "policy-api" - 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/api" - stream: - - "london": - branch: "london" - mvn-settings: "policy-api-settings" - java-version: openjdk11 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-builder-4c-4g - -- project: name: policy-api-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml index b4d885c8b..a55c78aee 100644 --- a/jjb/policy/policy-clamp.yaml +++ b/jjb/policy/policy-clamp.yaml @@ -30,6 +30,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" mvn-version: "mvn36" maven-version: "mvn36" mvn-settings: "policy-clamp-settings" @@ -39,42 +41,6 @@ build-node: ubuntu1804-docker-8c-8g - project: - name: policy-clamp-java11 - project-name: "policy-clamp" - jobs: - - gerrit-maven-stage: - build-node: centos8-docker-8c-8g - sbom-generator: true - maven-versions-plugin: true - sign-artifacts: true - mvn-params: "-Dmaven.test.skip=true" - - gerrit-maven-docker-stage: - sbom-generator: true - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - container-public-registry: "nexus3.onap.org:10001" - container-staging-registry: "nexus3.onap.org:10003" - mvn-params: "-Dmaven.test.skip=true -P docker" - - "{project-name}-{stream}-verify-java": - mvn-params: "-P docker" - build-node: ubuntu1804-docker-8c-16g - - "{project-name}-{stream}-merge-java": - build-node: ubuntu1804-docker-8c-16g - mvn-params: "-P docker" - - "{project-name}-gerrit-release-jobs": - build-node: centos7-docker-2c-1g - - project: "policy/clamp" - stream: - - "london": - branch: "london" - mvn-settings: "policy-clamp-settings" - java-version: openjdk11 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-docker-8c-8g - -- project: name: policy-clamp-sonar jobs: - gerrit-maven-sonar: diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index e9edb0239..d4cde4e35 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -20,6 +20,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" mvn-version: "mvn36" maven-version: "mvn36" mvn-settings: "policy-common-settings" @@ -29,31 +31,6 @@ build-node: ubuntu1804-builder-4c-4g - project: - name: policy-common-java11 - project-name: "policy-common" - jobs: - - "{project-name}-{stream}-verify-java" - - "{project-name}-{stream}-merge-java" - - 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" - - "{project-name}-gerrit-release-jobs": - build-node: centos7-docker-2c-1g - - project: "policy/common" - stream: - - "london": - branch: "london" - mvn-settings: "policy-common-settings" - java-version: openjdk11 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-builder-4c-4g - -- project: name: policy-common-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index 774cd1ef7..050fd64cb 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -10,15 +10,14 @@ stream: - "master": branch: "master" - - "london": - branch: "london" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" functionality: - "distribution" trigger_jobs: - - "policy-distribution-{stream}-merge-java" - - "policy-docker-{stream}-merge-java" + - "policy-distribution-{stream}-verify-java" - project: name: policy-xacml-pdp-project-csit @@ -31,15 +30,14 @@ stream: - "master": branch: "master" - - "london": - branch: "london" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" functionality: - "xacml-pdp" trigger_jobs: - - "policy-xacml-pdp-{stream}-merge-java" - - "policy-docker-{stream}-merge-java" + - "policy-xacml-pdp-{stream}-verify-java" - project: name: policy-drools-applications-project-csit @@ -52,15 +50,14 @@ stream: - "master": branch: "master" - - "london": - branch: "london" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" functionality: - "drools-applications" trigger_jobs: - - "policy-drools-applications-{stream}-merge-java" - - "policy-docker-{stream}-merge-java" + - "policy-drools-applications-{stream}-verify-java" - project: name: policy-drools-pdp-project-csit @@ -73,15 +70,14 @@ stream: - "master": branch: "master" - - "london": - branch: "london" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" functionality: - "drools-pdp" trigger_jobs: - - "policy-drools-pdp-{stream}-merge-java" - - "policy-docker-{stream}-merge-java" + - "policy-drools-pdp-{stream}-verify-java" - project: name: policy-apex-pdp-project-csit @@ -94,15 +90,14 @@ stream: - "master": branch: "master" - - "london": - branch: "london" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" functionality: - "apex-pdp" trigger_jobs: - - "policy-apex-pdp-{stream}-merge-java" - - "policy-docker-{stream}-merge-java" + - "policy-apex-pdp-{stream}-verify-java" - project: name: policy-pap-project-csit @@ -115,15 +110,14 @@ stream: - "master": branch: "master" - - "london": - branch: "london" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" functionality: - "pap" trigger_jobs: - - "policy-pap-{stream}-merge-java" - - "policy-docker-{stream}-merge-java" + - "policy-pap-{stream}-verify-java" - project: name: policy-api-project-csit @@ -136,15 +130,14 @@ stream: - "master": branch: "master" - - "london": - branch: "london" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" functionality: - "api" trigger_jobs: - - "policy-api-{stream}-merge-java" - - "policy-docker-{stream}-merge-java" + - "policy-api-{stream}-verify-java" - project: name: policy-clamp-project-csit @@ -159,11 +152,12 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" functionality: - "clamp" trigger_jobs: - "policy-clamp-{stream}-merge-java" - - "policy-docker-{stream}-merge-java" - project: name: policy-apex-pdp-postgres-project-csit @@ -179,5 +173,4 @@ functionality: - "apex-pdp-postgres" trigger_jobs: - - "policy-apex-pdp-{stream}-merge-java" - - "policy-docker-{stream}-merge-java" + - "policy-apex-pdp-{stream}-verify-java" diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 965d16f3c..f213926f6 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -30,6 +30,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" mvn-version: "mvn36" maven-version: "mvn36" mvn-settings: "policy-distribution-settings" @@ -39,41 +41,6 @@ build-node: ubuntu1804-builder-4c-4g - project: - name: policy-distribution-java11 - project-name: "policy-distribution" - 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/distribution" - stream: - - "london": - branch: "london" - mvn-settings: "policy-distribution-settings" - java-version: openjdk11 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-builder-4c-4g - -- project: name: policy-distribution-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index 7e06a4027..54b81f3ca 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -1,36 +1,5 @@ --- - project: - name: policy-docker-base-common - project-name: "policy-docker" - jobs: - - "{project-name}-{stream}-verify-java" - - "{project-name}-{stream}-merge-java": - docker-pom: "pom.xml" - mvn-profile: "docker" - mvn-params: "-P docker" - build-node: ubuntu1804-docker-8c-8g - - 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 - mvn-settings: "policy-docker-settings" - mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" - java-version: openjdk11 - - project: "policy/docker" - stream: - - "london": - branch: "london" - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-builder-4c-4g - -- project: name: policy-docker-base-common-java-17 project-name: "policy-docker" jobs: @@ -61,6 +30,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" files: "**" archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 6e19128c2..7715beb30 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -1,42 +1,5 @@ --- - project: - name: policy-drools-applications - project-name: "policy-drools-applications" - jobs: - - "{project-name}-{stream}-verify-java" - - "{project-name}-{stream}-merge-java": - docker-pom: "pom.xml" - mvn-profile: "docker" - mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" - - 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/drools-applications" - stream: - - "london": - branch: "london" - mvn-settings: "policy-drools-applications-settings" - mvn-version: "mvn36" - maven-version: "mvn36" - java-version: openjdk11 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-docker-8c-8g - -- project: name: policy-drools-applications-java-17 project-name: "policy-drools-applications" jobs: @@ -67,6 +30,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" mvn-settings: "policy-drools-applications-settings" mvn-version: "mvn36" maven-version: "mvn36" diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 14a992180..fdded00de 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -1,40 +1,5 @@ --- - project: - name: policy-drools-pdp - project-name: "policy-drools-pdp" - jobs: - - "{project-name}-{stream}-verify-java" - - "{project-name}-{stream}-merge-java": - docker-pom: "pom.xml" - mvn-profile: "docker" - mvn-params: "-P docker" - - 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/drools-pdp" - stream: - - "london": - branch: "london" - mvn-settings: "policy-drools-pdp-settings" - java-version: openjdk11 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-docker-8c-8g - -- project: name: policy-drools-pdp-java-17 project-name: "policy-drools-pdp" jobs: @@ -65,6 +30,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" mvn-version: "mvn36" maven-version: "mvn36" mvn-settings: "policy-drools-pdp-settings" diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index 22675c1d9..bbf1bddeb 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -1,40 +1,5 @@ --- - project: - name: policy-gui - 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: - - "london": - branch: "london" - mvn-settings: "policy-gui-settings" - java-version: openjdk11 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-builder-4c-4g - -- project: name: policy-gui-java-17 project-name: "policy-gui" jobs: @@ -65,6 +30,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" mvn-version: "mvn36" maven-version: "mvn36" mvn-settings: "policy-gui-settings" diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index c84ce415e..e795fb091 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -30,6 +30,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" mvn-version: "mvn36" maven-version: "mvn36" mvn-settings: "policy-models-settings" @@ -39,41 +41,6 @@ build-node: ubuntu1804-builder-4c-4g - project: - name: policy-models-java11 - project-name: "policy-models" - 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/models" - stream: - - "london": - branch: "london" - mvn-settings: "policy-models-settings" - java-version: openjdk11 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-builder-4c-4g - -- project: name: policy-models-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index a62ae1c25..8e0c2cb2d 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -30,6 +30,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" mvn-version: "mvn36" maven-version: "mvn36" mvn-settings: "policy-pap-settings" @@ -39,41 +41,6 @@ build-node: ubuntu1804-builder-4c-4g - project: - name: policy-pap-java11 - project-name: "policy-pap" - 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/pap" - stream: - - "london": - branch: "london" - mvn-settings: "policy-pap-settings" - java-version: openjdk11 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-builder-4c-4g - -- project: name: policy-pap-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index d20db0336..b8d86c9bd 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -20,6 +20,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" mvn-version: "mvn36" maven-version: "mvn36" mvn-settings: "policy-parent-settings" @@ -29,31 +31,6 @@ build-node: ubuntu1804-builder-4c-4g - project: - name: policy-parent-java11 - project-name: "policy-parent" - jobs: - - "{project-name}-{stream}-verify-java" - - "{project-name}-{stream}-merge-java" - - 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" - - "{project-name}-gerrit-release-jobs": - build-node: centos7-docker-2c-1g - - project: "policy/parent" - stream: - - "london": - branch: "london" - mvn-settings: "policy-parent-settings" - java-version: openjdk11 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-builder-4c-4g - -- project: name: policy-parent-clm jobs: - gerrit-maven-clm diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 4f25778d9..36c35b0af 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -1,40 +1,5 @@ --- - project: - name: policy-xacml-pdp - project-name: "policy-xacml-pdp" - 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/xacml-pdp" - stream: - - "london": - branch: "london" - mvn-settings: "policy-xacml-pdp-settings" - java-version: openjdk11 - files: "**" - archive-artifacts: "" - build-node: ubuntu1804-builder-4c-4g - -- project: name: policy-xacml-pdp-java-17 project-name: "policy-xacml-pdp" jobs: @@ -65,6 +30,8 @@ branch: "master" - "montreal": branch: "montreal" + - "newdelhi": + branch: "newdelhi" mvn-version: "mvn36" maven-version: "mvn36" mvn-settings: "policy-xacml-pdp-settings" diff --git a/jjb/portal-ng/portal-ng-bff.yaml b/jjb/portal-ng/portal-ng-bff.yaml index 830652071..2e62e73a5 100644 --- a/jjb/portal-ng/portal-ng-bff.yaml +++ b/jjb/portal-ng/portal-ng-bff.yaml @@ -49,28 +49,6 @@ mvn-settings: "portal-ng-bff-settings" - project: - name: portal-ng-bff-stage-release - project-name: "portal-ng-bff" - project: "portal-ng/bff" - branch: "master" - build-node: centos7-docker-2c-1g - docker-name: "onap/portal-ng/bff" - container-tag-method: latest - jobs: - - "gerrit-maven-docker-stage": - sign-artifacts: true - build-node: centos8-docker-8c-8g - maven-versions-plugin: true - # yamllint disable-line rule:line-length - mvn-params: "-Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003" - container-public-registry: "nexus3.onap.org:10001" - container-staging-registry: "nexus3.onap.org:10003" - stream: - - "master": - branch: "master" - mvn-settings: "portal-ng-bff-settings" - -- project: name: portal-ng-bff-release project-name: "portal-ng-bff" project: "portal-ng/bff" diff --git a/jjb/portal-ng/portal-ng-history.yaml b/jjb/portal-ng/portal-ng-history.yaml index e35493fb7..9bab5a232 100644 --- a/jjb/portal-ng/portal-ng-history.yaml +++ b/jjb/portal-ng/portal-ng-history.yaml @@ -33,3 +33,18 @@ - "master": branch: "master" mvn-settings: "portal-ng-history-settings" + +- project: + name: portal-ng-history-release + project-name: "portal-ng-history" + project: "portal-ng/history" + branch: "master" + build-node: centos7-docker-2c-1g + docker-name: "onap/portal-ng/history" + container-tag-method: latest + jobs: + - "{project-name}-gerrit-release-jobs" + stream: + - "master": + branch: "master" + mvn-settings: "portal-ng-history-settings" diff --git a/jjb/portal-ng/portal-ng-preferences.yaml b/jjb/portal-ng/portal-ng-preferences.yaml index 2f55b2389..ff2e2921d 100644 --- a/jjb/portal-ng/portal-ng-preferences.yaml +++ b/jjb/portal-ng/portal-ng-preferences.yaml @@ -33,3 +33,18 @@ - "master": branch: "master" mvn-settings: "portal-ng-preferences-settings" + +- project: + name: portal-ng-preferences-release + project-name: "portal-ng-preferences" + project: "portal-ng/preferences" + branch: "master" + build-node: centos7-docker-2c-1g + docker-name: "onap/portal-ng/preferences" + container-tag-method: latest + jobs: + - "{project-name}-gerrit-release-jobs" + stream: + - "master": + branch: "master" + mvn-settings: "portal-ng-preferences-settings" diff --git a/jjb/portal-ng/portal-ng-ui.yaml b/jjb/portal-ng/portal-ng-ui.yaml index 48ea3296b..d4e8ced59 100644 --- a/jjb/portal-ng/portal-ng-ui.yaml +++ b/jjb/portal-ng/portal-ng-ui.yaml @@ -19,3 +19,18 @@ - "master": branch: "master" mvn-settings: "portal-ng-ui-settings" + +- project: + name: portal-ng-ui-release + project-name: "portal-ng-ui" + project: "portal-ng/ui" + branch: "master" + build-node: centos7-docker-2c-1g + docker-name: "onap/portal-ng/ui" + container-tag-method: latest + jobs: + - "{project-name}-gerrit-release-jobs" + stream: + - "master": + branch: "master" + mvn-settings: "portal-ng-ui-settings" |