diff options
Diffstat (limited to 'jjb')
33 files changed, 134 insertions, 221 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 011c031d9..6236f65fc 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -62,8 +62,10 @@ project: 'aai/aai-common' project-name: 'aai-aai-common' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 1b27130c2..62c32c95f 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -66,8 +66,10 @@ project: 'aai/babel' project-name: 'aai-babel' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-babel-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' java-version: openjdk11 diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 76a2471b8..8e1418c78 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -53,8 +53,10 @@ project: 'aai/event-client' project-name: 'aai-event-client' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-event-client-settings' - project: diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 3c1056a00..020bd1be0 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -63,8 +63,10 @@ project: 'aai/graphadmin' project-name: 'aai-graphadmin' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' java-version: openjdk8 diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 1f8078f23..2b00eeba7 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -56,8 +56,10 @@ project: 'aai/graphgraph' project-name: 'aai-graphgraph' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-graphgraph-settings' - project: diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index b5cf02ffa..08b31bd6e 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -53,8 +53,10 @@ project: 'aai/logging-service' project-name: 'aai-logging-service' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-logging-service-settings' - project: diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 4bf4846c1..669352172 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -66,8 +66,10 @@ project: 'aai/model-loader' project-name: 'aai-model-loader' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-model-loader-settings' mvn-version: 'mvn36' java-version: openjdk11 diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml deleted file mode 100644 index 97f0874ce..000000000 --- a/jjb/aai/aai-oom.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- project: - name: aai-oom-project-view - project-name: aai-oom - views: - - project-view - -- project: - name: aai-oom - helm-module: 'aai' - project-name: 'aai-oom' - project: 'aai/oom' - jobs: - - '{project-name}-{stream}-verify-external-helm' - - '{project-name}-{stream}-merge-external-helm': - build_script: '{oom_build_script}' - post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - files: '**' - stream: - - 'istanbul': - branch: 'istanbul' - - mvn-settings: 'aai-oom-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-helm-2c-1g - pre_build_script: !include-raw-escape: shell/helm-repo-init.sh - oom_build_script: | - #!/bin/bash - set -e -o pipefail - cd kubernetes/ - make HELM_BIN=helm3.3 all - build_script: | - #!/bin/bash - cd kubernetes/ - make HELM_BIN=helm3.3 common - make HELM_BIN=helm3.3 {helm-module} - oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 70c239626..40477b180 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -67,8 +67,10 @@ project: 'aai/resources' project-name: 'aai-resources' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' java-version: openjdk8 diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index d305f2f17..78442e2a4 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -53,8 +53,10 @@ project: 'aai/rest-client' project-name: 'aai-rest-client' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-rest-client-settings' - project: diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml deleted file mode 100644 index d0b3cac1f..000000000 --- a/jjb/aai/aai-router-core-service.yaml +++ /dev/null @@ -1,67 +0,0 @@ ---- -- project: - name: aai-router-project-view - project-name: aai-router - views: - - project-view - -- project: - name: aai-router-core-master - project-name: 'aai-router-core' - 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 - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'aai/router-core' - stream: - - 'istanbul': - branch: 'istanbul' - - 'master': - branch: 'master' - mvn-settings: 'aai-router-core-settings' - files: '**' - archive-artifacts: '' - -- project: - name: aai-router-core-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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'aai/router-core' - project-name: 'aai-router-core' - branch: 'master' - mvn-settings: 'aai-router-core-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: aai-router-core-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/router-core' - project-name: 'aai-router-core' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-router-core-settings' - -- project: - name: aai-router-core-info - project-name: aai-router-core - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aai/router-core - branch: master diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 53db28176..b3c6767b3 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -64,8 +64,10 @@ project-name: 'aai-schema-service' java-version: openjdk11 stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-schema-service-settings' mvn-version: 'mvn36' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index ad5f1f571..cd5ad1f41 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -65,8 +65,10 @@ project: 'aai/sparky-be' project-name: 'aai-sparky-be' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-sparky-be-settings' mvn-version: 'mvn36' java-version: openjdk11 diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 35674697d..0542f988c 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -66,8 +66,10 @@ project: 'aai/traversal' project-name: 'aai-traversal' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' java-version: openjdk8 diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml deleted file mode 100644 index 85b8afe4d..000000000 --- a/jjb/aai/aai-validation.yaml +++ /dev/null @@ -1,74 +0,0 @@ ---- -- project: - name: aai-validation-project-view - project-name: aai-validation - views: - - project-view - -- project: - name: aai-validation - project-name: 'aai-validation' - 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: 'docker:build -B -Dmaven.test.skip=true' - build-node: ubuntu1804-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/validation' - stream: - - 'istanbul': - branch: 'istanbul' - - 'master': - branch: 'master' - mvn-settings: 'aai-validation-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: aai-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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'aai/validation' - project-name: 'aai-validation' - branch: 'master' - mvn-settings: 'aai-validation-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: aai-validation-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/validation' - project-name: 'aai-validation' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-validation-settings' - - -- project: - name: aai-validation-info - project-name: aai-validation - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aai/validation - branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index e5ae14499..6623edd6d 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -67,7 +67,11 @@ project: dcaegen2/analytics/tca-gen2 build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-analytics-tca-gen2' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' mvn-version: 'mvn35' maven-version: 'mvn35' diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 4374d4764..59e4bf7f1 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -63,7 +63,11 @@ project: dcaegen2/collectors/datafile build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-collectors-datafile' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-settings: 'dcaegen2-collectors-datafile-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index 0b3c6cb66..5778cb5e4 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -64,7 +64,11 @@ nexus-iq-namespace: 'onap-' project: dcaegen2/collectors/hv-ves project-name: 'dcaegen2-collectors-hv-ves' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' build-node: ubuntu1804-docker-8c-8g mvn-settings: 'dcaegen2-collectors-hv-ves-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 955997bfb..31c2a677e 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -64,7 +64,11 @@ project: dcaegen2/collectors/restconf build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-collectors-restconf' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-collectors-restconf-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index bfd9e2550..4a4f21fe0 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -64,7 +64,11 @@ project: dcaegen2/collectors/ves build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-collectors-ves' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-collectors-ves-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml index 255817d21..fc8539cc4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml @@ -33,5 +33,9 @@ project: dcaegen2/platform build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-platform-mod-designtool' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml index 3aeca0442..b5af55841 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -52,6 +52,10 @@ project: 'dcaegen2/platform' project-name: dcaegen2-platform-mod-genprocessor-clm mvn-params: '-f mod/genprocessor/pom.xml' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml index 08b17c22b..299c04208 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml @@ -55,5 +55,9 @@ project: 'dcaegen2/platform' project-name: dcaegen2-platform-mod-runtimeapi-clm mvn-params: '-f mod/runtimeapi/pom.xml' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml index 5533c9ec5..684074684 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml @@ -63,5 +63,9 @@ project: 'dcaegen2/platform' project-name: dcaegen2-platform-mod2-helm-generator mvn-params: '-f mod2/helm-generator/pom.xml' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml index 635ebcc69..3308f7e52 100644 --- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml @@ -85,5 +85,9 @@ build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-services-kpi-computation-ms-clm' mvn-params: '-f components/kpi-computation-ms/pom.xml' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-services-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index f62e3f06a..31a6bc5ce 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -61,7 +61,11 @@ project: dcaegen2/services/mapper build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-services-mapper' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-services-mapper-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 586ee99fb..409e5f81b 100755..100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -63,7 +63,11 @@ project: dcaegen2/services/pm-mapper build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-services-pm-mapper' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-settings: 'dcaegen2-services-pm-mapper-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 88824ad75..013524415 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -60,7 +60,11 @@ build-node: ubuntu1804-docker-8c-8g java-version: openjdk11 project-name: 'dcaegen2-services-prh' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-services-prh-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 6d1698655..7f437580b 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -71,7 +71,11 @@ project: dcaegen2/services/sdk build-node: centos7-docker-8c-8g project-name: 'dcaegen2-services-sdk' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-services-sdk-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml index aa3066ba1..d6956ca28 100644 --- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml @@ -87,5 +87,9 @@ build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-services-slice-analysis-ms-clm' mvn-params: '-f components/slice-analysis-ms/pom.xml' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-services-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index 8fe300ed0..d6b9c7619 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -61,7 +61,11 @@ project: dcaegen2/services/son-handler build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-services-son-handler' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-services-son-handler-settings' - project: diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index acfab9edf..394a920d7 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -92,7 +92,11 @@ nexus-iq-namespace: 'onap-' project: dmaap/messagerouter/messageservice project-name: 'dmaap-messagerouter-messageservice' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dmaap-messagerouter-messageservice-settings' java-version: openjdk11 diff --git a/jjb/integration/integration-data-provider.yaml b/jjb/integration/integration-data-provider.yaml index fd05705b8..d1fd1f967 100644 --- a/jjb/integration/integration-data-provider.yaml +++ b/jjb/integration/integration-data-provider.yaml @@ -61,7 +61,7 @@ branch: 'master' files: '' docker-build-args: '-f ./Dockerfile' - docker-name: 'data-provider' + docker-name: 'onap/data-provider' docker-root: '$WORKSPACE' mvn-settings: 'integration-settings' build-node: ubuntu1804-docker-8c-8g |