diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/aaf/aaf-certservice-csit.yaml | 14 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml | 2 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-configbinding.yaml | 2 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml | 14 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml | 3 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-platform.yaml | 10 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml | 3 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml | 3 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-services-heartbeat.yaml | 2 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml | 3 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml | 8 | ||||
-rw-r--r-- | jjb/sdnc/sdnc-apps.yaml | 4 | ||||
-rw-r--r-- | jjb/sdnc/sdnc-northbound.yaml | 4 | ||||
-rw-r--r-- | jjb/sdnc/sdnc-oam.yaml | 5 | ||||
-rw-r--r-- | jjb/sdnc/sdnc-oom.yaml | 2 |
15 files changed, 54 insertions, 25 deletions
diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml new file mode 100644 index 000000000..68077b7b7 --- /dev/null +++ b/jjb/aaf/aaf-certservice-csit.yaml @@ -0,0 +1,14 @@ +- project: + name: aaf-certservice-csit + jobs: + - "{project-name}-{stream}-verify-csit-{functionality}" + - "{project-name}-{stream}-csit-{functionality}" + project-name: "aaf" + stream: + - "master": + branch: "master" + functionality: + - "certservice": + trigger_jobs: + - "aaf-certservice-{stream}-merge-java" + robot-options: "" diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 779c9e3ff..b94302f91 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -6,6 +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/collectors/snmptrap' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index 9b8b58160..78d12ee4f 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -23,6 +23,8 @@ # build docker image - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - gerrit-release-verify + - gerrit-release-merge stream: - master: branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml index 911435c1a..5d8b996c5 100644 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml @@ -20,10 +20,13 @@ # project-name: # - subproject-name1: # src-dir: subproject-dir1 + # docker-name: onap/org.onap.dcaegen2.platform.something.name1 # - subproject-name2: # src-dir: subproject-dir2 + # docker-name: onap/org.onap.dcaegen2.platform.something.name2 # - subproject-name3: # src-dir: subproject-dir3 + # docker-name: onap/org.onap.dcaegen2.platform.something.name3 # stream: # - master: # branch: master @@ -39,7 +42,6 @@ nexus-iq-namespace: 'onap-' tox-dir: '{src-dir}' docker-root: '{src-dir}' - docker-name: 'onap/{project-name}' gerrit_trigger_file_paths: - compare-type: REG_EXP pattern: '{src-dir}/.*' @@ -59,8 +61,6 @@ cron: '@daily' stream: master branch: master - - gerrit-release-verify - - gerrit-release-merge - project: name: dcaegen2-platform-docker-python-subprojects @@ -68,20 +68,24 @@ mvn-settings: dcaegen2-platform-settings build-node: ubuntu1604-docker-8c-8g project-name: - - dcaegen2-platform-aoadapter: + - dcaegen2-platform-adapter-acumos: src-dir: adapter/acumos + docker-name: onap/org.onap.dcaegen2.platform.adapter.acumos - dcaegen2-platform-mod-distributorapi: src-dir: mod/distributorapi + docker-name: onap/org.onap.dcaegen2.platform.mod.distributorapi - dcaegen2-platform-mod-onboardingapi: src-dir: mod/onboardingapi + docker-name: onap/org.onap.dcaegen2.platform.mod.onboardingapi - dcaegen2-platform-oti-event-handler: src-dir: oti/event-handler + docker-name: onap/org.onap.dcaegen2.platform.oti.event-handler stream: - master: branch: master views: - project-view: - project-name: dcaegen2-platform-aoadapter + project-name: dcaegen2-platform-adapter - project-view: project-name: dcaegen2-platform-mod - project-view: diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml index 859badcdc..855be9095 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml @@ -6,9 +6,8 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - gerrit-maven-stage: + project-name: dcaegen2-platform-mod-bpgenerator sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index fa8af0de3..a77a7c39c 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -7,3 +7,13 @@ build-node: centos7-builder-2c-1g project: dcaegen2/platform branch: master + +- project: + name: dcaegen2-platform-release + project-name: dcaegen2-platform + mvn-settings: dcaegen2-platform-settings + jobs: + - '{project-name}-gerrit-release-jobs' + build-node: centos7-docker-2c-1g + project: dcaegen2/platform + branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml index 81444df19..d2487ddaf 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -7,6 +7,9 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java': mvn-goals: 'clean install' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project-name: dcaegen2-services-bbs-event-processor subproject: - 'bbs-event-processor': pom: 'components/bbs-event-processor/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 3b6d678ab..7bed86576 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -6,6 +6,9 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + subproject: - 'datalake-handler': pom: 'components/datalake-handler/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index bbf5b88c9..e9c85313a 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -6,6 +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/services/heartbeat' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml index 3eb59891b..20dcad43a 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml @@ -1,6 +1,7 @@ - project: name: dcaegen2-services-pmsh-csit jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: dcaegen2-services-pmsh recipients: 'lego@est.tech' @@ -8,7 +9,7 @@ - 'master': branch: 'master' functionality: - - 'testsuites': + - 'testsuite': trigger_jobs: - '{project-name}-{stream}-release-version-java-daily' robot-options: '' diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml index 7a845453f..ce31970ae 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml @@ -25,7 +25,7 @@ # 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}' + docker-name: 'onap/org.onap.dcaegen2.services.pmsh' stream: - master: branch: master @@ -47,10 +47,12 @@ <<: *dcaegen2_services_common name: dcaegen2-services-pmsh-sonar docker-root: components/pm-subscription-handler + cron: '@daily' branch: master jobs: - - gerrit-tox-sonar - cron: '@daily' + - gerrit-tox-sonar: + sonar-mvn-goal: '-f components/pm-subscription-handler/pom.xml sonar:sonar' + - project: <<: *dcaegen2_services_common diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 57753770b..39a89779f 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -30,10 +30,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - - 'elalto-fluorine': - branch: 'elalto-fluorine' mvn-settings: 'sdnc-apps-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 7c7094f8d..85293ea15 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -17,10 +17,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - - 'elalto-fluorine': - branch: 'elalto-fluorine' mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 53d26e3fd..c39db4017 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -26,15 +26,12 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - - 'elalto-fluorine': - branch: 'elalto-fluorine' mvn-settings: 'sdnc-oam-settings' maven-version: "mvn35" files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + shallow-clone: true mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml index 1a02f8faf..1ab686219 100644 --- a/jjb/sdnc/sdnc-oom.yaml +++ b/jjb/sdnc/sdnc-oom.yaml @@ -13,8 +13,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'sdnc-oom-settings' files: '**' |