diff options
Diffstat (limited to 'jjb/dcaegen2')
41 files changed, 425 insertions, 149 deletions
diff --git a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml index c98abc9ee..9d76d41cf 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml @@ -4,5 +4,6 @@ project-name: dcaegen2-analytics-flink jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/analytics/flink branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml index f5d60d892..7dba3af45 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml @@ -48,5 +48,6 @@ project-name: dcaegen2-analytics-pnda jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/analytics/pnda branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 2a4ef2953..c3b7ed121 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -55,5 +55,6 @@ project-name: dcaegen2-analytics-tca-gen2 jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/analytics/tca-gen2 branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml index 1ba7b1599..21f605f78 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml @@ -57,5 +57,6 @@ project-name: dcaegen2-analytics-tca jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/analytics/tca branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml index 452bd56fe..80ac689d1 100644 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -4,5 +4,6 @@ project-name: dcaegen2-analytics jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/analytics branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index ad771b773..89eb6b676 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -62,5 +62,6 @@ project-name: dcaegen2-collectors-datafile jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/collectors/datafile branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index e2d63007f..ab4e9f575 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -6,6 +6,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'elalto': branch: 'elalto' # apply to all jobs @@ -36,6 +37,7 @@ - project: name: dcaegen2-collectors-hv-ves-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -45,10 +47,12 @@ build-node: ubuntu1604-docker-8c-8g mvn-settings: 'dcaegen2-collectors-hv-ves-settings' + - project: name: dcaegen2-collectors-hv-ves-info project-name: dcaegen2-collectors-hv-ves jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/collectors/hv-ves branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 189de7a32..90f26ef2d 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -60,5 +60,6 @@ project-name: dcaegen2-collectors-restconf jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/collectors/restconf branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 0ef35e629..02be8dd17 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -50,5 +50,6 @@ project-name: dcaegen2-collectors-snmptrap jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/collectors/snmptrap branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index fc12da490..d507433d8 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -34,6 +34,7 @@ - project: name: dcaegen2-collectors-ves-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar cron: '@daily' @@ -61,5 +62,6 @@ project-name: dcaegen2-collectors-ves jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/collectors/ves branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml index 35e25921a..b695e9ea8 100644 --- a/jjb/dcaegen2/dcaegen2-collectors.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors.yaml @@ -4,5 +4,6 @@ project-name: dcaegen2-collectors jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/collectors branch: master diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index cb0f944a3..b707826d8 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -6,7 +6,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dcaegen2/deployments' stream: - 'master': @@ -40,5 +41,6 @@ project-name: dcaegen2-deployments jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/deployments branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-adapter.yaml b/jjb/dcaegen2/dcaegen2-platform-adapter.yaml index bb0a9f73b..a203a7577 100644 --- a/jjb/dcaegen2/dcaegen2-platform-adapter.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-adapter.yaml @@ -32,8 +32,10 @@ name: dcaegen2-platform-aoadapter # root of docker build docker-root: adapter/acumos + # tag override + docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh # image name - docker-name: '{name}' + docker-name: 'onap/{name}' stream: - master: branch: master @@ -58,3 +60,15 @@ jobs: - gerrit-tox-sonar cron: '@daily' + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-aoadapter-clm + docker-root: adapter/acumos + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project-name: 'dcaegen2-platform-aoadapter-clm' + mvn-params: '-f adapter/acumos/pom.xml' + branch: 'master' + diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index 2f500630c..c00ded660 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -39,5 +39,6 @@ project-name: dcaegen2-platform-blueprints jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/platform/blueprints branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml deleted file mode 100644 index 613ef12d3..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -- project: - name: dcaegen2-platform-cli - project-name: 'dcaegen2-platform-cli' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'dcaegen2/platform/cli' - stream: - - 'master': - branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'dcaegen2-platform-cli-settings' - # due to a strange macro / variable translation problem this needs - # to be passed as a string block to properly get the properties - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' - -- project: - name: dcaegen2-platform-cli-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'dcaegen2/platform/cli' - project-name: 'dcaegen2-platform-cli' - branch: 'master' - mvn-settings: 'dcaegen2-platform-cli-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-platform-cli-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dcaegen2/platform/cli - build-node: ubuntu1604-docker-8c-8g - project-name: 'dcaegen2-platform-cli' - branch: 'master' - mvn-settings: 'dcaegen2-platform-cli-settings' - -- project: - name: dcaegen2-platform-cli-info - project-name: dcaegen2-platform-cli - jobs: - - gerrit-info-yaml-verify - project: dcaegen2/platform/cli - branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index 7b89b1aae..670b71de8 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -52,3 +52,4 @@ branch: master jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 3851bb6fc..68d4f96a4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -6,7 +6,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dcaegen2/platform/deployment-handler' stream: - 'master': @@ -39,5 +40,6 @@ project-name: dcaegen2-platform-deployment-handler jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/platform/deployment-handler branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index 9b3a387fb..f1a67cdc1 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -62,5 +62,6 @@ project-name: dcaegen2-platform-inventory-api jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/platform/inventory-api branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml index 22a68a2a0..859badcdc 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml @@ -1,8 +1,8 @@ --- - project: - name: dcaegen2-platform-cli-bp-gen - project: 'dcaegen2/platform/cli' - project-name: 'dcaegen2-platform-cli' + name: dcaegen2-platform-mod-bpgenerator + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-mod' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' @@ -12,20 +12,18 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - version-properties-file: 'blueprint-generator/version.properties' - mvn-pom: 'blueprint-generator/pom.xml' - mvn-params: '-f blueprint-generator/pom.xml' - pattern: 'blueprint-generator/**' + version-properties-file: 'mod/bpgenerator/version.properties' + mvn-pom: 'mod/bpgenerator/pom.xml' + mvn-params: '-f mod/bpgenerator/pom.xml' + pattern: 'mod/bpgenerator/**' subproject: - - 'blueprint-gen': - pom: 'blueprint-generator/pom.xml' - pattern: 'blueprint-generator/**' + - 'bpgenerator': + pom: 'mod/bpgenerator/pom.xml' + pattern: 'mod/bpgenerator/**' stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'dcaegen2-platform-cli-settings' + mvn-settings: 'dcaegen2-platform-settings' maven-deploy-properties: | deployAtEnd=true files: '**' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml new file mode 100644 index 000000000..2402dd06c --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml @@ -0,0 +1,33 @@ +--- +- project: + name: dcaegen2-platform-mod-designtool + project-name: dcaegen2-platform-mod + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - designtool: + pom: 'mod/designtool/pom.xml' + pattern: 'mod/designtool/**' + stream: + - 'master': + branch: 'master' + mvn-settings: dcaegen2-platform-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g + + +- project: + name: dcaegen2-platform-mod-designtool-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: dcaegen2/platform + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-mod-designtool' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml new file mode 100644 index 000000000..1210edbdc --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml @@ -0,0 +1,45 @@ +--- +# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-mod-distributorapi + # root of docker build + docker-root: mod/distributorapi + # image name + docker-name: '{name}' + stream: + - master: + branch: master + jobs: + - '{project-name}-gerrit-docker-jobs' + +- project: + <<: *dcaegen2_platform_common + name: dcagen2-platform-mod-distributorapi-verify + docker-root: mod/distributorapi + stream: + - all: + branch: '*' + jobs: + - gerrit-tox-verify + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-mod-distributorapi-sonar + docker-root: mod/distributorapi + branch: master + jobs: + - gerrit-tox-sonar + cron: '@daily' + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-mod-distributorapi-clm + docker-root: mod/distributorapi + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project-name: 'dcaegen2-platform-mod-distributorapi-clm' + mvn-params: '-f mod/distributorapi/pom.xml' + branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml index e476fbfeb..d94cb2758 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -21,6 +21,20 @@ build-node: ubuntu1604-docker-8c-8g - project: + name: dcaegen2-platform-mod-genprocessor-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-mod-genprocessor' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f mod/genprocessor/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: name: dcaegen2-platform-mod-genprocessor-clm jobs: - gerrit-maven-clm @@ -31,3 +45,4 @@ mvn-params: '-f mod/genprocessor/pom.xml' branch: 'master' mvn-settings: 'dcaegen2-platform-settings' + diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml new file mode 100644 index 000000000..ca63a42cc --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml @@ -0,0 +1,45 @@ +--- +# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-mod-onboardingapi + # root of docker build + docker-root: mod/onboardingapi + # image name + docker-name: '{name}' + stream: + - master: + branch: master + jobs: + - '{project-name}-gerrit-docker-jobs' + +- project: + <<: *dcaegen2_platform_common + name: dcagen2-platform-mod-onboardingapi-verify + docker-root: mod/onboardingapi + stream: + - all: + branch: '*' + jobs: + - gerrit-tox-verify + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-mod-onboardingapi-sonar + docker-root: mod/onboardingapi + branch: master + jobs: + - gerrit-tox-sonar + cron: '@daily' + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-mod-onboardingapi-clm + docker-root: mod/onboardingapi + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project-name: 'dcaegen2-platform-mod-onboardingapi-clm' + mvn-params: '-f mod/onboardingapi/pom.xml' + branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod.yaml b/jjb/dcaegen2/dcaegen2-platform-mod.yaml new file mode 100644 index 000000000..1baf6c0a8 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod.yaml @@ -0,0 +1,8 @@ +--- + +- project: + name: dcaegen2-platform-mod-project-view + project-name: dcaegen2-platform-mod + views: + - project-view + diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml new file mode 100644 index 000000000..fa64115f6 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml @@ -0,0 +1,45 @@ +--- +# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-oti-event-handler + # root of docker build + docker-root: oti/event-handler + # image name + docker-name: '{name}' + stream: + - master: + branch: master + jobs: + - '{project-name}-gerrit-docker-jobs' + +- project: + <<: *dcaegen2_platform_common + name: dcagen2-platform-oti-event-handler-verify + docker-root: oti/event-handler + stream: + - all: + branch: '*' + jobs: + - gerrit-tox-verify + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-oti-event-handler-sonar + docker-root: oti/event-handler + branch: master + jobs: + - gerrit-tox-sonar + cron: '@daily' + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-oti-event-handler-clm + docker-root: oti/event-handler + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project-name: 'dcaegen2-platform-oti-event-handler-clm' + mvn-params: '-f oti/event-handler/pom.xml' + branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml new file mode 100644 index 000000000..d29517123 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml @@ -0,0 +1,80 @@ +--- +- project: + name: dcaegen2-platform-oti-event-proc + project-name: dcaegen2-platform-oti + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - eventproc: + pom: 'oti/event-proc/pom.xml' + pattern: 'oti/event-proc/**' + stream: + - 'master': + branch: 'master' + mvn-settings: dcaegen2-platform-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g + +- project: + name: dcaegen2-platform-oti-event-proc-release + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-oti-event-proc' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + version-properties-file: 'oti/event-proc/version.properties' + mvn-pom: 'oti/event-proc/pom.xml' + mvn-params: '-f oti/event-proc/pom.xml' + mvn-goals: 'clean deploy -Ddockerfile.skip -f oti/event-proc/pom.xml' + pattern: 'oti/event-proc/**' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-goals: 'clean package dockerfile:build dockerfile:push -f oti/event-proc/pom.xml' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + pattern: 'oti/event-proc/**' + + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-platform-oti-event-proc-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-oti-event-proc' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f oti/event-proc/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + + +- project: + name: dcaegen2-platform-oti-event-proc-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + build-node: ubuntu1604-docker-8c-8g + project: 'dcaegen2/platform' + project-name: dcaegen2-platform-oti-event-proc-clm + mvn-params: '-f oti/event-proc/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index ce9fb461c..5d57fd11e 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -52,5 +52,6 @@ project-name: dcaegen2-platform-plugins jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/platform/plugins branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index a93fd571b..7ceef5ecb 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -6,7 +6,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dcaegen2/platform/policy-handler' stream: - 'master': @@ -50,5 +51,6 @@ project-name: dcaegen2-platform-policy-handler jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/platform/policy-handler branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 2f0ec21c0..81c9b138d 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -50,5 +50,6 @@ project-name: dcaegen2-platform-servicechange-handler jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/platform/servicechange-handler branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index a07253ac6..fa8af0de3 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -4,5 +4,6 @@ project-name: dcaegen2-platform jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/platform branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 44f8155b0..81c70d15f 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -20,28 +20,28 @@ archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' -#- project: -# name: dcaegen2-services-datalake-handler-release -# project: 'dcaegen2/services' -# project-name: 'dcaegen2-services-datalake-handler' -# jobs: -# - gerrit-maven-stage: -# sign-artifacts: true -# build-node: centos7-builder-4c-4g -# maven-versions-plugin: true -# mvn-pom: 'components/datalake-handler/pom.xml' -# mvn-params: '-f components/datalake-handler/pom.xml' -# version-properties-file: 'components/datalake-handler/version.properties' -# pattern: 'components/datalake-handler/**' -# - gerrit-maven-docker-stage: -# build-node: ubuntu1604-docker-8c-8g -# mvn-goals: 'clean package docker:build -DpushImage -f components/datalake-handler/pom.xml' -# container-public-registry: 'nexus3.onap.org:10001' -# container-staging-registry: 'nexus3.onap.org:10003' -# pattern: 'components/datalake-handler/**' +- project: + name: dcaegen2-services-datalake-handler-release + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-datalake-handler' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'components/datalake-handler/pom.xml' + mvn-params: '-f components/datalake-handler/pom.xml' + version-properties-file: 'components/datalake-handler/version.properties' + pattern: 'components/datalake-handler/**' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/pom.xml' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + pattern: 'components/datalake-handler/**' stream: - 'master': - branch: 'master' + branch: 'master' mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index ff7f9ae73..b8ff328fe 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -50,5 +50,6 @@ project-name: dcaegen2-services-heartbeat jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/services/heartbeat branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index d2774a134..e82cf478b 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -59,5 +59,6 @@ project-name: dcaegen2-services-mapper jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/services/mapper branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index dc6eac1a3..0bde5de28 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -62,5 +62,6 @@ project-name: dcaegen2-services-pm-mapper jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/services/pm-mapper branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml index 7839270ee..7a845453f 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml @@ -1,75 +1,81 @@ --- +- dcaegen2_services_common: &dcaegen2_services_common + # values apply to all dcaegen2_services docker projects + name: dcaegen2-services-docker-common + project: dcaegen2/services + # maven settings file has docker credentials + mvn-settings: dcaegen2-services-settings + # use host network to clone from our gerrit + container-tag-method: latest + build-node: ubuntu1604-docker-8c-8g + # jenkins job name prefix + project-name: '{name}' + tox-dir: '{docker-root}' + # build only on relevant changes + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: '{docker-root}/.*' + - project: + <<: *dcaegen2_services_common + name: dcaegen2-services-pmsh + # root of docker build + docker-root: components/pm-subscription-handler + # tag override + # Following is dependent on merge https://gerrit.onap.org/r/#/c/ci-management/+/99313/ + # docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh' + # image name + docker-name: 'onap/{name}' + stream: + - master: + branch: master + jobs: + - gerrit-docker-verify + - gerrit-docker-merge + +- project: + <<: *dcaegen2_services_common + name: dcaegen2-services-pmsh-verify + docker-root: components/pm-subscription-handler + stream: + - all: + branch: '*' + jobs: + - gerrit-tox-verify + +- project: + <<: *dcaegen2_services_common + name: dcaegen2-services-pmsh-sonar + docker-root: components/pm-subscription-handler + branch: master + jobs: + - gerrit-tox-sonar + cron: '@daily' + +- project: + <<: *dcaegen2_services_common + docker-root: components/pm-subscription-handler name: dcaegen2-services-pmsh-release - project: dcaegen2/services project-name: dcaegen2-services-pmsh-release jobs: - - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g - maven-versions-plugin: true - version-properties-file: 'components/pm-subscription-handler/version.properties' - mvn-pom: 'components/pm-subscription-handler/pom.xml' - mvn-goals: 'clean deploy -f components/pm-subscription-handler/pom.xml' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - pattern: 'components/pm-subscription-handler/**' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g stream: - 'master': branch: master - mvn-settings: dcaegen2-services-settings maven-deploy-properties: | deployAtEnd=true files: '**' archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g - project: - name: dcaegen2-services-pmsh - project: dcaegen2/services - project-name: dcaegen2-services - tox-dir: components/pm-subscription-handler/ - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'components/pm-subscription-handler/**' - subproject: - - 'pmsh': - pom: 'components/pm-subscription-handler/pom.xml' - pattern: 'components/pm-subscription-handler/**' - mvn-settings: dcaegen2-services-settings - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g - # used by tox-install.sh to specify the interpreter used to install tox - python-version: python3 + <<: *dcaegen2_services_common + name: dcaegen2-services-pmsh-clm + docker-root: components/pm-subscription-handler jobs: - # clm and tox - - '{project-name}-python-jobs' - # build docker image - - '{project-name}-{stream}-{subproject}-merge-java' - stream: - - master: - branch: master - -- project: - name: dcaegen2-services-pmsh-sonar - python-version: python3 - tox-dir: components/pm-subscription-handler/ - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'components/pm-subscription-handler/**' - jobs: - - gerrit-tox-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: dcaegen2/services - project-name: dcaegen2-services-pmsh - branch: master - mvn-settings: dcaegen2-services-settings + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project-name: 'dcaegen2-services-pmsh-clm' mvn-params: '-f components/pm-subscription-handler/pom.xml' - mvn-goals: 'clean test' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index cb9130f59..4073a9fea 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -20,6 +20,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'elalto': branch: 'elalto' mvn-settings: 'dcaegen2-services-prh-settings' @@ -35,6 +36,7 @@ - gerrit-maven-sonar cron: '@daily' build-node: ubuntu1604-docker-8c-8g + java-version: openjdk11 project: 'dcaegen2/services/prh' project-name: 'dcaegen2-services-prh' branch: 'master' @@ -49,6 +51,7 @@ nexus-iq-namespace: 'onap-' project: dcaegen2/services/prh build-node: ubuntu1604-docker-8c-8g + java-version: openjdk11 project-name: 'dcaegen2-services-prh' branch: 'master' mvn-settings: 'dcaegen2-services-prh-settings' @@ -58,5 +61,6 @@ project-name: dcaegen2-services-prh jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/services/prh branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 5d3e2e28e..5cbb3213f 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -16,6 +16,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'elalto': branch: 'elalto' mvn-settings: 'dcaegen2-services-sdk-settings' @@ -27,6 +28,7 @@ - project: name: dcaegen2-services-sdk-integration-pairwise + java-version: openjdk11 jobs: - '{project-name}-{stream}-integration-pairwise': build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true" @@ -41,6 +43,7 @@ - project: name: dcaegen2-services-sdk-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar cron: '@daily' @@ -54,6 +57,7 @@ - project: name: dcaegen2-services-sdk-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -68,5 +72,6 @@ project-name: dcaegen2-services-sdk jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/services/sdk branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index 0f8dc19ef..99055a746 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -59,5 +59,6 @@ project-name: dcaegen2-services-son-handler jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/services/son-handler branch: master diff --git a/jjb/dcaegen2/dcaegen2-services.yaml b/jjb/dcaegen2/dcaegen2-services.yaml index 3b5179ec7..81bcd8a0e 100644 --- a/jjb/dcaegen2/dcaegen2-services.yaml +++ b/jjb/dcaegen2/dcaegen2-services.yaml @@ -4,5 +4,6 @@ project-name: dcaegen2-services jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/services branch: master diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 666b2177b..84fe787ed 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -52,6 +52,7 @@ project-name: dcaegen2-utils jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2/utils branch: master diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index c0c19f138..dd0b0ccb8 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -43,5 +43,6 @@ project-name: dcaegen2 jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: dcaegen2 branch: master |