diff options
| -rw-r--r-- | jjb/ccsdk/ccsdk-csit.yaml | 3 | ||||
| -rw-r--r-- | jjb/clamp/clamp-csit.yaml | 6 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-csit.yaml | 29 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-csit.yaml | 3 | ||||
| -rw-r--r-- | jjb/externalapi/externalapi-nbi-csit.yaml | 3 | ||||
| -rw-r--r-- | jjb/holmes/holmes-csit.yaml | 5 | ||||
| -rw-r--r-- | jjb/ui/ui-dmaapbc.yaml | 21 |
7 files changed, 27 insertions, 43 deletions
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 79b0f687e..44d203078 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'healthcheck': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml index 2ea6d1e10..5a81ffa8b 100644 --- a/jjb/clamp/clamp-csit.yaml +++ b/jjb/clamp/clamp-csit.yaml @@ -8,10 +8,8 @@ stream: 'master' functionality: - 'APIs': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' - 'UIs': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml index c9092c171..c68a9c153 100644 --- a/jjb/dcaegen2/dcaegen2-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-csit.yaml @@ -1,5 +1,5 @@ - project: - name: dcaegen2-csit + name: dcaegen2-testsuites-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' @@ -8,12 +8,23 @@ - 'master': branch: 'master' functionality: - - 'testsuites': - trigger_jobs: - - 'dcaegen2-master-merge-java' - - 'dcaegen2-collectors-ves-master-merge-java' - - 'prh-testsuites': - trigger_jobs: - - 'dcaegen2-master-merge-java' - - 'dcaegen2-services-prh-master-merge-java' + - 'testsuites' + trigger_jobs: + - 'dcaegen2-master-merge-java' + - 'dcaegen2-collectors-ves-master-merge-java' + robot-options: '' +- project: + name: dcaegen2-prh-testsuites-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2' + stream: + - 'master': + branch: 'master' + functionality: + - 'prh-testsuites' + trigger_jobs: + - 'dcaegen2-master-merge-java' + - 'dcaegen2-services-prh-master-merge-java' robot-options: '' diff --git a/jjb/dmaap/dmaap-csit.yaml b/jjb/dmaap/dmaap-csit.yaml index e4daebc44..6954c660c 100644 --- a/jjb/dmaap/dmaap-csit.yaml +++ b/jjb/dmaap/dmaap-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'mrpubsub': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/externalapi/externalapi-nbi-csit.yaml b/jjb/externalapi/externalapi-nbi-csit.yaml index 8f15b48e8..ddba04251 100644 --- a/jjb/externalapi/externalapi-nbi-csit.yaml +++ b/jjb/externalapi/externalapi-nbi-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'healthcheck': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/holmes/holmes-csit.yaml b/jjb/holmes/holmes-csit.yaml index 02ce537fb..9d2323aaf 100644 --- a/jjb/holmes/holmes-csit.yaml +++ b/jjb/holmes/holmes-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'holmes-rule-management-master-docker-java-daily' + trigger_jobs: 'holmes-rule-management-master-docker-java-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml deleted file mode 100644 index afa41dd12..000000000 --- a/jjb/ui/ui-dmaapbc.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- project: - name: ui-dmaapbc - project-name: 'ui-dmaapbc' - - jobs: - - gerrit-maven-clm - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - project: 'ui/dmaapbc' - stream: - - 'master': - branch: 'master' - - 'release-1.1.0': - branch: 'release-1.1.0' - mvn-settings: 'ui-dmaapbc-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - |