diff options
Diffstat (limited to 'jjb/so')
| -rw-r--r-- | jjb/so/so-adapters-so-cnf-adapter.yaml | 20 | ||||
| -rw-r--r-- | jjb/so/so-adapters-so-etsi-sol003-adapter.yaml | 6 | ||||
| -rw-r--r-- | jjb/so/so-adapters-so-etsi-sol005-adapter.yaml | 21 | ||||
| -rw-r--r-- | jjb/so/so-adapters-so-nssmf-adapter.yaml | 6 | ||||
| -rw-r--r-- | jjb/so/so-adapters-so-oof-adapter.yaml | 20 | ||||
| -rw-r--r-- | jjb/so/so-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/so/so-libs.yaml | 5 | ||||
| -rw-r--r-- | jjb/so/so-so-admin-cockpit.yaml | 6 | ||||
| -rw-r--r-- | jjb/so/so-so-etsi-nfvo.yaml | 6 | ||||
| -rw-r--r-- | jjb/so/so.yaml | 6 |
10 files changed, 80 insertions, 18 deletions
diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml index ea3db2919..84ace63a0 100644 --- a/jjb/so/so-adapters-so-cnf-adapter.yaml +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-cnf-adapter-info project: so/adapters/so-cnf-adapter project-name: so-adapters-so-cnf-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' @@ -59,3 +61,17 @@ mvn-settings: 'so-adapters-so-cnf-adapter-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: so-adapters-so-cnf-adapter-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'so/adapters/so-cnf-adapter' + project-name: 'so-adapters-so-cnf-adapter' + build-node: ubuntu1804-docker-v1-8c-8g + stream: + - 'master': + branch: 'master' + mvn-settings: 'so-adapters-so-cnf-adapter-settings' diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml index a3f64f853..37ffeaca3 100644 --- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-etsi-sol003-adapter-info project: so/adapters/so-etsi-sol003-adapter project-name: so-adapters-so-etsi-sol003-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml index cb16d5c15..db9f91d8b 100644 --- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-etsi-sol005-adapter-info project: so/adapters/so-etsi-sol005-adapter project-name: so-adapters-so-etsi-sol005-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' @@ -59,3 +61,18 @@ mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + + +- project: + name: so-adapters-so-etsi-sol005-adapter-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'so/adapters/so-etsi-sol005-adapter' + project-name: 'so-adapters-so-etsi-sol005-adapter' + build-node: ubuntu1804-docker-v1-8c-8g + stream: + - 'master': + branch: 'master' + mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings' diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml index 6b14d6aa7..7a45cd93f 100644 --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-nssmf-adapter-info project: so/adapters/so-nssmf-adapter project-name: so-adapters-so-nssmf-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml index 5a37cf6b6..2f5ba19a5 100644 --- a/jjb/so/so-adapters-so-oof-adapter.yaml +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-oof-adapter-info project: so/adapters/so-oof-adapter project-name: so-adapters-so-oof-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' @@ -59,3 +61,17 @@ mvn-settings: 'so-adapters-so-oof-adapter-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: so-adapters-so-oof-adapter-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'so/adapters/so-oof-adapter' + project-name: 'so-adapters-so-oof-adapter' + build-node: ubuntu1804-docker-v1-8c-8g + stream: + - 'master': + branch: 'master' + mvn-settings: 'so-adapters-so-oof-adapter-settings' diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index 88896f94f..4eba714cb 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -19,4 +19,6 @@ trigger_jobs: - 'macroflow': trigger_jobs: + - 'integration-cnfm-testing': + trigger_jobs: robot-options: '' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 94cb8a2ce..2f5c9b0a1 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -6,8 +6,9 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -62,6 +63,6 @@ java-version: openjdk11 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: so/libs branch: master diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml index 0c268a57f..f33d94500 100644 --- a/jjb/so/so-so-admin-cockpit.yaml +++ b/jjb/so/so-so-admin-cockpit.yaml @@ -9,7 +9,7 @@ name: so-so-admin-cockpit-info project: so/so-admin-cockpit project-name: so-so-admin-cockpit - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml index 3d5a2f5c1..1ce164fbb 100644 --- a/jjb/so/so-so-etsi-nfvo.yaml +++ b/jjb/so/so-so-etsi-nfvo.yaml @@ -9,7 +9,7 @@ name: so-so-etsi-nfvo-info project: so/so-etsi-nfvo project-name: so-so-etsi-nfvo - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index cae94802b..3ded1b545 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -13,10 +13,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' @@ -111,7 +113,7 @@ java-version: openjdk11 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: so stream: - 'master': |