From: Jessica Wagantall Date: Thu, 12 Mar 2020 20:11:59 +0000 (+0000) Subject: Merge "Remove sonar and elalto jobs" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=184a45221d3fafa651b3e76682786ed95c8e84ab;hp=29755aa6b21617004b3c1be576886d01a7a48076;p=ci-management.git Merge "Remove sonar and elalto jobs" --- 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 a54241965..a5b4bd9d0 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190926-155906.553 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 LABELS=centos7-builder-2c-1g HARDWARE_ID=v2-highcpu-2 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 c583dd880..209cb0e97 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190926-155906.553 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 LABELS=centos7-builder-4c-4g HARDWARE_ID=v2-highcpu-4 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 1829cfe50..edbfd3426 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190926-164302.295 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200224-195343.324 LABELS=centos7-docker-8c-8g HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg index 75014db77..37a375a0a 100644 --- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg @@ -1,4 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200220-113128.675 LABELS=queue-docker-4c-4g HARDWARE_ID=v2-highcpu-4 INSTANCE_CAP=1 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg index fbd283169..9018cf4bf 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855 LABELS=ubuntu1604-builder-2c-1g HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg index 7f2ebe842..610a33d7d 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855 LABELS=ubuntu1604-builder-4c-2g HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg index 2bf93caf6..ec5ae3e9a 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855 LABELS=ubuntu1604-builder-4c-4g HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg index f28c24ee2..65e930c9b 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855 LABELS=ubuntu1604-builder-8c-8g HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-2g.cfg index 12bbf4d5f..c39d21fef 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20191018-215136.301 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20191128-000031.905 LABELS=ubuntu1604-docker-arm64-4c-2g HARDWARE_ID=lf-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-4g.cfg index 037e042ce..f3b92cec3 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20191018-215136.301 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20191128-000031.905 LABELS=ubuntu1604-docker-arm64-4c-4g HARDWARE_ID=lf-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg new file mode 100644 index 000000000..7b9af8f46 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200219-191621.319 +LABELS=ubuntu1804-builder-4c-4g +HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg new file mode 100644 index 000000000..c4d05ac87 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200219-195603.229 +LABELS=ubuntu1804-docker-8c-8g +HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg new file mode 100644 index 000000000..e1470673c --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20200311-205153.422 +LABELS=ubuntu1804-helm-2c-1g +HARDWARE_ID=v2-highcpu-2 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/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 8a97a17b4..8b2ec47b0 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -30,6 +30,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-apps-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 @@ -72,6 +74,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-apps-settings' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 91fb43203..d8395bab5 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -26,6 +26,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-cds-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 @@ -68,6 +70,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-cds-settings' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index eab7aa874..b9cd8faba 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -25,6 +25,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -63,6 +65,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-distribution-settings' build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index fc8b655f7..0a0120eb3 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -17,6 +17,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-features-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 @@ -60,6 +62,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-features-settings' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 4a7396811..a29b09607 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -19,6 +19,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-parent-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 @@ -39,6 +41,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-parent-settings' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 8db8e3e39..8b65dc8f5 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -20,6 +20,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-sli-adaptors-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 @@ -62,6 +64,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-sli-adaptors-settings' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index f4996b997..946a4fb4f 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -20,6 +20,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-sli-core-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 @@ -62,6 +64,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-sli-core-settings' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index ebe19d4bf..8cd692b0f 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -20,6 +20,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-sli-northbound-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 @@ -62,6 +64,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-sli-northbound-settings' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index c631f6416..aec06dbc8 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -20,6 +20,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-sli-plugins-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 @@ -62,6 +64,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'ccsdk-sli-plugins-settings' maven-version: "mvn35" diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index d292bf4e8..2a8436f69 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -15,7 +15,6 @@ platforms: - centos-7 - ubuntu-16.04 - - ubuntu-16.04-arm64 - ubuntu-18.04 templates: builder @@ -87,4 +86,5 @@ platforms: - ubuntu-16.04 + - ubuntu-18.04 templates: helm 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..685582e51 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,11 @@ cron: '@daily' stream: master branch: master - - gerrit-release-verify - - gerrit-release-merge + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + - project: name: dcaegen2-platform-docker-python-subprojects @@ -68,20 +73,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..23d22ed77 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-8c-8g + 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..eec174ab5 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -14,12 +14,14 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' + maven-version: 'mvn35' maven-deploy-properties: | deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' - project: name: dcaegen2-services-bbs-event-processor-release @@ -36,7 +38,7 @@ mvn-goals: 'clean deploy -Ddockerfile.skip -f components/bbs-event-processor/pom.xml' pattern: 'components/bbs-event-processor/**' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/bbs-event-processor/pom.xml' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -45,15 +47,17 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' - project: name: dcaegen2-services-bbs-event-processor-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -68,15 +72,16 @@ branch: 'master' mvn-settings: 'dcaegen2-services-settings' mvn-params: '-f components/bbs-event-processor/pom.xml' - mvn-goals: 'clean install' + mvn-goals: 'clean install -Ddockerfile.skip' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: name: dcaegen2-services-bbs-event-processor-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'dcaegen2/services' project-name: 'dcaegen2-services-bbs-event-processor-clm' mvn-params: '-f 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 93e46087d..4b43e2c5e 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -49,6 +49,35 @@ archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-services-datalake-handler-admin-ui-release + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-datalake-handler-admin-ui' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'components/datalake-handler/pom.xml' + mvn-params: '-f components/datalake-handler/pom.xml' + version-properties-file: 'components/datalake-handler/version.properties' + pattern: 'components/datalake-handler/**' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/admin/pom.xml' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + pattern: 'components/datalake-handler/**' + 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-datalake-handler-sonar jobs: diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml new file mode 100644 index 000000000..be95546f1 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -0,0 +1,89 @@ +--- +- job-group: + # This job group contains all the jobs that should be deployed for + # a subproject of dcaegen2/services that builds a Docker image from + # Python code. + # + # Required parameters: + # build-node: The node to run build on. + # mvn-settings: Maven settings.xml file containing credentials to use. + # project-name: The job name prefix + # src-dir: The subdirectory of the repository containing subproject code + # stream: The stream to build + # branch: The branch to build + # + # Note: Multiple subprojects can be built with a single JJB project + # by specifying the value of project-name as a list. + # Similarly, multiple streams can be built with a single JJB project + # by specifying the value of the stream as a list. + # For example: + # project-name: + # - subproject-name1: + # src-dir: subproject-dir1 + # docker-name: onap/org.onap.dcaegen2.services.something.name1 + # - subproject-name2: + # src-dir: subproject-dir2 + # docker-name: onap/org.onap.dcaegen2.services.something.name2 + # - subproject-name3: + # src-dir: subproject-dir3 + # docker-name: onap/org.onap.dcaegen2.services.something.name3 + # stream: + # - master: + # branch: master + # - release1: + # branch: release1.0 + # jobs: + # - dcaegen2-docker-python-jobs + + name: '{project-name}-docker-python-jobs' + id: dcaegen2-services-docker-python-jobs + container-tag-method: latest + docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh' + nexus-iq-namespace: 'onap-' + tox-dir: '{src-dir}' + tox-envs: 'py3' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + python-version: python3 + wss-product-name: '{project-name}' + docker-root: '{src-dir}' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: '{src-dir}/.*' + jobs: + - gerrit-tox-verify: + stream: master + branch: 'master' + - gerrit-docker-verify + - gerrit-docker-merge + - gerrit-whitesource-scan: + build-timeout: 120 + submodule-timeout: 30 + java-opts: '-Xmx2048m' + mvn-pom: '{src-dir}/pom.xml' + - gerrit-tox-sonar: + # workaround because gerrit-tox-sonar doesn't support mvn-params/opts + sonar-mvn-goal: '-f {src-dir}/pom.xml sonar:sonar' + cron: '@daily' + stream: master + branch: master + +- project: + name: dcaegen2-services-docker-python-subprojects + project: dcaegen2/services + mvn-settings: dcaegen2-services-settings + build-node: ubuntu1804-docker-8c-8g + project-name: + - dcaegen2-services-pmsh: + src-dir: components/pm-subscription-handler + docker-name: onap/org.onap.dcaegen2.services.pmsh + stream: + - master: + branch: master + views: + - project-view: + project-name: dcaegen2-services-pmsh + jobs: + - dcaegen2-services-docker-python-jobs 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..a6bc305c3 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' + - '{project-name}-docker-merge-master' robot-options: '' diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml deleted file mode 100644 index 7a845453f..000000000 --- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml +++ /dev/null @@ -1,81 +0,0 @@ ---- -- 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-name: dcaegen2-services-pmsh-release - jobs: - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - stream: - - 'master': - branch: master - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - -- project: - <<: *dcaegen2_services_common - name: dcaegen2-services-pmsh-clm - docker-root: components/pm-subscription-handler - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project-name: 'dcaegen2-services-pmsh-clm' - mvn-params: '-f components/pm-subscription-handler/pom.xml' - branch: 'master' - diff --git a/jjb/dcaegen2/dcaegen2-services.yaml b/jjb/dcaegen2/dcaegen2-services.yaml index 81bcd8a0e..4ff813eba 100644 --- a/jjb/dcaegen2/dcaegen2-services.yaml +++ b/jjb/dcaegen2/dcaegen2-services.yaml @@ -7,3 +7,12 @@ build-node: centos7-builder-2c-1g project: dcaegen2/services branch: master +- project: + name: dcaegen2-services-release + project-name: dcaegen2-services + mvn-settings: dcaegen2-services-settings + jobs: + - '{project-name}-gerrit-release-jobs' + build-node: centos7-docker-8c-8g + project: dcaegen2/services + branch: master diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml index e610e477b..b09e30ea7 100644 --- a/jjb/dmaap/dmaap-kafka-docker.yaml +++ b/jjb/dmaap/dmaap-kafka-docker.yaml @@ -10,6 +10,8 @@ mvn-params: '-P docker -Dmaven.test.skip=true' 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: 'dmaap/kafka11aaf' stream: - 'master': diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml index 3b18d082b..e17fbe073 100644 --- a/jjb/dmaap/dmaap-zookeeper.yaml +++ b/jjb/dmaap/dmaap-zookeeper.yaml @@ -20,6 +20,8 @@ maven-versions-plugin: true 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: 'dmaap/zookeeper' stream: - 'master': diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index 12ce9a383..a147e1a51 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -20,6 +20,7 @@ submodule-disable: false submodule-recursive: true submodule-timeout: 10 + build-timeout: 120 ##################### # Job Configuration # @@ -55,6 +56,7 @@ # Job template for helm verify jobs <<: *helm_job_boiler_plate + concurrent: true scm: - gerrit-trigger-scm: diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 0adfae7a9..f5f3a1d8d 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -43,3 +43,57 @@ publishers: - lf-infra-publish + +- job-template: + # Job template for running linters against specific file formats + # + # Required Variables: + # python-version: Python version to deploy in venv + # tox-env: Tox environments to run + # tox-dir: Directory containing the project's tox.ini + # pattern: List of file patterns to scan + + name: '{project-name}-{stream}-{subproject}-lint' + project-type: freestyle + description: 'Job intended for running linters with Tox and Coala' + build-node: ubuntu1804-builder-4c-4g + node: '{build-node}' + + parameters: + - lf-infra-parameters: + project: '{project}' + stream: '{stream}' + branch: '{branch}' + - lf-infra-tox-parameters: + tox-dir: '{tox-dir}' + tox-envs: '{tox-envs}' + + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{pattern}' + + builders: + - lf-infra-tox-install: + python-version: '{python-version}' + - lf-infra-tox-run: + parallel: 'false' + + publishers: + - lf-infra-publish diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 453dc752a..17b608363 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -36,11 +36,9 @@ name: integration-verify-vagrantfile project-name: 'integration' project: 'integration' - stream: - 'master': branch: 'master' - jobs: - '{project-name}-{stream}-verify-vagrantfile' @@ -65,3 +63,53 @@ set -ex # Fail build if any setup step fails cd test/security/k8s make test + +- project: + name: integration-netconf-pnp-simulator + project: integration + stream: + - 'master': + branch: 'master' + # Required by verifier + mvn-settings: 'integration-settings' + project-name: 'integration-netconf-pnp-simulator' + gerrit_trigger_file_paths: + - compare-type: ANT + pattern: 'test/mocks/netconf-pnp-simulator/engine/**' + docker-name: 'onap/integration/simulators/netconf-pnp-simulator' + docker-root: test/mocks/netconf-pnp-simulator/engine + container-tag-method: yaml-file + post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh + build-node: centos7-docker-8c-8g + build-timeout: 20 + jobs: + - gerrit-docker-verify + - gerrit-docker-merge + +- project: + name: integration-linters + project: 'integration' + project-name: 'integration' + python-version: python3 + jobs: + - '{project-name}-{stream}-{subproject}-lint' + 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' + stream: + - 'master': + branch: 'master' diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 62947a081..6e6b2893a 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -81,7 +81,7 @@ stream: - 'master': branch: 'master' - build-node: ubuntu1604-builder-4c-4g + build-node: centos7-builder-4c-4g mvn-settings: 'logging-analytics-settings' subproject: - 'pylog': diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index cc07972d4..ed611b84c 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -22,6 +22,8 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'msb/apigateway' stream: - 'master': diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 67eca0a5d..b38802b9d 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -16,6 +16,8 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-pom: 'distributions/msb-discovery/pom.xml' mvn-params: '-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'msb/discovery' stream: - 'master': diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index f58802417..1bdc5b9bc 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -65,7 +65,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: centos7-docker-8c-8g maven-goals: install mvn-params: '-P docker' maven-versions-plugin: true @@ -75,7 +75,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-memcached-4c-4g' + build-node: 'centos7-builder-4c-4g' #- project: # name: multicloud-openstack-arm64 diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 4b5a3b3fe..d625aba44 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -16,6 +16,8 @@ script: !include-raw-escape: 'build-registrator-docker-image.sh' build-node: ubuntu1604-docker-8c-8g + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'oom/registrator' stream: - 'master': diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 830ac930a..b4884b752 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -17,9 +17,9 @@ pom: 'pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python': - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - '{project-name}-{stream}-{subproject}-merge-java': - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-docker-8c-8g @@ -27,49 +27,17 @@ - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' docker-pom: 'pom.xml' - mvn-goals: 'install' mvn-params: '-Dmaven.test.skip=true -P docker' files: '**' archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' -- project: - name: optf-osdf-docker - project-name: 'optf-osdf' - project: 'optf/osdf' - stream: - - 'master': - branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'optf-osdf-settings' - subproject: - - 'osdf': - path: '.' - pattern: '**' - pom: 'pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - mvn-params: '-Dmaven.test.skip=true' - script: - !include-raw-escape: 'build-optf-osdf-docker-image.sh' - build-node: queue-docker-4c-4g - - '{project-name}-{stream}-{subproject}-docker-java-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - mvn-params: '-Dmaven.test.skip=true' - script: - !include-raw-escape: 'build-optf-osdf-docker-image.sh' - build-node: queue-docker-4c-4g - - project: name: optf-osdf-sonar jobs: diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index ef02a1db0..38759ff5f 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -1,22 +1,3 @@ -- project: - name: policy-health-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'policy' - java-version: openjdk11 - stream: - - 'master': - branch: master - functionality: - - 'health' - trigger_jobs: - - 'policy-engine-{stream}-merge-java' - - 'policy-drools-pdp-{stream}-merge-java' - - 'policy-drools-applications-{stream}-merge-java' - robot-options: '' - build-timeout: 40 - - project: name: policy-apex-pdp-csit jobs: diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index 924ea3786..fc57249e7 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -66,5 +66,6 @@ project-name: policy-gui jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: policy/gui branch: master diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 97dc5675a..d5f183efe 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -5,21 +5,52 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java': + project-name: 'policy-pap-amd64' docker-pom: 'pom.xml' - mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g + mvn-profile: 'docker' + mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + build-node: ubuntu1804-docker-8c-8g + pattern: 'do_not_match_any_file' + - '{project-name}-{stream}-merge-java': + project-name: 'policy-pap-arm64' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + build-node: ubuntu1604-docker-arm64-4c-2g + pattern: 'do_not_match_any_file' - 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-name}-multiarch-{stream}-merge-java': + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-docker-stage: + project-name: 'policy-pap-arm64' + build-node: ubuntu1604-docker-arm64-4c-2g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + container-public-registry: 'docker.io' + container-staging-registry: 'docker.io' + cron: '' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'do_not_match_any_file' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + project-name: 'policy-pap-amd64' + build-node: centos7-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + container-public-registry: 'docker.io' + container-staging-registry: 'docker.io' + cron: '' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'do_not_match_any_file' + - '{project-name}-docker-manifest-{stream}': build-node: centos7-docker-8c-8g + - '{project-name}-multiarch-docker-stage-{stream}' project: 'policy/pap' stream: diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 1c718acda..6507f4f25 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -4,6 +4,9 @@ name: sdc-sdc-docker-base project-name: 'sdc-sdc-docker-base' jobs: + - '{project-name}-{stream}-verify-java': + build-node: 'ubuntu1604-docker-v1-8c-8g' + docker-pom: 'pom.xml' - '{project-name}-{stream}-sdc-merge-java': build-node: 'ubuntu1604-docker-8c-8g' docker-pom: 'pom.xml' @@ -14,6 +17,8 @@ mvn-params: '-P default' 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: 'sdc/sdc-docker-base' stream: - 'master': diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 71296e47e..70d2c221d 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -53,6 +53,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' 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: '**' diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index fd32c94a5..7d0eb5d72 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -56,3 +56,31 @@ build-node: centos7-builder-2c-1g project: testsuite branch: master + +- project: + name: testsuite-linters + project: 'testsuite' + project-name: 'testsuite' + python-version: python3 + jobs: + - '{project-name}-{stream}-{subproject}-lint' + 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' +# - 'robot': +# tox-dir: '.' +# tox-envs: 'robot' +# pattern: '**/*.robot' + stream: + - 'master': + branch: 'master' diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 601c5e567..917ff2970 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -18,6 +18,8 @@ - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' docker-pom: 'pom.xml' @@ -28,6 +30,11 @@ name: usecase-ui-server-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: ubuntu1604-builder-4c-4g project: 'usecase-ui/server' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index ee8356b6d..cc1a04b6f 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -23,6 +23,8 @@ - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index 348cef156..b79fdcca4 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -25,6 +25,8 @@ script: !include-raw-escape: 'build-driver-ems-docker-image.sh' build-node: ubuntu1604-docker-8c-8g + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 04836243f..5130e9ccf 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -26,13 +26,14 @@ script: !include-raw-escape: 'build-driver-zte-sfc-docker-image.sh' build-node: ubuntu1604-docker-8c-8g + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g - project: name: vfc-nfvo-driver-sfc-sonar - java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 709562c91..19cf0b477 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -20,6 +20,8 @@ maven-versions-plugin: true mvn-pom: 'huawei/pom.xml' mvn-params: '-f huawei/pom.xml' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml index 96c99885c..193df51a2 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml @@ -20,6 +20,8 @@ maven-versions-plugin: true mvn-pom: 'nokiav2/pom.xml' mvn-params: '-f nokiav2/pom.xml' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: 'nokiav2/**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml index f89e2fcae..d9601cbf6 100644 --- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml +++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml @@ -21,6 +21,8 @@ script: !include-raw-escape: 'build-nfvo-multivimproxy-docker-image.sh' build-node: ubuntu1604-docker-8c-8g + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g - project: name: vfc-nfvo-multivimproxy-sonar diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index 8beb8d4cb..35992f87a 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -21,10 +21,11 @@ script: !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh' build-node: ubuntu1604-docker-8c-8g + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g - project: name: vfc-nfvo-resmanagement-sonar - java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index 0b3cf0567..4d650c3d4 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -23,6 +23,8 @@ - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': mvn-goals: 'clean' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vvp/vvp-em.yaml b/jjb/vvp/vvp-em.yaml new file mode 100644 index 000000000..a0870ada9 --- /dev/null +++ b/jjb/vvp/vvp-em.yaml @@ -0,0 +1,10 @@ +--- +- project: + name: vvp-engagementmgr + project-name: 'vvp-engagementmgr' + project: 'vvp/engagementmgr' + mvn-settings: 'vvp-engagementmgr-settings' + branch: master + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g diff --git a/jjb/vvp/vvp-oom.yaml b/jjb/vvp/vvp-oom.yaml new file mode 100644 index 000000000..2a6b271a7 --- /dev/null +++ b/jjb/vvp/vvp-oom.yaml @@ -0,0 +1,10 @@ +--- +- project: + name: vvp-oom + project-name: 'vvp-oom' + project: 'vvp/oom' + mvn-settings: 'vvp-oom-settings' + branch: master + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g diff --git a/jjb/vvp/vvp-regression.yaml b/jjb/vvp/vvp-regression.yaml new file mode 100644 index 000000000..bea93c376 --- /dev/null +++ b/jjb/vvp/vvp-regression.yaml @@ -0,0 +1,10 @@ +--- +- project: + name: vvp-regression-tests + project-name: 'vvp-regression-tests' + project: 'vvp/regression-tests' + mvn-settings: 'vvp-regression-tests-settings' + branch: master + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml new file mode 100644 index 000000000..0a8303cab --- /dev/null +++ b/jjb/vvp/vvp-test-engine.yaml @@ -0,0 +1,44 @@ +--- +- project: + name: vvp-test-engine-info + project-name: 'vvp-test-engine' + project: 'vvp/test-engine' + mvn-settings: 'vvp-test-engine-settings' + branch: master + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + +- project: + name: vvp-test-engine-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-docker-8c-8g + project: 'vvp/test-engine' + project-name: 'vvp-test-engine' + branch: 'master' + mvn-settings: 'vvp-test-engine-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vvp-test-engine-verify + project-name: 'vvp-test-engine' + project: 'vvp/test-engine' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vvp-test-engine-settings' + build-node: 'centos7-builder-4c-4g' + subproject: + - 'onap-client': + path: 'onap-client' + pattern: 'onap-client/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' diff --git a/packer/common-packer b/packer/common-packer index d5fc82ea2..da5d5cf92 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit d5fc82ea247c96744ac7610476f5df10614f3668 +Subproject commit da5d5cf92fafcdc0f31a76d2955e8ac9c327c100 diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index c15615081..61cc50980 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -19,9 +19,14 @@ become: true when: ansible_distribution == 'Ubuntu' - - name: Install python-tox + - name: Install python-tox and deps pip: - name: tox + name: + - tox + - tox-pyenv + - virtualenv + - more-itertools~=5.0.0 + - zipp==1.0.0 state: present become: true @@ -34,6 +39,7 @@ - libssl-dev - libmysqlclient-dev - gcc + - python3-venv become: true when: ansible_distribution == 'Ubuntu' @@ -54,21 +60,24 @@ - libxml-xpath-perl - wget - make - - npm - sshuttle - netcat - libssl-dev - libffi-dev - become: true - when: ansible_distribution == 'Ubuntu' - - - name: Install autorelease support packages - apt: - name: - xmlstarlet - xvfb - crudini - maven - python-ncclient + - xmlstarlet + - xvfb + - crudini + - maven + - python-ncclient + - nodejs-dev + - node-gyp + - nodejs + - npm + update_cache: yes become: true when: ansible_distribution == 'Ubuntu' diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index 7b9f9c0c6..d54746f08 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -60,9 +60,14 @@ become: true when: ansible_distribution == 'Ubuntu' - - name: Install python-tox + - name: Install python-tox and deps pip: - name: tox + name: + - tox + - tox-pyenv + - virtualenv + - more-itertools~=5.0.0 + - zipp==1.0.0 state: present become: true @@ -88,6 +93,7 @@ - libssl-dev - libmysqlclient-dev - gcc + - python3-venv become: true when: ansible_distribution == 'Ubuntu' @@ -108,22 +114,25 @@ - libxml-xpath-perl - wget - make - - npm - sshuttle - netcat - libssl-dev - libffi-dev - become: true - when: ansible_distribution == 'Ubuntu' - - - name: Install autorelease support packages - apt: - name: - xmlstarlet - xvfb - crudini - maven - python-ncclient + - xmlstarlet + - xvfb + - crudini + - maven + - python-ncclient + - nodejs-dev + - node-gyp + - nodejs + - npm + update_cache: yes become: true when: ansible_distribution == 'Ubuntu' diff --git a/shell/run_releasedockerhub.sh b/shell/run_releasedockerhub.sh index 42771af6e..474911ddd 100644 --- a/shell/run_releasedockerhub.sh +++ b/shell/run_releasedockerhub.sh @@ -18,7 +18,7 @@ set -euf -o pipefail # shellcheck disable=SC1090 source ~/lf-env.sh -lf-activate-venv lftools +lf-activate-venv zipp==1.1.0 lftools if [ ! -v RELEASEDOCKERHUB_ORG ] then