diff options
85 files changed, 171 insertions, 573 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg index 4ea16ccb3..f3f6e4cf2 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,4 +1,4 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747 LABELS=centos7-builder-2c-1g HARDWARE_ID=v3-standard-2 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg index 27f0cbe52..469f189b6 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg @@ -1,4 +1,4 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747 LABELS=centos7-builder-4c-4g HARDWARE_ID=v3-standard-4 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg index f3063391e..c26976b26 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg @@ -1,4 +1,4 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200224-195343.324 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20211011-195645.572 LABELS=centos7-docker-8c-8g HARDWARE_ID=v3-standard-8 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index b82693f53..7676454ef 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false CLOUD_ZONE=ca-ymq-1 # Default Template Configuration -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747 VOLUME_SIZE=20 HARDWARE_ID=v1-standard-1 NETWORK_ID=bd089be9-e846-4afe-905b-8bb6c7c90faf diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 2195631b8..b32f224a2 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -34,6 +34,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-apps-settings' @@ -80,6 +82,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-apps-settings' diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 1853728ce..c8af14cbd 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -17,6 +17,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'ccsdk-distribution-settings' robot-options: '' branch: 'master' @@ -37,6 +39,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'ccsdk-oran-settings' robot-options: '' branch: 'master' diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 4574f091a..3193bfe1d 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -29,6 +29,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-oran-settings' @@ -52,6 +54,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-oran-settings' diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 345b9d6f8..acece7ce2 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -28,6 +28,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-cds-settings' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 7e94bdeff..312542400 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -30,6 +30,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-distribution-settings' @@ -71,6 +73,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-distribution-settings' diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 0d4004113..00a2af4fa 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -22,6 +22,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-features-settings' @@ -69,6 +71,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-features-settings' diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 888132301..7e5685baf 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -24,6 +24,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-parent-settings' diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index 501b4511c..864aa758d 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -22,6 +22,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-settings' @@ -68,6 +70,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-settings' diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml deleted file mode 100644 index 25061980c..000000000 --- a/jjb/ccsdk/utils.yaml +++ /dev/null @@ -1,70 +0,0 @@ ---- -- project: - name: ccsdk-utils - project-name: 'ccsdk-utils' - jobs: - - gerrit-maven-verify: - cron: '' - - gerrit-maven-merge: - cron: '@daily' - mvn-params: '-Dmaven.test.skip=true' - - gerrit-maven-stage: - build-node: centos7-builder-4c-4g - sign-artifacts: true - mvn-params: '-Dmaven.test.skip=true' - cron: '' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'ccsdk/utils' - stream: - - 'master': - branch: 'master' - java-version: openjdk11 - mvn-version: 'mvn36' - mvn-settings: 'ccsdk-utils-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: '' - mvn-snapshot-id: 'ecomp-snapshots' - nexus-snapshot-repo: 'snapshots' - -- project: - name: ccsdk-utils-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'ccsdk/utils' - project-name: 'ccsdk-utils' - stream: - - 'master': - branch: 'master' - java-version: openjdk11 - mvn-version: 'mvn36' - mvn-settings: 'ccsdk-utils-settings' - -- project: - name: ccsdk-utils-info - project-name: ccsdk-utils - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: ccsdk/utils - branch: master - -- project: - name: ccsdk-utils-whitesource - project-name: ccsdk-utils - jobs: - - gerrit-whitesource-scan - java-version: openjdk11 - mvn-version: 'mvn36' - mvn-settings: 'ccsdk-utils-settings' - wss-product-name: ccsdk - mvn-clean-install: true - project: ccsdk/utils - branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 4fbd716e8..e5ae14499 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -23,8 +23,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' java-version: openjdk11 diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index d0ef104cd..4374d4764 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' java-version: openjdk11 diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index db6d27dc5..0b3c6cb66 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' # apply to all jobs diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 141d09b4a..955997bfb 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -22,8 +22,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' mvn-settings: 'dcaegen2-collectors-restconf-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index a29412da0..06c1505a3 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -8,8 +8,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 0897793f9..bfd9e2550 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -22,12 +22,10 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' - - 'ves_synchronous': - branch: 'ves_synchronous' mvn-settings: 'dcaegen2-collectors-ves-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index 200cf55e8..1421ef0f0 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -12,8 +12,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' mvn-settings: 'dcaegen2-deployments-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index 70c49f444..a36be286d 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -12,8 +12,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' mvn-settings: 'dcaegen2-platform-blueprints-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index a0e3d3247..ff838ddcd 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -30,8 +30,8 @@ stream: - master: branch: master - - guilin: - branch: guilin + - istanbul: + branch: istanbul - honolulu: branch: honolulu diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml index fbf33b4f8..369e6f489 100644 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml @@ -95,8 +95,8 @@ stream: - master: branch: master - - guilin: - branch: guilin + - istanbul: + branch: istanbul - honolulu: branch: honolulu diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml index b3f2a2f50..e50fc887c 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml @@ -22,8 +22,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' java-version: openjdk11 diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml index 59eaa948b..255817d21 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml @@ -15,8 +15,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' mvn-settings: dcaegen2-platform-settings diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml index f2858c767..3aeca0442 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -15,10 +15,10 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: dcaegen2-platform-settings files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml index db490f79f..08b17c22b 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml @@ -15,10 +15,10 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-settings: dcaegen2-platform-settings files: '**' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml index fe6aa1553..66378f8a1 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml @@ -16,9 +16,6 @@ - 'master': branch: 'master' java-version: openjdk11 - - 'honolulu': - branch: 'honolulu' - java-version: openjdk11 mvn-settings: dcaegen2-platform-settings maven-version: 'mvn35' maven-deploy-properties: | diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml index c9b4b8552..219a4d915 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml @@ -16,9 +16,6 @@ - 'master': branch: 'master' java-version: openjdk11 - - 'honolulu': - branch: 'honolulu' - java-version: openjdk11 mvn-settings: dcaegen2-platform-settings maven-version: 'mvn35' maven-deploy-properties: | diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml index 37dfd4d4b..274d7e595 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml @@ -16,9 +16,6 @@ - 'master': branch: 'master' java-version: openjdk11 - - 'honolulu': - branch: 'honolulu' - java-version: openjdk11 mvn-settings: dcaegen2-platform-settings maven-version: 'mvn35' maven-deploy-properties: | diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml index fd80f8b93..3d8ea65fd 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml @@ -16,9 +16,6 @@ - 'master': branch: 'master' java-version: openjdk11 - - 'honolulu': - branch: 'honolulu' - java-version: openjdk11 mvn-settings: dcaegen2-platform-settings maven-version: 'mvn35' maven-deploy-properties: | diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index 50f3ffc40..74dc768eb 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -12,11 +12,12 @@ - 'master': branch: 'master' python-version: python3 - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' python-version: python3 + - 'istanbul': + branch: 'istanbul' + python-version: python3 mvn-settings: 'dcaegen2-platform-plugins-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml index 77a9468fa..cb614e5e0 100644 --- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml @@ -24,6 +24,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml index b336f35c9..92b0b470a 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -14,10 +14,10 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-version: 'mvn35' diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index a9efd7210..837e17de0 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -13,8 +13,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' java-version: openjdk11 @@ -48,8 +48,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' java-version: openjdk11 @@ -82,8 +82,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' java-version: openjdk11 @@ -116,8 +116,8 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' java-version: openjdk11 diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml index 97e7768c6..57f797bdf 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -106,6 +106,8 @@ branch: master - honolulu: branch: honolulu + - istanbul: + branch: istanbul views: - project-view: project-name: dcaegen2-services-pmsh diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index 83511be29..82ee02506 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -13,10 +13,10 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-services-heartbeat-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml index d42b2cff3..635ebcc69 100644 --- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml @@ -15,6 +15,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' files: '**' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index f10064d2b..f62e3f06a 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -22,10 +22,10 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-services-mapper-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 383f9e821..586ee99fb 100755 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,10 +6,10 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 # apply to all jobs project: 'dcaegen2/services/pm-mapper' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 9ab8eac07..88824ad75 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -20,10 +20,10 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-settings: 'dcaegen2-services-prh-settings' files: '**' diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 0c686efa9..6d1698655 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -16,10 +16,10 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-settings: 'dcaegen2-services-sdk-settings' files: '**' diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml index 71374e27c..aa3066ba1 100644 --- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml @@ -13,10 +13,10 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' files: '**' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index a13da5539..8fe300ed0 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -21,10 +21,10 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-settings: 'dcaegen2-services-son-handler-settings' files: '**' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 73289f8ad..624f74dd1 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -13,10 +13,10 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-utils-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 6cc6bf7e5..cf65da2a4 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -17,12 +17,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'dcaegen2-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 3136272a6..225be160a 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -39,10 +39,10 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/buscontroller' stream: + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' - - 'guilin': - branch: 'guilin' mvn-settings: 'dmaap-buscontroller-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index a7a23a4d9..1a8f5ffad 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -36,10 +36,10 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/datarouter' stream: + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' - - 'guilin': - branch: 'guilin' mvn-settings: 'dmaap-datarouter-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 3e7ba92bd..8e0dbf6c5 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -32,10 +32,10 @@ maven-versions-plugin: true project: 'dmaap/messagerouter/dmaapclient' stream: + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' - - 'guilin': - branch: 'guilin' mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-messagerouter-kafka.yaml b/jjb/dmaap/dmaap-messagerouter-kafka.yaml index 47b3d492c..ff785c55e 100644 --- a/jjb/dmaap/dmaap-messagerouter-kafka.yaml +++ b/jjb/dmaap/dmaap-messagerouter-kafka.yaml @@ -36,10 +36,10 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/kafka11aaf' stream: + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' - - 'guilin': - branch: 'guilin' mvn-settings: 'dmaap-kafka11aaf-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 8f62a7c4f..9fb9ed28c 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -38,10 +38,10 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/messagerouter/messageservice' stream: + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' - - 'guilin': - branch: 'guilin' mvn-settings: 'dmaap-messagerouter-messageservice-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 1d476f91c..0bb247b2b 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -1,5 +1,6 @@ --- - project: + disabled: true name: dmaap-messagerouter-mirroragent project-name: 'dmaap-messagerouter-mirroragent' jobs: @@ -20,6 +21,7 @@ archive-artifacts: '' - project: + disabled: true name: dmaap-messagerouter-mirroragent-maintenance project-name: 'dmaap-messagerouter-mirroragent-maintenance' jobs: @@ -41,6 +43,7 @@ cron: '' - project: + disabled: true name: dmaap-messagerouter-mirroragent-sonar jobs: - gerrit-maven-sonar @@ -59,6 +62,7 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: + disabled: true name: dmaap-messagerouter-mirroragent-clm jobs: - gerrit-maven-clm @@ -69,6 +73,7 @@ mvn-settings: 'dmaap-messagerouter-mirroragent-settings' - project: + disabled: true name: dmaap-messagerouter-mirroragent-info project-name: dmaap-messagerouter-mirroragent jobs: diff --git a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml index 3258275e9..8186cc314 100644 --- a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml +++ b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml @@ -34,10 +34,10 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/zookeeper' stream: + - 'istanbul': + branch: 'istanbul' - 'honolulu': branch: 'honolulu' - - 'guilin': - branch: 'guilin' mvn-settings: 'dmaap-zookeeper-settings' files: '**' archive-artifacts: '' diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 94d9d3af6..bccc8ce22 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -27,6 +27,8 @@ branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'holmes-common-settings' files: '**' archive-artifacts: '' diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index 2b6aeef26..79d9e984e 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -25,6 +25,8 @@ branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'holmes-engine-management-settings' files: '**' archive-artifacts: '' diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 00791b131..e93c94c94 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -25,6 +25,8 @@ branch: 'guilin' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'holmes-rule-management-settings' files: '**' archive-artifacts: '' diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 66c8b7003..df48a4cd1 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -31,22 +31,6 @@ default: '{html-files}' description: 'File name to be used by HTML publisher plugin to produce the report' -- parameter: - name: integration-terraform-version - parameters: - - string: - name: TERRAFORM_VERSION - default: '{terraform-version}' - description: 'Terraform version to install on minion' - -- parameter: - name: integration-terragrunt-version - parameters: - - string: - name: TERRAGRUNT_VERSION - default: '{terragrunt-version}' - description: 'Terragrunt version to install on minion' - - builder: name: integration-install-robotframework builders: @@ -90,30 +74,6 @@ mkdir -p ~/.ssh - builder: - name: integration-install-terraform - builders: - - shell: | - #!/bin/bash - set -ex - cd /tmp - wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip - unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip - sudo mv terraform /usr/local/bin/ - terraform version - -- builder: - name: integration-install-terragrunt - builders: - - shell: | - #!/bin/bash - set -ex - cd /tmp - wget -q https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/terragrunt_linux_amd64 - sudo mv terragrunt_linux_amd64 /usr/local/bin/terragrunt - sudo chmod +x /usr/local/bin/terragrunt - terragrunt --version - -- builder: name: integration-docker-compose-logs builders: - shell: !include-raw: shell/docker-compose-logs.sh diff --git a/jjb/integration/integration-terraform.yaml b/jjb/integration/integration-terraform.yaml deleted file mode 100644 index 008945454..000000000 --- a/jjb/integration/integration-terraform.yaml +++ /dev/null @@ -1,55 +0,0 @@ ---- -- project: - name: integration-terraform-info - project: integration/terraform - project-name: integration-terraform - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: - name: integration-terraform-linters - project: integration/terraform - project-name: integration-terraform - python-version: python3 - jobs: - - integration-linters - subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'json': - tox-dir: '.' - tox-envs: 'json' - pattern: '**/*.json' - - 'python': - tox-dir: '.' - tox-envs: 'py' - pattern: '**/*.py' - - 'md': - tox-dir: '.' - tox-envs: 'md' - pattern: '**/*.md' - stream: - - 'master': - branch: 'master' - -- project: - name: integration-terraform-validate - project: integration/terraform - project-name: integration-terraform - jobs: - - integration-terraform-verify - subproject: - - 'openlab': - tox-dir: 'openlab' - tox-envs: 'terraform' - pattern: 'openlab/**' - stream: - - 'master': - branch: 'master' diff --git a/jjb/integration/integration-terragrunt.yaml b/jjb/integration/integration-terragrunt.yaml deleted file mode 100644 index 04391fb02..000000000 --- a/jjb/integration/integration-terragrunt.yaml +++ /dev/null @@ -1,61 +0,0 @@ ---- -- project: - name: integration-terragrunt-project-view - project-name: integration-terragrunt - views: - - project-view - -- project: - name: integration-terragrunt-info - project: integration/terragrunt - project-name: integration-terragrunt - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: - name: integration-terragrunt-linters - project: integration/terragrunt - project-name: integration-terragrunt - python-version: python3 - jobs: - - integration-linters - subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'json': - tox-dir: '.' - tox-envs: 'json' - pattern: '**/*.json' - - 'python': - tox-dir: '.' - tox-envs: 'py' - pattern: '**/*.py' - - 'md': - tox-dir: '.' - tox-envs: 'md' - pattern: '**/*.md' - stream: - - 'master': - branch: 'master' - -- project: - name: integration-terragrunt-validate - project: integration/terragrunt - project-name: integration-terragrunt - jobs: - - integration-terraform-verify - subproject: - - 'terragrunt': - tox-dir: '.' - tox-envs: 'terragrunt' - pattern: '**' - stream: - - 'master': - branch: 'master' diff --git a/jjb/integration/simulators/integration-dc-simulator.yaml b/jjb/integration/simulators/integration-dc-simulator.yaml deleted file mode 100644 index 5b074135a..000000000 --- a/jjb/integration/simulators/integration-dc-simulator.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: integration-simulators-dc-simulator-info - project-name: integration-simulators-dc-simulator - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: integration/simulators/dc-simulator - branch: master - -- project: - name: integration-simulators-dc-simulator-linters - project: integration/simulators/dc-simulator - project-name: integration-simulators-dc-simulator - python-version: python3 - jobs: - - integration-linters - subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'json': - tox-dir: '.' - tox-envs: 'json' - pattern: '**/*.json' - stream: - - 'master': - branch: 'master' diff --git a/jjb/integration/simulators/integration-masspnf-simulator.yaml b/jjb/integration/simulators/integration-masspnf-simulator.yaml deleted file mode 100644 index 8121708b3..000000000 --- a/jjb/integration/simulators/integration-masspnf-simulator.yaml +++ /dev/null @@ -1,70 +0,0 @@ ---- -- project: - name: integration-simulators-masspnf-simulator-project-view - project-name: integration-simulators-masspnf-simulator - views: - - project-view - -- project: - name: integration-simulators-masspnf-simulator-info - project: integration/simulators/masspnf-simulator - project-name: integration-simulators-masspnf-simulator - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: - name: integration-simulators-masspnf-simulator-docker - project-name: integration-simulators-masspnf-simulator - jobs: - - integration-docker-merge - - integration-docker-verify - project: integration/simulators/masspnf-simulator - stream: - - 'master': - branch: 'master' - subproject: - - 'masspnfsim': - pom: 'pnf-sim-lightweight/pom.xml' - pattern: '**' - mvn-goals: 'clean package docker:build -Dcheckstyle.skip' - post-docker-verify-script: | - #!/bin/bash - set -ex # Fail build if any setup step fails - cd $WORKSPACE/ - tox -e pytest - mvn-settings: 'integration-settings' - files: '**' - archive-artifacts: '' - -- project: - name: integration-simulators-masspnf-simulator-linters - project: 'integration/simulators/masspnf-simulator' - project-name: 'integration-simulators-masspnf-simulator' - python-version: python3 - jobs: - - integration-linters - subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'json': - tox-dir: '.' - tox-envs: 'json' - pattern: '**/*.json' - - 'python': - tox-dir: '.' - tox-envs: 'py' - pattern: '**/*.py' - - 'md': - tox-dir: '.' - tox-envs: 'md' - pattern: '**/*.md' - stream: - - 'master': - branch: 'master' diff --git a/jjb/integration/usecases/integration-usecases-bbs.yaml b/jjb/integration/usecases/integration-usecases-bbs.yaml deleted file mode 100644 index ce2743e98..000000000 --- a/jjb/integration/usecases/integration-usecases-bbs.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: integration-usecases-bbs-info - project-name: integration-usecases-bbs - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: integration/usecases/bbs - branch: master - -- project: - name: integration-usecases-bbs-linters - project: integration/usecases/bbs - project-name: integration-usecases-bbs - python-version: python3 - jobs: - - integration-linters - subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'json': - tox-dir: '.' - tox-envs: 'json' - pattern: '**/*.json' - stream: - - 'master': - branch: 'master' diff --git a/jjb/integration/usecases/integration-usecases-mdons.yaml b/jjb/integration/usecases/integration-usecases-mdons.yaml deleted file mode 100644 index 475b27182..000000000 --- a/jjb/integration/usecases/integration-usecases-mdons.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: integration-usecases-mdons-info - project-name: integration-usecases-mdons - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: integration/usecases/mdons - branch: master - -- project: - name: integration-usecases-mdons-linters - project: integration/usecases/mdons - project-name: integration-usecases-mdons - python-version: python3 - jobs: - - integration-linters - subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'json': - tox-dir: '.' - tox-envs: 'json' - pattern: '**/*.json' - stream: - - 'master': - branch: 'master' diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 5ac5d8d5e..a5674e205 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -39,10 +39,6 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - - 'guilin': - branch: 'guilin' - 'honolulu': branch: 'honolulu' @@ -108,6 +104,16 @@ docker-root: ./security docker-name: 'onap/xtesting-security' docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-smoke-usecases-robot-py3' + docker-root: ./smoke-usecases-robot-py3 + docker-name: 'onap/xtesting-smoke-usecases-robot-py3' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-smoke-usecases-robot-py3' + docker-root: ./smoke-usecases-robot-py3 + docker-name: 'onap/xtesting-smoke-usecases-robot-py3' + docker-build-args: '-f ./docker/Dockerfile' project: 'integration/xtesting' stream: - 'master': @@ -116,9 +122,6 @@ - 'honolulu': branch: 'honolulu' files: '' - - 'guilin': - branch: 'guilin' - files: '' - 'develop': branch: 'develop' files: '' diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml index 5a723e4bb..c46939bae 100644 --- a/jjb/optf/optf-has-csit.yaml +++ b/jjb/optf/optf-has-csit.yaml @@ -11,7 +11,7 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'optf-has-settings' robot-options: '' diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 706802b96..c916ee67a 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'optf-has-settings' subproject: - 'conductor': @@ -66,8 +66,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'optf-has-settings' - project: diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml index 9398122d4..be1a65674 100644 --- a/jjb/optf/optf-osdf-csit.yaml +++ b/jjb/optf/optf-osdf-csit.yaml @@ -11,7 +11,7 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'optf-osdf-settings' robot-options: '' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 511f1fb87..aa41c1b8b 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -7,8 +7,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -67,8 +67,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'optf-osdf-settings' - project: diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index c053518bf..3064f2c9a 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -21,8 +21,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 maven-version: 'mvn36' mvn-settings: 'sdc-settings' diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml index 5de765080..dd2565201 100644 --- a/jjb/sdc/sdc-onap-ui-angular.yaml +++ b/jjb/sdc/sdc-onap-ui-angular.yaml @@ -24,8 +24,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'sdc-onap-ui-angular-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml index 9016a5f3c..6316059f1 100644 --- a/jjb/sdc/sdc-onap-ui-common.yaml +++ b/jjb/sdc/sdc-onap-ui-common.yaml @@ -18,8 +18,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'sdc-onap-ui-common-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml index 4901bf4c9..fb3e78840 100644 --- a/jjb/sdc/sdc-sdc-be-common.yaml +++ b/jjb/sdc/sdc-sdc-be-common.yaml @@ -21,8 +21,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'sdc-sdc-be-common-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 78a34d3fd..e20b95452 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -23,8 +23,8 @@ - 'master': branch: 'master' java-version: openjdk11 - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-settings: 'sdc-sdc-distribution-client-settings' files: '**' diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index e62163687..45372c3ea 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -23,8 +23,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index a8af3d565..46a68cf34 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -18,8 +18,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'sdc-sdc-pubsub-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 3ff5c7555..5cfdc2f48 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -22,8 +22,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'sdc-sdc-tosca-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index b42f1fcde..2547e6ba9 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -28,8 +28,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'sdc-sdc-workflow-designer-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 1c46f5f5b..bba93f03e 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -67,8 +67,8 @@ - 'master': branch: 'master' java-version: openjdk11 - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-settings: 'sdc-settings' files: '**' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index fedeb7c17..6c843ced4 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -38,6 +38,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version : "mvn36" mvn-settings: 'sdnc-apps-settings' diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index 0ce45c359..cc2150399 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -17,6 +17,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'sdnc-oam-settings' robot-options: '' branch: 'master' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 982eb479b..80c9dfd23 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -19,6 +19,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: "mvn36" mvn-settings: 'sdnc-northbound-settings' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 8aab78224..f4be0c670 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -28,6 +28,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' java-version: openjdk11 mvn-version: "mvn36" mvn-settings: 'sdnc-oam-settings' diff --git a/jjb/testsuite/testsuite-heatbridge.yaml b/jjb/testsuite/testsuite-heatbridge.yaml deleted file mode 100644 index e0f9c9f0c..000000000 --- a/jjb/testsuite/testsuite-heatbridge.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -- project: - name: testsuite-heatbridge-master - project-name: 'testsuite-heatbridge' - subproject: - - heatbridge: - path: '.' - pattern: '**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - project: 'testsuite/heatbridge' - subproject: - - 'heatbridge': - path: 'heatbridge' - pattern: 'heatbridge/**' - stream: - - 'master': - branch: 'master' - mvn-settings: 'testsuite-heatbridge-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: testsuite-heatbridge-master-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: testsuite/heatbridge - project-name: 'testsuite-heatbridge' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'testsuite-heatbridge-settings' - -- project: - name: testsuite-heatbridge-info - project-name: testsuite-heatbridge - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: testsuite/heatbridge - branch: master diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index 6914ffa02..b2b0a52b5 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -240,12 +240,6 @@ version: v3.13 when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - - name: Bootstrap rebar3 - command: ./bootstrap - args: - chdir: /tmp/rebar3 - when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - - name: Install rebar3 to bin copy: src: /tmp/rebar3/rebar3 diff --git a/shell/helm-repo-init.sh b/shell/helm-repo-init.sh index bfc346690..5aecc8e33 100755 --- a/shell/helm-repo-init.sh +++ b/shell/helm-repo-init.sh @@ -6,6 +6,6 @@ mkdir -p ".chartstorage" chartmuseum --port=6464 --storage="local" --storage-local-rootdir=".chartstorage" &> /dev/null & source helm.prop -$HELM_BIN plugin install https://github.com/chartmuseum/helm-push.git || true +$HELM_BIN plugin install --version v0.9.0 https://github.com/chartmuseum/helm-push.git || true $HELM_BIN repo add local http://localhost:6464 $HELM_BIN repo add onap http://localhost:6464 |