From: Bengt Thuree Date: Tue, 7 Jan 2020 05:41:54 +0000 (+0000) Subject: Merge "Add releasedockerhub command to cron" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c6b11dc42240cd9ce760a07465721a90e7856368;hp=8957be512fa94e58f4e1942726025f5daa979c90;p=ci-management.git Merge "Add releasedockerhub command to cron" --- diff --git a/global-jjb b/global-jjb index aee2dcb2b..a2cfbc66e 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit aee2dcb2ba92589124fbdfd9cd48cb29529063da +Subproject commit a2cfbc66e675655ed0fb7d76862fdc044d96678d diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml deleted file mode 100644 index 4b100749a..000000000 --- a/jjb/aai/aai-chameleon.yaml +++ /dev/null @@ -1,54 +0,0 @@ ---- -- project: - name: aai-chameleon-project-view - project-name: aai-chameleon - views: - - project-view - -- project: - name: aai-chameleon - project-name: 'aai-chameleon' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - mvn-params: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - build-node: ubuntu1604-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'aai/chameleon' - stream: - - 'elalto': - branch: 'elalto' - - 'master': - branch: 'master' - mvn-settings: 'aai-chameleon-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: - name: aai-chameleon-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/chameleon' - project-name: 'aai-chameleon' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-chameleon-settings' - -- project: - name: aai-chameleon-info - project-name: aai-chameleon - jobs: - - gerrit-info-yaml-verify - project: aai/chameleon - branch: master diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml deleted file mode 100644 index cbce3ed9b..000000000 --- a/jjb/aai/aai-gallifrey.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- project: - name: aai-gallifrey - project-name: 'aai-gallifrey' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - mvn-params: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - build-node: ubuntu1604-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'aai/gallifrey' - stream: - - 'elalto': - branch: 'elalto' - - 'master': - branch: 'master' - mvn-settings: 'aai-gallifrey-settings' - files: '**' - archive-artifacts: '' - -- project: - name: aai-gallifrey-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/gallifrey' - project-name: 'aai-gallifrey' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-gallifrey-settings' - -- project: - name: aai-gallifrey-info - project-name: aai-gallifrey - jobs: - - gerrit-info-yaml-verify - project: aai/gallifrey - branch: master diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 6e690fa51..c69c670e0 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -9,11 +9,13 @@ name: ccsdk-apps project-name: 'ccsdk-apps' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -39,6 +41,8 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-apps-sonar diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index ea3d2915b..410485950 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -3,12 +3,14 @@ name: ccsdk-cds project-name: 'ccsdk-cds' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true maven-versions-plugin: true + cron: '' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -16,6 +18,7 @@ mvn-params: '-Dmaven.test.skip=true -P docker' maven-version: "mvn35" maven-versions-plugin: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -35,6 +38,8 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-cds-sonar diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 298afa2fe..727b6eef2 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -3,10 +3,12 @@ name: ccsdk-dashboard project-name: 'ccsdk-dashboard' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -25,6 +27,8 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-dashboard-sonar diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 104ebc476..aea76c6f1 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -3,12 +3,14 @@ name: ccsdk-distribution project-name: 'ccsdk-distribution' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true maven-versions-plugin: true + cron: '' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -16,6 +18,7 @@ mvn-params: '-Dmaven.test.skip=true -P docker' maven-version: "mvn35" maven-versions-plugin: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g project: 'ccsdk/distribution' @@ -33,6 +36,8 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-docker-8c-8g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' #- project: diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index a5df9d0af..90837d7d1 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -3,11 +3,13 @@ name: ccsdk-features project-name: 'ccsdk-features' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -28,8 +30,10 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-features-sonar diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index e344e88ef..3dcb72965 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -3,11 +3,13 @@ name: ccsdk-platform-plugins project-name: 'ccsdk-platform-plugins' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -26,6 +28,8 @@ files: '**' archive-artifacts: '' build-node: centos7-redis-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-platform-plugins-sonar diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 23480cf27..343051609 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -3,11 +3,13 @@ name: ccsdk-sli-adaptors project-name: 'ccsdk-sli-adaptors' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -29,6 +31,8 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-sli-adaptors-sonar diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 9f41d4ca7..868151aa9 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -3,11 +3,13 @@ name: ccsdk-sli-core project-name: 'ccsdk-sli-core' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -29,6 +31,8 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-sli-core-sonar diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 99116ceb5..73ea82386 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -3,10 +3,12 @@ name: ccsdk-sli-northbound project-name: 'ccsdk-sli-northbound' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -29,6 +31,8 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-sli-northbound-sonar diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index e4c7429bb..71ce51b60 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -3,11 +3,13 @@ name: ccsdk-sli-plugins project-name: 'ccsdk-sli-plugins' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -29,6 +31,8 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-sli-plugins-sonar diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 03350a881..7b49b60a9 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -3,11 +3,13 @@ name: ccsdk-utils project-name: 'ccsdk-utils' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -23,6 +25,8 @@ deployAtEnd=true files: '**' archive-artifacts: '' + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-utils-clm diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index 8b96a2af4..7d3fd7868 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -16,6 +16,7 @@ - centos-7 - ubuntu-16.04 - ubuntu-16.04-arm64 + - ubuntu-18.04 templates: builder - project: diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index c2f2d5f34..b3dae54ef 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -44,6 +44,11 @@ jobs: - gerrit-maven-sonar: mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-docker-8c-8g project: 'clamp' 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-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-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-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/demo/demo.yaml b/jjb/demo/demo.yaml index 49eea2892..fffa81d26 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -32,6 +32,11 @@ name: demo-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'demo' diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index a3f690b71..94cc44be8 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -9,6 +9,8 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dmaap/dbcapi' mvn-settings: 'dmaap-dbcapi-settings' diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index 4c69d4cca..47fcf39e6 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -67,6 +67,11 @@ name: externalapi-nbi-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'externalapi/nbi' diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml index 5a0eedd61..8f8e0947f 100644 --- a/jjb/integration/integration-csit.yaml +++ b/jjb/integration/integration-csit.yaml @@ -15,3 +15,11 @@ - 'vCPE': trigger_jobs: robot-options: '' + +- project: + name: integration-csit-info + project-name: integration-csit + jobs: + - gerrit-info-yaml-verify + project: integration/csit + branch: master diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index ec988621f..6a51fc5a3 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -54,6 +54,11 @@ name: msb-apigateway-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'msb/apigateway' diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 3e2fe170f..149238e1e 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -47,6 +47,11 @@ name: msb-discovery-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'msb/discovery' diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index 436719324..579f4635b 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -22,6 +22,11 @@ name: msb-java-sdk-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'msb/java-sdk' diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index 8e5a1ce67..09426a2a9 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -22,6 +22,11 @@ name: msb-swagger-sdk-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'msb/swagger-sdk' diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index 7ac4fca90..b8bf8a1a4 100644 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ b/jjb/multicloud/multicloud-azure-java.yaml @@ -57,6 +57,11 @@ name: multicloud-azure-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/azure' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 388f94c30..d5e24d205 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -62,6 +62,11 @@ name: multicloud-framework-multivimbroker-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/framework' @@ -87,6 +92,11 @@ name: multicloud-framework-artifactbroker-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/framework' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index c29787214..205d374a1 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -59,6 +59,11 @@ name: multicloud-openstack-vmware-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack/vmware' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index da9605fe6..eefdc7721 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -96,6 +96,11 @@ name: multicloud-openstack-windriver-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack' @@ -110,6 +115,11 @@ name: multicloud-openstack-pike-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack' @@ -124,6 +134,11 @@ name: multicloud-openstack-starlingx-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack' @@ -149,6 +164,11 @@ name: multicloud-openstack-fcaps-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack' @@ -163,6 +183,11 @@ # name: multicloud-openstack-lenovo-sonar # jobs: # - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" # cron: '@daily' # build-node: ubuntu1604-builder-4c-4g # project: 'multicloud/openstack' diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 9262dd6c7..67d3474dd 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -31,8 +31,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-apex-pdp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index ac1ef4089..538f1170d 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-api-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 60e077121..ec7d7834d 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -16,9 +16,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-common-settings' + java-version: openjdk11 files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g @@ -38,6 +37,7 @@ project-name: 'policy-common' branch: 'master' mvn-settings: 'policy-common-settings' + java-version: openjdk11 mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -50,6 +50,7 @@ project-name: 'policy-common' branch: 'master' mvn-settings: 'policy-common-settings' + java-version: openjdk11 - project: name: policy-common-info diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index d04ec6fd1..c4ae3aa24 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-distribution-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 2274fe5fb..905958d69 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-drools-applications-settings' files: '**' archive-artifacts: '' @@ -59,6 +57,7 @@ project-name: 'policy-drools-applications' branch: 'master' mvn-settings: 'policy-drools-applications-settings' + build-node: ubuntu1604-docker-8c-8g - project: name: policy-drools-applications-info diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 1d38b6960..93002e186 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-drools-pdp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index bacfce4d7..d1d113e16 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-engine-settings' files: '**' archive-artifacts: '' @@ -48,7 +46,7 @@ branch: 'master' mvn-settings: 'policy-engine-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' - project: name: policy-engine-clm diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 3d811b754..1325ddb74 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-models-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index a63971e94..4f0358525 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-pap-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index ef6891cce..86a532662 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -16,9 +16,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-parent-settings' + java-version: openjdk11 files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g @@ -32,6 +31,7 @@ project-name: 'policy-parent' branch: 'master' mvn-settings: 'policy-parent-settings' + java-version: openjdk11 - project: name: policy-parent-info diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 96bada63f..7c376b77b 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-xacml-pdp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 2de80e0dc..882796ad2 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -9,17 +9,20 @@ name: sdnc-apps project-name: 'sdnc-apps' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g + cron: '' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' maven-version: "mvn35" + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -42,6 +45,8 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: sdnc-apps-sonar diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 507d04496..20665a3a0 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -3,11 +3,13 @@ name: sdnc-northbound project-name: 'sdnc-northbound' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -30,6 +32,8 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: sdnc-northbound-sonar diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index d74810537..563f47469 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -4,12 +4,14 @@ name: sdnc-oam project-name: 'sdnc-oam' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + cron: '' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -17,6 +19,7 @@ mvn-params: '-Dmaven.test.skip=true -P docker' maven-version: "mvn35" maven-versions-plugin: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g project: 'sdnc/oam' @@ -32,6 +35,8 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' # #- project: diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 8ad44cb8d..acc45f14d 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -30,6 +30,11 @@ name: so-libs-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'so/libs' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 9d7d894ce..4b63bf417 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -38,6 +38,11 @@ name: so-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' max-git-repo-age-hours: 48 build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index b0845fd71..bc4b64d23 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -54,6 +54,11 @@ name: vid-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'vid' diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index 30a1de50f..583b7b670 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -23,6 +23,11 @@ name: vnfsdk-functest-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'vnfsdk/functest' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index db4954b68..53efe1788 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -57,6 +57,11 @@ name: vnfsdk-refrepo-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'vnfsdk/refrepo' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 17092438e..b3a664f20 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -22,6 +22,11 @@ name: vnfsdk-validation-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'vnfsdk/validation' diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml index 8bcbd0b11..52751aace 100644 --- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml +++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml @@ -48,6 +48,11 @@ make-opts: -j6 stream: master build-node: centos7-builder-4c-4g + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'vnfsdk/ves-agent' diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index 10c3c407e..c15615081 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -6,12 +6,6 @@ become_method: sudo tasks: - - apt_repository: - repo: ppa:jonathonf/python-3.6 - state: present - become: true - when: ansible_distribution == 'Ubuntu' - - apt_repository: repo: ppa:deadsnakes/ppa state: present diff --git a/shell/docker-ts-tag-override.sh b/shell/docker-ts-tag-override.sh new file mode 100755 index 000000000..e14d2e5a9 --- /dev/null +++ b/shell/docker-ts-tag-override.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +# ================================================================================ +# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +set -feu -o pipefail + +echo "--> docker-ts-tag-override.sh" + +# Get project version from pom.xml +version=`xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" $DOCKER_ROOT/pom.xml` +echo "INFO: version from pom file $version" + +# Some pom has -SNAPSHOT or -STAGING under pom version, remove all text +version="${version//[^0-9.]/}" + +# Get build TS for specifying in the tag +timestamp=$(date +%C%y%m%dT%H%M%SZ) + +# Following the https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process +# IndependentVersioningandReleaseProcess-StandardizedDockerTagging +# ONAP Tag requirement : {imagename}:{semver}-SNAPSHOT-{timestamp}Z (from CIMAN-132) + +if [[ $version =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + tag="${version}-SNAPSHOT-${timestamp}" +else + # Default to latest tag with TS if not conforming to semantic versioning + echo "WARN: version not complaint to sem-ver; tag defaulted to latest" + version=latest + tag="${version}-${timestamp}" +fi + +echo "INFO: docker tag is $tag" + +# Write DOCKER_IMAGE_TAG information to a file so it can be +# injected into the environment for following steps +echo "DOCKER_IMAGE_TAG=$tag" >> "$WORKSPACE/env_docker_inject.txt"