From: Jessica Wagantall Date: Thu, 20 May 2021 18:42:18 +0000 (+0000) Subject: Merge "remove modeling-toscaparsers-nfvparser from JJB" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2d0e40b49c7bf799c9a13d033f8aa15b5a86bde8;hp=fad735e0c4e0b81fce1d942b936710031b3b9eb4;p=ci-management.git Merge "remove modeling-toscaparsers-nfvparser from JJB" --- diff --git a/INFO.yaml b/INFO.yaml new file mode 100644 index 000000000..801bb8506 --- /dev/null +++ b/INFO.yaml @@ -0,0 +1,65 @@ +--- +project: 'ci-management' +project_creation_date: '2017-01-24' +lifecycle_state: 'Incubation' +project_category: '' +project_lead: &onap_releng_ptl + name: 'Jessica Wagantall' + email: 'jwagantall@linuxfoundation.org' + id: 'jwagantall' + company: 'LF' + timezone: 'America/Los_Angeles' +primary_contact: *onap_releng_ptl +issue_tracking: + type: 'jira' + url: 'https://jira.onap.org/projects/CIMAN' + key: 'CIMAN' +mailing_list: + type: 'groups.io' + url: 'lists.onap.org' + tag: '<[sub-project_name]>' +realtime_discussion: '' +meetings: + - type: 'zoom' + agenda: 'n/a' + url: 'n/a' + server: 'n/a' + channel: 'n/a' + repeats: 'n/a' + time: 'n/a' +repositories: + - ci-management +committers: + - <<: *onap_releng_ptl + - name: 'Bengt Thuree' + email: 'bthuree@linuxfoundation.org' + company: 'LF' + id: 'bthuree' + timezone: 'Australia/Melbourne' + - name: 'Andrew Grimberg' + email: 'agrimberg@linuxfoundation.org' + company: 'LF' + id: 'agrimberg' + timezone: 'America/Los_Angeles' + - name: 'Eric Ball' + email: 'eball@linuxfoundation.org' + company: 'LF' + id: 'eball' + timezone: 'America/Los_Angeles' + - name: 'Morgan Richomme' + email: 'morgan.richomme@orange.com' + company: 'orange' + id: 'mrichomme' + timezone: 'France/Paris' + - name: 'Bartek Grzybowski' + email: 'b.grzybowski@partner.samsung.com' + company: 'samsung' + id: 'bgrzybowski' + timezone: 'Poland/Warsaw' + - name: 'Lasse Kaihlavirta' + email: 'l.kaihlavirt@partner.samsung.com' + company: 'samsung' + id: 'kaihlavi' + timezone: 'Europe/Helsinki' +tsc: + approval: 'https://lists.onap.org/pipermail/onap-tsc' diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md index 1ec847026..890410550 100644 --- a/Sandbox_Setup.md +++ b/Sandbox_Setup.md @@ -41,7 +41,7 @@ Once you successfully clone the repository, next step is to install JJB ``` cd ci-management -sudo apt-get install python-virtualenv +pip install virtualenv virtualenv onap_sandbox source onap_sandbox/bin/activate pip install jenkins-job-builder @@ -53,6 +53,7 @@ jenkins-jobs test --recursive jjb/ Backup the jenkins.ini.example to jenkins.ini +`mkdir -p ~/.config/jenkins_jobs` `cp jenkins.ini.example ~/.config/jenkins_jobs/jenkins_jobs.ini` After copying the jenkins.ini.example, modify `jenkins.ini` with your @@ -72,9 +73,10 @@ password= url=https://jenkins.onap.org/sandbox query_plugins_info=False ``` -### How to retrieve API token? +### How to retrieve username and API token? Login to the [Jenkins Sandbox](https://jenkins.onap.org/sandbox/), go to your user -page by clicking on your username. Click **Configure** and then click **Add new Token**. +page by clicking on your username - `Jenkins User ID` on this page is your Jenkins +Sandbox username. Click **Configure** and then click **Add new Token**. After that specify a token name (optional) and click on **Generate** to generate and show new token. Please note down your token and store it securely. @@ -106,18 +108,14 @@ The output directory will contain files with the XML configurations. ## To Update a job: -Ensure you’ve configured your `jenkins_jobs.ini` and verified it by -outputting valid XML descriptions of Jenkins jobs. Upon successful -verification, execute the following command to update the job to the -Jenkins sandbox. +Ensure you’ve configured your `jenkins_jobs.ini` and verified the changes by +outputting valid XML descriptions of the relevant Jenkins jobs. Upon successful +verification, execute the following command to update the job to the Jenkins sandbox. `jenkins-jobs update jjb/ ` **Example:** `jenkins-jobs update jjb/ sdc-master-verify-java` -Note that there will be some 403 errors along the way for failed view creation attempts even -when the job creation succeeds. - ## Trigger jobs from Jenkins Sandbox: Once you push the Jenkins job configuration to the ONAP Sandbox environment, diff --git a/global-jjb b/global-jjb index 89144786d..5beb45586 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 89144786dbd6e556bc251aeff6b397d6e28eddeb +Subproject commit 5beb45586451cb772982de881cd09fd97360be87 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 a5b4bd9d0..4ea16ccb3 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,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 LABELS=centos7-builder-2c-1g -HARDWARE_ID=v2-highcpu-2 +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 209cb0e97..27f0cbe52 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,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 LABELS=centos7-builder-4c-4g -HARDWARE_ID=v2-highcpu-4 +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 edbfd3426..f3063391e 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,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200224-195343.324 LABELS=centos7-docker-8c-8g -HARDWARE_ID=v2-highcpu-8 +HARDWARE_ID=v3-standard-8 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg index 791a9b697..8bb7c0366 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg @@ -1,3 +1,4 @@ -IMAGE_NAME=CentOS 7 - redis - - 70180101-1009 +IMAGE_NAME=CentOS 7 - redis - - 50880808-8011 LABELS=centos7-redis-4c-4g -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-standard-4 +VOLUME_SIZE=50 diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index 2b0ca1245..5695a77d1 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -5,7 +5,8 @@ CLOUD_IGNORE_SSL=false CLOUD_ZONE=ca-ymq-1 # Default Template Configuration -IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180601-1002 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 +VOLUME_SIZE=20 HARDWARE_ID=v1-standard-1 NETWORK_ID=bd089be9-e846-4afe-905b-8bb6c7c90faf USER_DATA_ID=jenkins-init-script 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 37a375a0a..9f9d8678c 100644 --- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg @@ -1,6 +1,7 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200220-113128.675 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210306-131321.125 LABELS=queue-docker-4c-4g -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-standard-4 INSTANCE_CAP=1 NUM_EXECUTORS=4 RETENTION_TIME=4320 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg index 7b9af8f46..f36cf96fd 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -1,3 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200219-191621.319 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20210317-233509.164 LABELS=ubuntu1804-builder-4c-4g -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-standard-4 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg new file mode 100644 index 000000000..adc76acf0 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg @@ -0,0 +1,4 @@ +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210317-220033.605 +LABELS=ubuntu1804-docker-8c-16g +HARDWARE_ID=v3-standard-16 +VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg index c4d05ac87..efb578713 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg @@ -1,3 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200219-195603.229 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210317-220033.605 LABELS=ubuntu1804-docker-8c-8g -HARDWARE_ID=v2-highcpu-8 +HARDWARE_ID=v3-standard-8 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg index 5e1900178..cd44cbc2b 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg @@ -1,3 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711 LABELS=ubuntu1804-docker-arm64-4c-2g HARDWARE_ID=lf-standard-2 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg index 5ece27518..47fa5e75b 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg @@ -1,3 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711 LABELS=ubuntu1804-docker-arm64-4c-4g HARDWARE_ID=lf-standard-4 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg index da8a241ea..97fb2ca37 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg @@ -1,3 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200219-195603.229 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210317-220033.605 LABELS=ubuntu1804-docker-v1-8c-8g HARDWARE_ID=v1-standard-8 +VOLUME_SIZE=50 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg index d69e20940..26892ac78 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg @@ -1,3 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20200506-233718.921 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20210318-054700.866 LABELS=ubuntu1804-helm-2c-1g -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-standard-2 +VOLUME_SIZE=50 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg index 6d2f06e38..5610c6ad1 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg @@ -1,3 +1,4 @@ -IMAGE_NAME=Ubuntu 18.04 - memcached - - 120380303-3010 +IMAGE_NAME=Ubuntu 18.04 - memcached - - 120780707-7003 LABELS=ubuntu1804-memcached-4c-4g -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-standard-4 +VOLUME_SIZE=50 diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh index 3c83f0a14..9f7a17267 100644 --- a/jenkins-config/global-vars-production.sh +++ b/jenkins-config/global-vars-production.sh @@ -17,7 +17,7 @@ RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org RELEASE_USERNAME=onap-release S3_BUCKET= SIGUL_BRIDGE_IP=10.30.104.3 -SIGUL_KEY=onap-release-2018 +SIGUL_KEY=onap-release-2020 SILO=production SONAR_URL=https://sonar.onap.org MASTER_RTD_PROJECT=doc diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh index 75ce5938b..72470945a 100644 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@ -17,7 +17,7 @@ RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org RELEASE_USERNAME=onap-release S3_BUCKET= SIGUL_BRIDGE_IP=10.30.104.3 -SIGUL_KEY=onap-test +SIGUL_KEY=onap-sandbox SILO=sandbox SONAR_URL=https://sonar.onap.org MASTER_RTD_PROJECT=doc-test diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 64b3bc3b9..d8417badf 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -6,6 +6,8 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-docker-8c-8g diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml index 990545bb2..4876ba6bb 100644 --- a/jjb/aaf/aaf-certservice-csit.yaml +++ b/jjb/aaf/aaf-certservice-csit.yaml @@ -5,9 +5,8 @@ - "{project-name}-{stream}-verify-csit-{functionality}" - "{project-name}-{stream}-csit-{functionality}" project-name: "aaf" + disabled: true stream: - - "master": - branch: "master" - "frankfurt": branch: "frankfurt" functionality: diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml index 0fb6892e8..8aa7518bd 100644 --- a/jjb/aaf/aaf-certservice.yaml +++ b/jjb/aaf/aaf-certservice.yaml @@ -4,9 +4,6 @@ name: aaf-certservice project-name: 'aaf-certservice' stream: - - 'master': - branch: 'master' - java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' java-version: openjdk11 @@ -51,7 +48,7 @@ build-node: ubuntu1804-docker-8c-8g project: 'aaf/certservice' project-name: 'aaf-certservice' - branch: 'master' + branch: 'frankfurt' mvn-settings: 'aaf-certservice-settings' mvn-pom: 'certService/pom.xml' mvn-goals: 'clean install' @@ -64,4 +61,4 @@ - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g project: aaf/certservice - branch: master + branch: frankfurt diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml deleted file mode 100644 index 8d65de839..000000000 --- a/jjb/aaf/aaf-luaplugin.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed -- project: - name: aaf-luaplugin-clm - project-name: 'aaf-luaplugin' - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aaf/luaplugin' - branch: 'master' - mvn-settings: 'aaf-luaplugin-settings' - -- project: - name: aaf-luaplugin-info - project-name: aaf-luaplugin - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aaf/luaplugin - branch: master diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml deleted file mode 100644 index 599754303..000000000 --- a/jjb/aaf/aaf-sms.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed -- project: - name: aaf-sms - project-name: 'aaf-sms' - subproject: 'aaf-sms-client' - path: 'sms-service/src' - golangver: 'golang111' - jobs: - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - '{project-name}-{stream}-verify-golang' - - '{project-name}-{stream}-merge-golang' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - mvn-pom: 'sms-client/java/pom.xml' - mvn-params: '-f sms-client/java/pom.xml' - - '{project-name}-{stream}-docker-golang-shell-daily': - script: - !include-raw-escape: 'build-sms-docker-image.sh' - project: 'aaf/sms' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'aaf-sms-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: aaf-sms-info - project-name: aaf-sms - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aaf/sms - branch: master diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml deleted file mode 100644 index b3a45fbf4..000000000 --- a/jjb/aaf/aaf-sshsm.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed -- project: - name: aaf-sshsm - project-name: 'aaf-sshsm' - build-timeout: 120 - project: 'aaf/sshsm' - jobs: - - gerrit-verify-c: - script: - !include-raw-escape: 'build-sshsm.sh' - - gerrit-docker-c-shell-daily: - script: - !include-raw-escape: 'build-sshsm-docker-images.sh' - stream: - - 'master': - branch: 'master' - - mvn-settings: 'aaf-sshsm-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: aaf-sshsm-info - project-name: aaf-sshsm - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aaf/sshsm - branch: master diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 4a68af135..f17d6a24a 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -22,8 +22,8 @@ - 'master': branch: 'master' mvn-params: '-P spring-boot-2-1' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' @@ -91,7 +91,7 @@ - 'master': branch: 'master' distro: 'alpine' - mvn-params: '-P spring-boot-2-1' + mvn-params: '-P spring-boot-2-1,docker' docker_name: 'onap/aai-common-{distro}' docker_build_args: '-f ./Dockerfile.{distro}' docker_root: '$WORKSPACE/Dockerfiles/aai-common/' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 13799a59b..158df9bca 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -9,8 +9,9 @@ name: aai-babel project-name: 'aai-babel' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -24,14 +25,18 @@ build-node: centos7-docker-8c-8g project: 'aai/babel' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-babel-settings' files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g + java-version: openjdk11 + mvn-version: 'mvn36' + nexus-snapshot-repo: 'snapshots' + mvn-snapshot-id: 'ecomp-snapshots' - project: name: aai-babel-sonar @@ -50,6 +55,8 @@ mvn-settings: 'aai-babel-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 + mvn-version: 'mvn36' - project: name: aai-babel-clm @@ -63,6 +70,8 @@ branch: 'master' mvn-settings: 'aai-babel-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 + mvn-version: 'mvn36' - project: diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index ec4b2bd0b..ca9d19dd5 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -20,8 +20,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' files: '**' diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml deleted file mode 100644 index ae853d58d..000000000 --- a/jjb/aai/aai-esr-gui.yaml +++ /dev/null @@ -1,57 +0,0 @@ ---- -- project: - name: aai-esr-gui-project-view - project-name: aai-esr-gui - views: - - project-view - -- project: - name: aai-esr-gui - project-name: 'aai-esr-gui' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - mvn-params: '-f distribution/pom.xml -P docker docker:build -B -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'aai/esr-gui' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'aai-esr-gui-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1804-builder-4c-4g - -- project: - name: aai-esr-gui-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/esr-gui' - project-name: 'aai-esr-gui' - stream: - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'aai-esr-gui-settings' - -- project: - name: aai-esr-gui-info - project-name: aai-esr-gui - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aai/esr-gui - branch: master diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 08ccd0e77..039317c19 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -19,8 +19,8 @@ build-node: centos7-docker-8c-8g project: 'aai/event-client' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-event-client-settings' diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 1278ed695..7a7b9cfa2 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -26,8 +26,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' files: '**' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index c1cdbe457..a4fbaeaeb 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -19,8 +19,8 @@ build-node: centos7-docker-8c-8g project: 'aai/logging-service' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-logging-service-settings' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 84e2a3e6b..0bb473b60 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -9,8 +9,9 @@ name: aai-model-loader-master project-name: 'aai-model-loader' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -24,14 +25,18 @@ build-node: centos7-docker-8c-8g project: 'aai/model-loader' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-model-loader-settings' files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g + mvn-version: 'mvn36' + java-version: openjdk11 + nexus-snapshot-repo: 'snapshots' + mvn-snapshot-id: 'ecomp-snapshots' - project: name: aai-model-loader-sonar @@ -50,6 +55,8 @@ mvn-settings: 'aai-model-loader-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-version: 'mvn36' + java-version: openjdk11 - project: name: aai-model-loader-clm @@ -62,6 +69,8 @@ - 'master': branch: 'master' mvn-settings: 'aai-model-loader-settings' + mvn-version: 'mvn36' + java-version: openjdk11 - project: name: aai-model-loader-info @@ -83,3 +92,5 @@ mvn-clean-install: true project: 'aai/model-loader' branch: master + java-version: openjdk11 + mvn-version: 'mvn36' diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml index 4ea6eb843..e60cd01f9 100644 --- a/jjb/aai/aai-oom.yaml +++ b/jjb/aai/aai-oom.yaml @@ -17,10 +17,8 @@ post_build_script: !include-raw-escape: shell/publish_helm_charts.sh files: '**' stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'aai-oom-settings' files: '**' @@ -31,10 +29,10 @@ #!/bin/bash set -e -o pipefail cd kubernetes/ - make all + make HELM_BIN=helm3.3 all build_script: | #!/bin/bash cd kubernetes/ - make common - make {helm-module} + make HELM_BIN=helm3.3 common + make HELM_BIN=helm3.3 {helm-module} oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index fee95b499..77d07a380 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -9,9 +9,12 @@ name: aai-resources project-name: 'aai-resources' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-verify-java': + build-node: ubuntu1804-docker-8c-8g + - '{project-name}-{stream}-merge-java': + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: + mvn-params: '-DskipTests' sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true @@ -26,8 +29,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' files: '**' @@ -44,7 +47,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu1804-docker-8c-8g project: 'aai/resources' project-name: 'aai-resources' branch: 'master' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index c641d987a..76be4bfba 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -19,8 +19,8 @@ build-node: centos7-docker-8c-8g project: 'aai/rest-client' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-rest-client-settings' diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index 316c5dd7b..fddff15e3 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -19,8 +19,8 @@ build-node: centos7-docker-8c-8g project: 'aai/router-core' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-router-core-settings' diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 24c640eeb..bce2867d0 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -26,13 +26,14 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'aai-schema-service-settings' - mvn-version: 'mvn35' + mvn-version: 'mvn36' files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g + java-version: openjdk11 - project: name: aai-schema-service-sonar @@ -45,13 +46,14 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1804-builder-4c-4g + java-version: openjdk11 project: 'aai/schema-service' project-name: 'aai-schema-service' branch: 'master' mvn-settings: 'aai-schema-service-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: 'mvn35' + mvn-version: 'mvn36' - project: name: aai-schema-service-clm @@ -60,11 +62,12 @@ nexus-iq-namespace: 'onap-' project: 'aai/schema-service' project-name: 'aai-schema-service' + java-version: openjdk11 stream: - 'master': branch: 'master' mvn-settings: 'aai-schema-service-settings' - mvn-version: 'mvn35' + mvn-version: 'mvn36' - project: name: aai-schema-service-info diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml deleted file mode 100644 index 1d68ea571..000000000 --- a/jjb/aai/aai-search-data-service.yaml +++ /dev/null @@ -1,103 +0,0 @@ ---- -- project: - name: aai-search-data-service-project-view - project-name: aai-search-data-service - views: - - project-view - -- project: - name: aai-search-data-service-master - project-name: 'aai-search-data-service' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - mvn-params: '-Pdocker -B -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'aai/search-data-service' - docker-image-name: 'onap/search-data-service' - stream: - - 'frankfurt': - branch: 'frankfurt' - - 'master': - branch: 'master' - mvn-settings: 'aai-search-data-service-settings' - files: '**' - archive-artifacts: '' - -- project: - name: aai-search-data-service-searchguard - project-name: 'aai-search-data-service-searchguard' - jobs: - - gerrit-maven-docker-stage: - mvn-params: '-Pdocker -B -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - project: 'aai/search-data-service' - docker-image-name: 'onap/elasticsearch-sg' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-search-data-service-settings' - files: '**' - archive-artifacts: '' - -- project: - name: aai-search-data-service-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'aai/search-data-service' - project-name: 'aai-search-data-service' - branch: 'master' - mvn-settings: 'aai-search-data-service-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: aai-search-data-service-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/search-data-service' - project-name: 'aai-search-data-service' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-search-data-service-settings' - -- project: - name: aai-search-data-service-info - project-name: aai-search-data-service - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aai/search-data-service - branch: master - -- project: - name: 'aai-search-data-service-whitesource' - project-name: 'aai-search-data-service' - build-node: ubuntu1804-docker-8c-8g - jobs: - - gerrit-whitesource-scan - mvn-settings: 'aai-search-data-service-settings' - wss-product-name: 'aai' - mvn-clean-install: true - project: 'aai/search-data-service' - branch: master diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 49c994141..f1f777205 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -9,8 +9,9 @@ name: aai-sparky-be-master project-name: 'aai-sparky-be' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -24,13 +25,17 @@ build-node: centos7-docker-8c-8g project: 'aai/sparky-be' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-sparky-be-settings' files: '**' archive-artifacts: '' + mvn-version: 'mvn36' + java-version: openjdk11 + nexus-snapshot-repo: 'snapshots' + mvn-snapshot-id: 'ecomp-snapshots' - project: name: aai-sparky-be-sonar @@ -49,6 +54,8 @@ mvn-settings: 'aai-sparky-be-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-version: 'mvn36' + java-version: openjdk11 - project: name: aai-sparky-be-clm @@ -61,6 +68,8 @@ - 'master': branch: 'master' mvn-settings: 'aai-sparky-be-settings' + mvn-version: 'mvn36' + java-version: openjdk11 - project: name: aai-sparky-be-info diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 4ac85e0e1..03fd1fad3 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -13,8 +13,8 @@ build-node: centos7-docker-8c-8g project: 'aai/sparky-fe' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-sparky-fe-settings' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index b6178bb5e..249c46b7d 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -9,9 +9,12 @@ name: aai-traversal-master project-name: 'aai-traversal' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-verify-java': + build-node: ubuntu1804-docker-8c-8g + - '{project-name}-{stream}-merge-java': + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: + mvn-params: '-DskipTests' sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true @@ -26,8 +29,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' files: '**' @@ -44,7 +47,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu1804-docker-8c-8g project: 'aai/traversal' project-name: 'aai-traversal' branch: 'master' diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index 2fab17bd5..3f40d31e4 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -24,8 +24,8 @@ build-node: centos7-docker-8c-8g project: 'aai/validation' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-validation-settings' diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml deleted file mode 100644 index 26764c615..000000000 --- a/jjb/appc/appc-cdt.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- project: - name: appc-cdt - project-name: 'appc-cdt' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'appc/cdt' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'appc-cdt-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: appc-cdt-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'appc/cdt' - project-name: 'appc-cdt' - branch: 'master' - mvn-settings: 'appc-cdt-settings' - - -- project: - name: appc-cdt-info - project-name: appc-cdt - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: appc/cdt - branch: master diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml index 11bc579b1..0b3324a35 100644 --- a/jjb/appc/appc-csit.yaml +++ b/jjb/appc/appc-csit.yaml @@ -5,11 +5,12 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'appc' + disabled: true recipients: 'tc012c@att.com' stream: - 'master': branch: 'master' functionality: - 'healthcheck': - trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: robot-options: '' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml deleted file mode 100644 index edffd6bf8..000000000 --- a/jjb/appc/appc-deployment.yaml +++ /dev/null @@ -1,80 +0,0 @@ ---- - -- project: - name: appc-deployment - project-name: 'appc-deployment' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - project: 'appc/deployment' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'appc-deployment-settings' - maven-version: "mvn35" - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1804-builder-4c-4g - -- project: - name: appc-deployment-docker - project-name: 'appc-deployment' - jobs: - - 'docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - - 'docker-version-java-daily': - mvn-params: '-Dmaven.test.skip=true' - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - mvn-params: '-Dmaven.test.skip=true -P docker' - maven-versions-plugin: true - mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" - java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'appc/deployment' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'appc-deployment-settings' - maven-version: "mvn35" - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1804-docker-8c-8g - -#- project: -# name: appc-deployment-arm64-docker -# project-name: 'appc-deployment-arm64' -# jobs: -# - 'docker-java-daily': -# mvn-params: '-Dmaven.test.skip=true' -# - 'docker-version-java-daily': -# mvn-params: '-Dmaven.test.skip=true' -# project: 'appc/deployment' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'appc-deployment-settings' -# files: '**' -# archive-artifacts: '' -# docker-pom: 'pom.xml' -# mvn-profile: docker -# build-node: ubuntu1804-docker-arm64-4c-2g - -- project: - name: appc-deployment-info - project-name: appc-deployment - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: appc/deployment - branch: master diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml deleted file mode 100644 index c717284e7..000000000 --- a/jjb/appc/appc-parent.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- project: - name: appc-project-view - project-name: appc - views: - - project-view - -- project: - name: appc-parent - project-name: 'appc-parent' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'appc/parent' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'appc-parent-settings' - maven-version: "mvn35" - build-node: ubuntu1804-builder-4c-4g - -- project: - name: appc-parent-info - project-name: appc-parent - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: appc/parent - branch: master diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index c6c3f56b1..8b267fd24 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - maven-version: "mvn35" + maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -30,8 +30,12 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' 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 @@ -40,7 +44,6 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -59,10 +62,11 @@ project: 'ccsdk/apps' project-name: 'ccsdk-apps' branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" - project: name: ccsdk-apps-clm @@ -74,10 +78,13 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-apps-settings' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g #- project: @@ -111,6 +118,8 @@ project-name: ccsdk-apps jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-apps-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index fcb12894f..80ec2bda7 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -1,16 +1,42 @@ --- - project: - name: ccsdk-csit + name: ccsdk-distribution-csit jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'ccsdk' + - '{project-name}-review-verification-maven-{stream}': + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' + maven-versions-plugin: true + - '{project-name}-merge-verification-maven-{stream}': + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' + maven-versions-plugin: true + project-name: 'ccsdk-distribution' recipients: 'dtimoney@att.com' + # project name in gerrit + project: 'ccsdk/distribution' stream: - 'master': branch: 'master' - functionality: - - 'healthcheck': - trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' + mvn-settings: 'ccsdk-distribution-settings' + robot-options: '' + branch: 'master' + +- project: + name: ccsdk-oran-csit + jobs: + - '{project-name}-review-verification-maven-{stream}': + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' + - '{project-name}-merge-verification-maven-{stream}': + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' + project-name: 'ccsdk-oran' + recipients: 'bjorn.magnusson@est.tech martin.c.yan@est.tech' + # project name in gerrit + project: 'ccsdk/oran' + stream: + - 'master': + branch: 'master' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + mvn-settings: 'ccsdk-oran-settings' robot-options: '' branch: 'master' diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml new file mode 100644 index 000000000..863dedf77 --- /dev/null +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -0,0 +1,89 @@ +--- +- project: + name: ccsdk-oran + project-name: 'ccsdk-oran' + jobs: + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g + sign-artifacts: true + mvn-opts: '-Ddocker.skip=true' + cron: '' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-Dmaven.test.skip=true -P docker' + maven-versions-plugin: true + cron: '@daily' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project: 'ccsdk/oran' + stream: + - 'master': + branch: 'master' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'ccsdk-oran-settings' + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: docker + build-node: ubuntu1804-docker-8c-8g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' + +- project: + name: ccsdk-oran-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'ccsdk/oran' + project-name: 'ccsdk-oran' + stream: + - 'master': + branch: 'master' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'ccsdk-oran-settings' + mvn-opts: '-Ddocker.skip=true' + build-node: ubuntu1804-builder-4c-4g + +- project: + name: ccsdk-oran-info + project: ccsdk/oran + project-name: ccsdk-oran + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: ccsdk-oran-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: 'ccsdk/oran' + project-name: 'ccsdk-oran' + branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'ccsdk-oran-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index beb0c1713..becb461f3 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -1,22 +1,22 @@ --- - project: - name: ccsdk-cds + name: ccsdk-cds-java11 project-name: 'ccsdk-cds' jobs: - - gerrit-maven-verify + - gerrit-maven-verify: + mvn-params: '-Ddocker.skip.push=true -P docker' - gerrit-maven-merge: cron: '@daily' + mvn-params: '-Ddocker.skip.push=true -P docker' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true - maven-versions-plugin: true + mvn-params: '-Dmaven.test.skip=true' cron: '' - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - maven-version: "mvn35" maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': @@ -26,10 +26,51 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' + 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 + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' + +- project: + name: ccsdk-cds-java8 + project-name: 'ccsdk-cds' + jobs: + - gerrit-maven-verify: + mvn-params: '-Ddocker.skip.push=true -P docker' + - gerrit-maven-merge: + cron: '@daily' + mvn-params: '-Ddocker.skip.push=true -P docker' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g + sign-artifacts: true + mvn-params: '-Dmaven.test.skip=true' + cron: '' + - gerrit-maven-docker-stage: + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-Dmaven.test.skip=true -P docker' + maven-versions-plugin: true + cron: '@daily' + + project: 'ccsdk/cds' + stream: - 'frankfurt': branch: 'frankfurt' + java-version: openjdk8 + mvn-version: 'mvn36' 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 @@ -38,8 +79,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu1804-docker-8c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -57,10 +97,11 @@ project: 'ccsdk/cds' project-name: 'ccsdk-cds' branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-cds-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" - project: name: ccsdk-cds-clm @@ -72,13 +113,15 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-cds-settings' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g - - project: name: ccsdk-cds-info project-name: ccsdk-cds @@ -93,6 +136,8 @@ project-name: ccsdk-cds jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-cds-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 353ee2d67..cc87b880f 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -16,7 +16,6 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - maven-version: "mvn35" maven-versions-plugin: true cron: '@daily' @@ -24,6 +23,10 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-dashboard-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 @@ -50,6 +53,8 @@ project: 'ccsdk/dashboard' project-name: 'ccsdk-dashboard' branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-dashboard-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -64,6 +69,10 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-dashboard-settings' build-node: centos7-redis-4c-4g @@ -81,6 +90,8 @@ project-name: ccsdk-dashboard jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-dashboard-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 47e616bf6..a071890a6 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -16,23 +16,24 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - maven-version: "mvn35" maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g + project: 'ccsdk/distribution' stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' - maven-version: "mvn35" docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1804-docker-8c-8g @@ -67,8 +68,12 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-distribution-settings' build-node: ubuntu1804-docker-8c-8g @@ -89,6 +94,8 @@ jobs: - gerrit-whitesource-scan: java-opts: '-Xmx2048m' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-distribution-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 17dd0b477..dafafb35e 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -17,8 +17,12 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' 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 @@ -27,7 +31,6 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' @@ -47,10 +50,11 @@ project: 'ccsdk/features' project-name: 'ccsdk-features' branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' - maven-version: "mvn35" - project: name: ccsdk-features-clm @@ -62,11 +66,14 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-features-settings' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g - project: @@ -84,6 +91,8 @@ project-name: ccsdk-features jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-features-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 0d3a3ee2c..b9de56d01 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -19,8 +19,12 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' 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 @@ -29,7 +33,6 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" - project: name: ccsdk-parent-clm @@ -41,13 +44,13 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-parent-settings' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g - - project: name: ccsdk-parent-info project-name: ccsdk-parent @@ -62,6 +65,8 @@ project-name: ccsdk-parent jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-parent-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml deleted file mode 100644 index ad92332ef..000000000 --- a/jjb/ccsdk/sli-adaptors.yaml +++ /dev/null @@ -1,93 +0,0 @@ ---- -- project: - name: ccsdk-sli-adaptors - project-name: 'ccsdk-sli-adaptors' - jobs: - - gerrit-maven-verify - - gerrit-maven-merge: - cron: '@daily' - - gerrit-maven-stage: - build-node: centos7-builder-4c-4g - sign-artifacts: true - cron: '' - - '{project-name}-maven-javadoc-jobs': - mvn-site-id: ecomp-site - javadoc-path: org.onap.$PROJECT/$STREAM - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'ccsdk/sli/adaptors' - 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 - # in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - maven-version: "mvn35" - build-node: ubuntu1804-builder-4c-4g - mvn-snapshot-id: 'ecomp-snapshots' - nexus-snapshot-repo: 'snapshots' - -- project: - name: ccsdk-sli-adaptors-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'ccsdk/sli/adaptors' - project-name: 'ccsdk-sli-adaptors' - branch: 'master' - mvn-settings: 'ccsdk-sli-adaptors-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" - -- project: - name: ccsdk-sli-adaptors-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'ccsdk/sli/adaptors' - project-name: 'ccsdk-sli-adaptors' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'ccsdk-sli-adaptors-settings' - maven-version: "mvn35" - build-node: ubuntu1804-builder-4c-4g - - -- project: - name: ccsdk-sli-adaptors-info - project-name: ccsdk-sli-adaptors - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: ccsdk/sli/adaptors - branch: master - -- project: - name: ccsdk-sli-adaptors-whitesource - build-node: ubuntu1804-builder-4c-4g - project-name: ccsdk-sli-adaptors - jobs: - - gerrit-whitesource-scan - mvn-settings: 'ccsdk-sli-adaptors-settings' - wss-product-name: ccsdk - mvn-clean-install: true - project: ccsdk/sli/adaptors - branch: master diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml deleted file mode 100644 index d130cb121..000000000 --- a/jjb/ccsdk/sli-northbound.yaml +++ /dev/null @@ -1,92 +0,0 @@ ---- -- project: - name: ccsdk-sli-northbound - project-name: 'ccsdk-sli-northbound' - jobs: - - gerrit-maven-verify - - gerrit-maven-merge: - cron: '@daily' - - gerrit-maven-stage: - build-node: centos7-builder-4c-4g - cron: '' - - '{project-name}-maven-javadoc-jobs': - mvn-site-id: ecomp-site - javadoc-path: org.onap.$PROJECT/$STREAM - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - sign-artifacts: true - project: 'ccsdk/sli/northbound' - 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 - # in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - maven-version: "mvn35" - build-node: ubuntu1804-builder-4c-4g - mvn-snapshot-id: 'ecomp-snapshots' - nexus-snapshot-repo: 'snapshots' - -- project: - name: ccsdk-sli-northbound-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'ccsdk/sli/northbound' - project-name: 'ccsdk-sli-northbound' - branch: 'master' - mvn-settings: 'ccsdk-sli-northbound-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" - -- project: - name: ccsdk-sli-northbound-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'ccsdk/sli/northbound' - project-name: 'ccsdk-sli-northbound' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'ccsdk-sli-northbound-settings' - maven-version: "mvn35" - build-node: ubuntu1804-builder-4c-4g - - -- project: - name: ccsdk-sli-northbound-info - project-name: ccsdk-sli-northbound - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: ccsdk/sli/northbound - branch: master - -- project: - name: ccsdk-sli-northbound-whitesource - project-name: ccsdk-sli-northbound - jobs: - - gerrit-whitesource-scan - mvn-settings: 'ccsdk-sli-northbound-settings' - wss-product-name: ccsdk - mvn-clean-install: true - project: ccsdk/sli/northbound - branch: master diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml deleted file mode 100644 index 4f99ad87d..000000000 --- a/jjb/ccsdk/sli-plugins.yaml +++ /dev/null @@ -1,91 +0,0 @@ ---- -- project: - name: ccsdk-sli-plugins - project-name: 'ccsdk-sli-plugins' - jobs: - - gerrit-maven-verify - - gerrit-maven-merge: - cron: '@daily' - - gerrit-maven-stage: - build-node: centos7-builder-4c-4g - sign-artifacts: true - cron: '' - - '{project-name}-maven-javadoc-jobs': - mvn-site-id: ecomp-site - javadoc-path: org.onap.$PROJECT/$STREAM - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'ccsdk/sli/plugins' - 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 - # in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - maven-version: "mvn35" - build-node: ubuntu1804-builder-4c-4g - mvn-snapshot-id: 'ecomp-snapshots' - nexus-snapshot-repo: 'snapshots' - -- project: - name: ccsdk-sli-plugins-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'ccsdk/sli/plugins' - project-name: 'ccsdk-sli-plugins' - branch: 'master' - mvn-settings: 'ccsdk-sli-plugins-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" - -- project: - name: ccsdk-sli-plugins-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'ccsdk/sli/plugins' - project-name: 'ccsdk-sli-plugins' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'ccsdk-sli-plugins-settings' - maven-version: "mvn35" - - -- project: - name: ccsdk-sli-plugins-info - project-name: ccsdk-sli-plugins - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: ccsdk/sli/plugins - branch: master - -- project: - name: ccsdk-sli-plugins-whitesource - project-name: ccsdk-sli-plugins - jobs: - - gerrit-whitesource-scan - mvn-settings: 'ccsdk-sli-plugins-settings' - wss-product-name: ccsdk - mvn-clean-install: true - project: ccsdk/sli/plugins - branch: master diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli.yaml similarity index 63% rename from jjb/ccsdk/sli-core.yaml rename to jjb/ccsdk/sli.yaml index 0fc6d6c94..299a415b7 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli.yaml @@ -1,7 +1,7 @@ --- - project: - name: ccsdk-sli-core - project-name: 'ccsdk-sli-core' + name: ccsdk-sli + project-name: 'ccsdk-sli' jobs: - gerrit-maven-verify - gerrit-maven-merge: @@ -10,19 +10,20 @@ build-node: centos7-builder-4c-4g sign-artifacts: true cron: '' - - '{project-name}-maven-javadoc-jobs': - mvn-site-id: ecomp-site - javadoc-path: org.onap.$PROJECT/$STREAM - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - project: 'ccsdk/sli/core' + project: 'ccsdk/sli' stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'ccsdk-sli-core-settings' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'ccsdk-sli-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 @@ -30,13 +31,12 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' - project: - name: ccsdk-sli-core-sonar + name: ccsdk-sli-sonar jobs: - gerrit-maven-sonar sonarcloud: true @@ -46,47 +46,52 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1804-builder-4c-4g - project: 'ccsdk/sli/core' - project-name: 'ccsdk-sli-core' + project: 'ccsdk/sli' + project-name: 'ccsdk-sli' branch: 'master' - mvn-settings: 'ccsdk-sli-core-settings' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'ccsdk-sli-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" - project: - name: ccsdk-sli-core-clm + name: ccsdk-sli-clm jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - project: 'ccsdk/sli/core' - project-name: 'ccsdk-sli-core' + project: 'ccsdk/sli' + project-name: 'ccsdk-sli' stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'ccsdk-sli-core-settings' - maven-version: "mvn35" + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'ccsdk-sli-settings' build-node: ubuntu1804-builder-4c-4g - - project: - name: ccsdk-sli-core-info - project-name: ccsdk-sli-core + name: ccsdk-sli-info + project-name: ccsdk-sli jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g - project: ccsdk/sli/core + project: ccsdk/sli branch: master - project: - name: ccsdk-sli-core-whitesource - project-name: ccsdk-sli-core + name: ccsdk-sli-whitesource + project-name: ccsdk-sli jobs: - gerrit-whitesource-scan - mvn-settings: 'ccsdk-sli-core-settings' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'ccsdk-sli-settings' wss-product-name: ccsdk mvn-clean-install: true - project: ccsdk/sli/core + project: ccsdk/sli branch: master diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 3486a30d5..52ab57ddc 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -17,6 +17,8 @@ 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 @@ -38,9 +40,10 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-utils-settings' - - project: name: ccsdk-utils-info project-name: ccsdk-utils @@ -55,6 +58,8 @@ 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 diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index 79b4853f8..d05996f9b 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -3,6 +3,7 @@ name: packer-builder-jobs jobs: - gerrit-packer-merge + - gerrit-packer-verify-build project: ci-management project-name: ci-management @@ -16,11 +17,13 @@ - centos-7 - ubuntu-18.04 templates: builder + update-cloud-image: true - project: name: packer-docker-jobs jobs: - gerrit-packer-merge + - gerrit-packer-verify-build project: ci-management project-name: ci-management @@ -35,11 +38,13 @@ - ubuntu-18.04-arm64 - ubuntu-18.04 templates: docker + update-cloud-image: true - project: name: packer-memcached-jobs jobs: - gerrit-packer-merge + - gerrit-packer-verify-build project: ci-management project-name: ci-management @@ -52,11 +57,13 @@ platforms: - ubuntu-18.04 templates: memcached + update-cloud-image: true - project: name: packer-redis-jobs jobs: - gerrit-packer-merge + - gerrit-packer-verify-build project: ci-management project-name: ci-management @@ -68,11 +75,13 @@ platforms: - centos-7 templates: redis + update-cloud-image: true - project: name: packer-helm-jobs jobs: - gerrit-packer-merge + - gerrit-packer-verify-build project: ci-management project-name: ci-management @@ -84,3 +93,4 @@ platforms: - ubuntu-18.04 templates: helm + update-cloud-image: true diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 8b4d6e5bb..75a6a5ad4 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -5,6 +5,15 @@ views: - project-view +- project: + name: ci-management-info + project-name: ci-management + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: ci-management + branch: master + - project: name: ci-management-jobs jobs: @@ -17,7 +26,7 @@ branch: 'master' build-timeout: '60' build-node: 'centos7-builder-2c-1g' - jjb-version: 2.9.1 + jjb-version: 3.5.0 # configure the gerrit-jjb-verify job build-node-label-check: true build-node-label-list: "" @@ -35,3 +44,23 @@ https://jenkins.onap.org https://jenkins.onap.org/sandbox openstack-cloud: vex + +- project: + name: openstack-update-cloud-images + jobs: + - gerrit-openstack-update-cloud-image + + project: ci-management + project-name: ci-management + branch: master + archive-artifacts: '**/*.log' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + + build-node: centos7-builder-2c-1g + # update-cloud-image: true + build-timeout: 10 + + gerrit-user: "jenkins-$SILO" + gerrit-host: "gerrit.onap.org" + gerrit-topic: "update-cloud-image" + reviewers-email: "onap-jobbuilder@jenkins.onap.org" diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml deleted file mode 100644 index 61f7bd868..000000000 --- a/jjb/clamp/clamp-csit.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- project: - name: clamp-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'clamp' - recipients: 'gervais-martial.ngueko@intl.att.com' - stream: - - 'master': - branch: 'master' - functionality: - - 'APIs': - trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' - - 'UIs': - trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' - robot-options: '' diff --git a/jjb/clamp/dashboard/clamp-dashboard.yaml b/jjb/clamp/dashboard/clamp-dashboard.yaml deleted file mode 100644 index ce70c1903..000000000 --- a/jjb/clamp/dashboard/clamp-dashboard.yaml +++ /dev/null @@ -1,72 +0,0 @@ ---- -- project: - name: clamp-dashboard-project-view - project-name: clamp-dashboard - views: - - project-view - -- project: - name: clamp-dashboard - project-name: 'clamp-dashboard' - jobs: - - gerrit-maven-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - - '{project-name}-{stream}-verify-java-checkstyle': - mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' - - '{project-name}-{stream}-merge-properties-java': - mvn_properties: - - docker.pull.registry=nexus3.onap.org:10001 - - docker.push.registry=nexus3.onap.org:10003 - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'clamp/dashboard' - stream: - - 'master': - branch: 'master' - mvn-settings: 'clamp-settings' - java-version: openjdk11 - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - -#- project: -# name: clamp-dashboard-sonar -# jobs: -# - gerrit-maven-sonar: -# mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' -# 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: 'clamp/dashboard' -# project-name: 'clamp-dashboard' -# branch: 'master' -# mvn-settings: 'clamp-settings' -# mvn-goals: 'clean install' -# mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' -# java-version: openjdk11 -# -- project: - name: clamp-dashboard-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' - nexus-iq-namespace: 'onap-' - project: 'clamp/dashboard' - project-name: 'clamp-dashboard' - branch: 'master' - mvn-settings: 'clamp-settings' - build-node: ubuntu1804-docker-8c-8g - build-timeout: 120 - java-version: openjdk11 diff --git a/jjb/clamp/ui/info-clamp-ui.yaml b/jjb/clamp/ui/info-clamp-ui.yaml deleted file mode 100644 index c532356df..000000000 --- a/jjb/clamp/ui/info-clamp-ui.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: clamp-ui-info - project-name: clamp-ui - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: clamp/ui - branch: master diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 4d1f3de26..3f182ec90 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -7,6 +7,7 @@ - project: name: cli + java-version: openjdk11 project-name: 'cli' jobs: - '{project-name}-{stream}-verify-java' @@ -31,8 +32,12 @@ build-node: ubuntu1804-docker-8c-8g project: 'cli' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + java-version: openjdk11 + - 'frankfurt': + branch: 'frankfurt' + java-version: openjdk8 mvn-settings: 'cli-settings' files: '**' archive-artifacts: '' @@ -58,6 +63,7 @@ # - project: name: cli-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -76,6 +82,7 @@ - project: name: cli-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml new file mode 100644 index 000000000..fd3aae010 --- /dev/null +++ b/jjb/cps/cps-cps-tbdmt.yaml @@ -0,0 +1,82 @@ +--- +- project: + name: cps-tbdmt-project-view + project-name: cps-cps-tbdmt + views: + - project-view + +- project: + name: cps-tbdmt-info + project: cps/cps-tbdmt + project-name: cps-cps-tbdmt + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: cps-tbdmt-clm + java-version: openjdk11 + mvn-version: "mvn36" + maven-version: "mvn36" + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: cps/cps-tbdmt + project-name: cps-cps-tbdmt + branch: 'master' + mvn-settings: 'cps-cps-tbdmt-settings' + build-node: centos7-docker-8c-8g + +- project: + name: cps-tbdmt + java-version: openjdk11 + mvn-version: "mvn36" + maven-version: "mvn36" + project-name: cps-cps-tbdmt + project: cps/cps-tbdmt + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' + jobs: + - gerrit-maven-verify: + mvn-goals: 'clean install' + - gerrit-maven-merge + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker' + 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 + stream: + - 'master': + branch: 'master' + mvn-settings: 'cps-cps-tbdmt-settings' + files: '**' + archive-artifacts: '' + build-node: centos7-docker-8c-8g + +- project: + name: cps-tbdmt-sonar + java-version: openjdk11 + mvn-version: "mvn36" + maven-version: "mvn36" + 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: centos7-docker-8c-8g + project: cps/cps-tbdmt + project-name: cps-cps-tbdmt + branch: 'master' + mvn-settings: 'cps-cps-tbdmt-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml new file mode 100644 index 000000000..129e2993e --- /dev/null +++ b/jjb/cps/cps-cps-temporal.yaml @@ -0,0 +1,95 @@ +--- +- project: + name: cps-cps-temporal-project-view + project-name: cps-cps-temporal + views: + - project-view + +- project: + name: cps-cps-temporal-info + project: cps/cps-temporal + project-name: cps-cps-temporal + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: cps-cps-temporal + java-version: openjdk11 + mvn-version: mvn36 + maven-version: mvn36 + project-name: cps-cps-temporal + project: cps/cps-temporal + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' + jobs: + - gerrit-maven-verify + - gerrit-maven-merge + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-params: -Pdocker + 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 + stream: + - 'master': + branch: master + mvn-settings: cps-cps-temporal-settings + files: '**' + archive-artifacts: '' + build-node: centos7-docker-8c-8g + +- project: + name: cps-cps-temporal-clm + java-version: openjdk11 + mvn-version: mvn36 + maven-version: mvn36 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: onap- + project: cps/cps-temporal + project-name: cps-cps-temporal + branch: master + mvn-settings: cps-cps-temporal-settings + build-node: centos7-docker-8c-8g + +- project: + name: cps-cps-temporal-sonar + java-version: openjdk11 + mvn-version: mvn36 + maven-version: mvn36 + 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: centos7-docker-8c-8g + project: cps/cps-temporal + project-name: cps-cps-temporal + branch: master + mvn-settings: cps-cps-temporal-settings + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: cps-cps-temporal-whitesource + project-name: cps-cps-temporal + jobs: + - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: mvn36 + mvn-settings: cps-cps-temporal-settings + wss-product-name: cps-cps-temporal + mvn-clean-install: true + project: cps/cps-temporal + branch: master + build-node: centos7-docker-8c-8g diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml new file mode 100644 index 000000000..4c8a98170 --- /dev/null +++ b/jjb/cps/cps-csit.yaml @@ -0,0 +1,22 @@ +--- +- project: + name: cps-csit + jobs: + - '{project-name}-review-verification-maven-{stream}': + mvn-goals: clean install + mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push=' + - '{project-name}-merge-verification-maven-{stream}': + mvn-goals: clean install + mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push=' + project-name: 'cps' + recipients: 'toine.siebelink@est.tech' + # project name in gerrit + project: 'cps' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + mvn-settings: 'cps-settings' + robot-options: '' + branch: 'master' diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml new file mode 100644 index 000000000..cecfb790d --- /dev/null +++ b/jjb/cps/cps.yaml @@ -0,0 +1,97 @@ +--- +- project: + name: cps-project-view + project-name: cps + views: + - project-view + +- project: + name: cps-info + project: cps + project-name: cps + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: cps-clm + java-version: openjdk11 + mvn-version: "mvn36" + maven-version: "mvn36" + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'cps' + project-name: 'cps' + branch: 'master' + mvn-settings: 'cps-settings' + build-node: centos7-docker-8c-8g + +- project: + name: cps + java-version: openjdk11 + mvn-version: "mvn36" + maven-version: "mvn36" + project-name: 'cps' + project: 'cps' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: "-P cps-ncmp-docker" + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P cps-ncmp-docker' + 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 + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + mvn-settings: 'cps-settings' + files: '**' + archive-artifacts: '' + build-node: centos7-docker-8c-8g + +- project: + name: cps-sonar + java-version: openjdk11 + mvn-version: "mvn36" + maven-version: "mvn36" + 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: centos7-docker-8c-8g + project: 'cps' + project-name: 'cps' + branch: 'master' + mvn-settings: 'cps-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: cps-whitesource + project-name: cps + jobs: + - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'cps-settings' + wss-product-name: cps + mvn-clean-install: true + project: cps + branch: master + build-node: centos7-docker-8c-8g diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 6d3327f90..f82be7b17 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -6,9 +6,11 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 # apply to all jobs project: 'dcaegen2/analytics/tca-gen2' mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml deleted file mode 100644 index e0e4c059f..000000000 --- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml +++ /dev/null @@ -1,69 +0,0 @@ ---- -- project: - name: dcaegen2-analytics-tca - - # job template iterators - project-name: 'dcaegen2-analytics-tca' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - # apply to all jobs - project: 'dcaegen2/analytics/tca' - mvn-settings: 'dcaegen2-analytics-tca-settings' - files: '**' - maven-deploy-properties: | - deployAtEnd=true - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - jobs: - - '{project-name}-{stream}-verify-java': - mvn-params: '-DskipTests=true' - - '{project-name}-{stream}-merge-java' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-params: '-DskipTests=true' - -- project: - name: dcaegen2-analytics-tca-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'dcaegen2/analytics/tca' - project-name: 'dcaegen2-analytics-tca' - branch: 'master' - mvn-settings: 'dcaegen2-analytics-tca-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-analytics-tca-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'dcaegen2/analytics/tca' - project-name: 'dcaegen2-analytics-tca' - branch: 'master' - build-node: ubuntu1804-builder-4c-4g - mvn-settings: 'dcaegen2-analytics-tca-settings' - -- project: - name: dcaegen2-analytics-tca-info - project-name: dcaegen2-analytics-tca - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: dcaegen2/analytics/tca - branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml index 47c31a636..54f54db83 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml @@ -11,9 +11,7 @@ functionality: - 'ManagementInterface-suite': trigger_jobs: - - '{project-name}-{stream}-docker-java-shell-daily' - 'Functional-suite': trigger_jobs: - - '{project-name}-{stream}-docker-java-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 3f4f91155..d0ef104cd 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,8 +6,11 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 # apply to all jobs project: 'dcaegen2/collectors/datafile' mvn-settings: 'dcaegen2-collectors-datafile-settings' @@ -47,6 +50,7 @@ project: 'dcaegen2/collectors/datafile' project-name: 'dcaegen2-collectors-datafile' branch: 'master' + java-version: openjdk11 mvn-settings: 'dcaegen2-collectors-datafile-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -60,6 +64,7 @@ build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-collectors-datafile' branch: 'master' + java-version: openjdk11 mvn-settings: 'dcaegen2-collectors-datafile-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index 3ab5a7401..db6d27dc5 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -6,11 +6,12 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' - java-version: openjdk11 + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' # apply to all jobs + java-version: openjdk11 project: 'dcaegen2/collectors/hv-ves' mvn-settings: 'dcaegen2-collectors-hv-ves-settings' files: '**' diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 7c72a1676..141d09b4a 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -2,6 +2,7 @@ - project: name: dcaegen2-collectors-restconf project-name: 'dcaegen2-collectors-restconf' + java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -21,8 +22,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'dcaegen2-collectors-restconf-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -35,6 +38,7 @@ - project: name: dcaegen2-collectors-restconf-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -53,6 +57,7 @@ - project: name: dcaegen2-collectors-restconf-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -65,6 +70,7 @@ - project: name: dcaegen2-collectors-restconf-info project-name: dcaegen2-collectors-restconf + java-version: openjdk11 jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index c2d604a97..a29412da0 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -2,28 +2,35 @@ - project: name: dcaegen2-collectors-snmptrap project-name: 'dcaegen2-collectors-snmptrap' - jobs: - - '{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' + python-version: python3 + tox-dir: '.' stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + build-node: ubuntu1804-docker-8c-8g mvn-settings: 'dcaegen2-collectors-snmptrap-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 + jobs: + - '{project-name}-python-jobs' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + archive-artifacts: '' + container-tag-method: latest + nexus-iq-namespace: 'onap-' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: '.*' maven-deploy-properties: | deployAtEnd=true + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-docker-8c-8g' + - project: name: dcaegen2-collectors-snmptrap-sonar @@ -43,17 +50,6 @@ mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' -- project: - name: dcaegen2-collectors-snmptrap-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dcaegen2/collectors/snmptrap - build-node: ubuntu1804-docker-8c-8g - project-name: 'dcaegen2-collectors-snmptrap' - branch: 'master' - mvn-settings: 'dcaegen2-collectors-snmptrap-settings' - - project: name: dcaegen2-collectors-snmptrap-info project-name: dcaegen2-collectors-snmptrap diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 889623774..8db729a24 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -22,8 +22,12 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - '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 @@ -55,6 +59,7 @@ - project: name: dcaegen2-collectors-ves-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index c5b80e4e2..200cf55e8 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -12,10 +12,10 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'dcaegen2-deployments-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-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index 7d571508b..70c49f444 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -12,8 +12,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'dcaegen2-platform-blueprints-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-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index 221e0f521..a0e3d3247 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -23,13 +23,17 @@ # build docker image - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - gerrit-release-verify - - gerrit-release-merge + - gerrit-release-verify: + build-node: centos7-docker-8c-8g + - gerrit-release-merge: + build-node: centos7-docker-8c-8g stream: - master: branch: master - - frankfurt: - branch: frankfurt + - guilin: + branch: guilin + - honolulu: + branch: honolulu - project: name: dcaegen2-platform-configbinding-sonar diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 0aaf8c9cc..4187a9ba7 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -12,8 +12,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'dcaegen2-platform-deployment-handler-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-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml index 1268c50b2..fbf33b4f8 100644 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml @@ -92,20 +92,18 @@ - 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 - - frankfurt: - branch: frankfurt + - guilin: + branch: guilin + - honolulu: + branch: honolulu + views: - project-view: project-name: dcaegen2-platform-adapter - project-view: project-name: dcaegen2-platform-mod - - project-view: - project-name: dcaegen2-platform-oti jobs: - dcaegen2-docker-python-jobs diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index 69d3ba1a1..698a5cd12 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -21,9 +21,11 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: 'dcaegen2-platform-inventory-api-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-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml index de506f82d..b3f2a2f50 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml @@ -22,11 +22,34 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: 'dcaegen2-platform-settings' maven-deploy-properties: | deployAtEnd=true files: '**' archive-artifacts: '' build-node: 'ubuntu1804-docker-8c-8g' + +- project: + name: dcaegen2-platform-mod-bpgenerator-sonar + java-version: openjdk11 + 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: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-mod-bpgenerator' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f mod/bpgenerator/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml index 5a8a62345..59eaa948b 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml @@ -15,8 +15,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: dcaegen2-platform-settings files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml index 73ffe09c0..f2858c767 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -15,8 +15,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' 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 abea091ef..db490f79f 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml @@ -15,8 +15,11 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: dcaegen2-platform-settings files: '**' archive-artifacts: '' @@ -24,6 +27,7 @@ - project: name: dcaegen2-platform-mod-runtimeapi-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -43,6 +47,7 @@ - project: name: dcaegen2-platform-mod-runtimeapi-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml new file mode 100644 index 000000000..fe6aa1553 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml @@ -0,0 +1,28 @@ +--- +- project: + name: dcaegen2-platform-mod2-assembly + project-name: dcaegen2-platform-mod2 + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - assembly: + pom: 'mod2/assembly/pom.xml' + pattern: 'mod2/assembly/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: dcaegen2-platform-settings + maven-version: 'mvn35' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml new file mode 100644 index 000000000..0a9e77f0d --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml @@ -0,0 +1,61 @@ +--- +- project: + name: dcaegen2-platform-mod2-auth-service + project-name: dcaegen2-platform-mod2 + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - auth-service: + pom: 'mod2/auth-service/pom.xml' + pattern: 'mod2/auth-service/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: dcaegen2-platform-settings + maven-version: 'mvn35' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + +- project: + name: dcaegen2-platform-mod2-auth-service-sonar + java-version: openjdk11 + 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: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-mod2-auth-service' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f mod2/auth-service/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-mod2-auth-service-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + build-node: ubuntu1804-docker-8c-8g + project: 'dcaegen2/platform' + project-name: dcaegen2-platform-mod2-auth-service-clm + mvn-params: '-f mod2/auth-service/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml new file mode 100644 index 000000000..37dfd4d4b --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml @@ -0,0 +1,61 @@ +--- +- project: + name: dcaegen2-platform-mod2-catalog-service + project-name: dcaegen2-platform-mod2 + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - catalog-service: + pom: 'mod2/catalog-service/pom.xml' + pattern: 'mod2/catalog-service/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: dcaegen2-platform-settings + maven-version: 'mvn35' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + +- project: + name: dcaegen2-platform-mod2-catalog-service-sonar + java-version: openjdk11 + 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: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-mod2-catalog-service' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f mod2/catalog-service/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-mod2-catalog-service-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + build-node: ubuntu1804-docker-8c-8g + project: 'dcaegen2/platform' + project-name: dcaegen2-platform-mod2-catalog-service-clm + mvn-params: '-f mod2/catalog-service/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml new file mode 100644 index 000000000..fd80f8b93 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml @@ -0,0 +1,61 @@ +--- +- project: + name: dcaegen2-platform-mod2-ui + project-name: dcaegen2-platform-mod2 + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - ui: + pom: 'mod2/ui/pom.xml' + pattern: 'mod2/ui/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: dcaegen2-platform-settings + maven-version: 'mvn35' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + +- project: + name: dcaegen2-platform-mod2-ui-sonar + java-version: openjdk11 + 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: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-mod2-ui' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f mod2/ui/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-mod2-ui-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + build-node: ubuntu1804-docker-8c-8g + project: 'dcaegen2/platform' + project-name: dcaegen2-platform-mod2-ui-clm + mvn-params: '-f mod2/ui/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml deleted file mode 100644 index bf5c6c485..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml +++ /dev/null @@ -1,85 +0,0 @@ ---- -- project: - name: dcaegen2-platform-oti-event-proc - project-name: dcaegen2-platform-oti - # git repo - project: dcaegen2/platform - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java': - mvn-goals: 'clean install' - subproject: - - eventproc: - pom: 'oti/event-proc/pom.xml' - pattern: 'oti/event-proc/**' - stream: - - 'master': - branch: 'master' - mvn-settings: dcaegen2-platform-settings - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - -- project: - name: dcaegen2-platform-oti-event-proc-release - project: 'dcaegen2/platform' - project-name: 'dcaegen2-platform-oti-event-proc' - jobs: - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - version-properties-file: 'oti/event-proc/version.properties' - mvn-pom: 'oti/event-proc/pom.xml' - mvn-params: '-f oti/event-proc/pom.xml' - mvn-goals: 'clean deploy -Ddockerfile.skip -f oti/event-proc/pom.xml' - pattern: 'oti/event-proc/**' - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - mvn-goals: 'clean package dockerfile:build dockerfile:push -f oti/event-proc/pom.xml' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - pattern: 'oti/event-proc/**' - - stream: - - 'master': - branch: 'master' - mvn-settings: 'dcaegen2-platform-settings' - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-docker-8c-8g' - -- project: - name: dcaegen2-platform-oti-event-proc-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: 'dcaegen2/platform' - project-name: 'dcaegen2-platform-oti-event-proc' - branch: 'master' - mvn-settings: 'dcaegen2-platform-settings' - mvn-params: '-f oti/event-proc/pom.xml' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - - -- project: - name: dcaegen2-platform-oti-event-proc-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - build-node: ubuntu1804-docker-8c-8g - project: 'dcaegen2/platform' - project-name: dcaegen2-platform-oti-event-proc-clm - mvn-params: '-f oti/event-proc/pom.xml' - branch: 'master' - mvn-settings: 'dcaegen2-platform-settings' - diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index af7d87469..50f3ffc40 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -11,8 +11,12 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + python-version: python3 + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + 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-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index 07722a5e3..bffea624d 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -2,27 +2,51 @@ - project: name: dcaegen2-platform-policy-handler project-name: 'dcaegen2-platform-policy-handler' - jobs: - - '{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/platform/policy-handler' + python-version: python3 + tox-dir: '.' stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + build-node: ubuntu1804-docker-8c-8g + build-timeout: 45 mvn-settings: 'dcaegen2-platform-policy-handler-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 + jobs: + - '{project-name}-python-jobs' + - gerrit-docker-verify + - gerrit-docker-merge: + post_docker_build_script: | + #!/bin/bash + set -uex -o pipefail + DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}} + DNAME={container-snapshot-registry}/{docker-name} + docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2 + docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest + docker push $DNAME:$DOCKER_IMAGE_TAG2 + docker push $DNAME:latest + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + archive-artifacts: '' + nexus-iq-namespace: 'onap-' maven-deploy-properties: | deployAtEnd=true + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-docker-8c-8g' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: '.*' + container-tag-method: latest + docker-root: '.' + docker-name: onap/org.onap.dcaegen2.platform.policy-handler + docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh + + - project: name: dcaegen2-platform-policy-handler-sonar diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 4f5f99764..1cbe59e31 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -21,8 +21,11 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: 'dcaegen2-platform-servicechange-handler-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -38,6 +41,7 @@ jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' + java-version: openjdk11 project: dcaegen2/platform/servicechange-handler build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-platform-servicechange-handler' diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml new file mode 100644 index 000000000..77a9468fa --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml @@ -0,0 +1,69 @@ +--- +- project: + name: dcaegen2-platform-ves-openapi-manager + project-name: 'dcaegen2-platform-ves-openapi-manager' + java-version: openjdk11 + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean package docker:build docker:push' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'dcaegen2/platform/ves-openapi-manager' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + 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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1804-docker-8c-8g' + +- project: + name: dcaegen2-platform-ves-openapi-sonar + java-version: openjdk11 + 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: 'dcaegen2/platform/ves-openapi-manager' + project-name: 'dcaegen2-platform-ves-openapi-manager' + branch: 'master' + mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + + +- project: + name: dcaegen2-platform-ves-openapi-manager-project-view + project-name: dcaegen2-platform-ves-openapi-manager + views: + - project-view + +- project: + name: dcaegen2-platform-ves-openapi-manager-info + project: dcaegen2/platform/ves-openapi-manager + project-name: dcaegen2-platform-ves-openapi-manager + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml index 776eea238..b336f35c9 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -14,10 +14,11 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' - java-version: openjdk11 + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-version: 'mvn35' maven-deploy-properties: | diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 468b07a86..a9efd7210 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -13,8 +13,12 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + maven-version: 'mvn35' mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true @@ -44,8 +48,11 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true @@ -72,11 +79,48 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' pattern: 'components/datalake-handler/**' + stream: + - 'master': + branch: 'master' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: 'dcaegen2-services-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1804-docker-8c-8g' + +- project: + name: dcaegen2-services-datalake-handler-des-release + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-datalake-handler-des' + 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: ubuntu1804-docker-8c-8g + mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/des/pom.xml' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + pattern: 'components/datalake-handler/**' stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true @@ -86,6 +130,7 @@ - project: name: dcaegen2-services-datalake-handler-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml index 3c2c28c43..e5ec5e600 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -54,8 +54,8 @@ pattern: '{src-dir}/.*' jobs: - gerrit-tox-verify: - stream: master - branch: 'master' + stream: all + branch: '*' - gerrit-docker-verify - gerrit-docker-merge: post_docker_build_script: | @@ -91,8 +91,10 @@ stream: - master: branch: master - - frankfurt: - branch: frankfurt + - guilin: + branch: guilin + - honolulu: + branch: honolulu 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 47fa28b1f..83511be29 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -13,8 +13,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' 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 new file mode 100644 index 000000000..d42b2cff3 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml @@ -0,0 +1,87 @@ +--- +- project: + name: dcaegen2-services-kpi-computation-ms-verify + project-name: 'dcaegen2-services' + project: 'dcaegen2/services' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + subproject: + - 'kpi-computation-ms': + pom: 'components/kpi-computation-ms/pom.xml' + pattern: 'components/kpi-computation-ms/**' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: 'dcaegen2-services-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1804-docker-8c-8g' + maven-deploy-properties: | + deployAtEnd=true + +- project: + name: dcaegen2-services-kpi-computation-ms-release + project-name: 'dcaegen2-services-kpi-computation-ms' + project: 'dcaegen2/services' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-pom: 'components/kpi-computation-ms/pom.xml' + mvn-params: '-f components/kpi-computation-ms/pom.xml' + pattern: 'components/kpi-computation-ms/**' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean package docker:build -DpushImageTag' + mvn-params: '-f components/kpi-computation-ms/pom.xml' + pattern: 'components/kpi-computation-ms/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: 'dcaegen2-services-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1804-docker-8c-8g' + maven-deploy-properties: | + deployAtEnd=true + +- project: + name: dcaegen2-services-kpi-computation-ms-sonar + java-version: openjdk11 + 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: 'dcaegen2/services' + project-name: 'dcaegen2-services-kpi-computation-ms' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' + mvn-goals: 'clean install' + mvn-params: '-f components/kpi-computation-ms/pom.xml' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-kpi-computation-ms-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: dcaegen2/services + build-node: ubuntu1804-docker-8c-8g + project-name: 'dcaegen2-services-kpi-computation-ms-clm' + mvn-params: '-f components/kpi-computation-ms/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 6690f2037..f10064d2b 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -2,6 +2,7 @@ - project: name: dcaegen2-services-mapper project-name: 'dcaegen2-services-mapper' + java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -11,7 +12,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g - mvn-goals: 'clean package docker:build -DpushImage' + mvn-goals: 'clean package docker:build -DpushImageTag' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -21,8 +22,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'dcaegen2-services-mapper-settings' files: '**' archive-artifacts: '' @@ -32,6 +35,7 @@ - project: name: dcaegen2-services-mapper-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -50,6 +54,7 @@ - project: name: dcaegen2-services-mapper-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -62,6 +67,7 @@ - project: name: dcaegen2-services-mapper-info project-name: dcaegen2-services-mapper + java-version: openjdk11 jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 55c5e90db..383f9e821 100755 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,9 +6,11 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 # apply to all jobs project: 'dcaegen2/services/pm-mapper' mvn-settings: 'dcaegen2-services-pm-mapper-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml index a05d6ff27..b68e769b0 100644 --- a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml @@ -11,6 +11,7 @@ functionality: - 'pmmapper': trigger_jobs: - - '{project-name}-{stream}-docker-java-shell-daily' + - 'files-processing-config-pmmapper': + trigger_jobs: robot-options: '' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 051c958a0..9ab8eac07 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -20,10 +20,11 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' - java-version: openjdk11 + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-prh-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index d8500b8ca..0c686efa9 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -16,10 +16,11 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' - java-version: openjdk11 + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-sdk-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml new file mode 100644 index 000000000..8c57bea18 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml @@ -0,0 +1,15 @@ +- project: + name: dcaegen2-services-slice-analysis-ms-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-services-slice-analysis-ms' + recipients: 'vv770d@att.com ahila.pandaram@wipro.com niranjana.y60@wipro.com' + stream: + - 'master': + branch: 'master' + functionality: + - 'testsuites': + trigger_jobs: + - '{project-name}-{stream}-merge-java' + robot-options: '' diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml new file mode 100644 index 000000000..71374e27c --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml @@ -0,0 +1,91 @@ +--- +- project: + name: dcaegen2-services-slice-analysis-ms-verify + project-name: 'dcaegen2-services' + project: 'dcaegen2/services' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + subproject: + - 'slice-analysis-ms': + pom: 'components/slice-analysis-ms/pom.xml' + pattern: 'components/slice-analysis-ms/**' + stream: + - 'master': + branch: 'master' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: 'dcaegen2-services-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1804-docker-8c-8g' + maven-deploy-properties: | + deployAtEnd=true + +- project: + name: dcaegen2-services-slice-analysis-ms-release + project-name: 'dcaegen2-services-slice-analysis-ms' + project: 'dcaegen2/services' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-pom: 'components/slice-analysis-ms/pom.xml' + mvn-params: '-f components/slice-analysis-ms/pom.xml' + pattern: 'components/slice-analysis-ms/**' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean package docker:build -DpushImageTag' + mvn-params: '-f components/slice-analysis-ms/pom.xml' + pattern: 'components/slice-analysis-ms/**' + stream: + - 'master': + branch: 'master' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-settings: 'dcaegen2-services-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1804-docker-8c-8g' + maven-deploy-properties: | + deployAtEnd=true + +- project: + name: dcaegen2-services-slice-analysis-ms-sonar + java-version: openjdk11 + 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: 'dcaegen2/services' + project-name: 'dcaegen2-services-slice-analysis-ms' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' + mvn-goals: 'clean install' + mvn-params: '-f components/slice-analysis-ms/pom.xml' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-slice-analysis-ms-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: dcaegen2/services + build-node: ubuntu1804-docker-8c-8g + project-name: 'dcaegen2-services-slice-analysis-ms-clm' + mvn-params: '-f components/slice-analysis-ms/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml new file mode 100644 index 000000000..34b4a63ce --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml @@ -0,0 +1,15 @@ +- project: + name: dcaegen2-services-son-handler-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-services-son-handler' + recipients: 'vv770d@att.com reshmasree.chamarthi2@wipro.com niranjana.y60@wipro.com' + stream: + - 'master': + branch: 'master' + functionality: + - 'testsuites': + trigger_jobs: + - '{project-name}-{stream}-merge-java' + robot-options: '' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index c400367d9..a13da5539 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -21,9 +21,11 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-son-handler-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index f0f2c748a..73289f8ad 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -13,8 +13,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' 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-ves-prh-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml index f1edafc4e..11f333aef 100644 --- a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml @@ -23,8 +23,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' functionality: - 'prh-testsuites' trigger_jobs: diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 318949a4b..6cc6bf7e5 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -19,6 +19,10 @@ branch: 'master' - 'frankfurt': branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' 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/demo/demo.yaml b/jjb/demo/demo.yaml index e7bf8fba5..1c27a3d7b 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -22,6 +22,10 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' - 'frankfurt': branch: 'frankfurt' mvn-settings: 'demo-settings' @@ -82,3 +86,5 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml deleted file mode 100644 index 1362bc788..000000000 --- a/jjb/dmaap/dmaap-buscontroller-csit.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- project: - name: dmaap-buscontroller-csit - jobs: - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'dmaap-buscontroller' - stream: 'master' - disabled: false - functionality: - - 'ssl': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' - - 'with_mr': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' - - 'with_dr': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' - robot-options: '' - branch: 'master' diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 39a6a379c..3136272a6 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -9,7 +9,6 @@ name: dmaap-buscontroller-java11 project-name: 'dmaap-buscontroller' jobs: - - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -22,16 +21,14 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' mvn-settings: 'dmaap-buscontroller-settings' files: '**' archive-artifacts: '' java-version: openjdk11 - project: - name: dmaap-buscontroller-java8 - project-name: 'dmaap-buscontroller' + name: dmaap-buscontroller-maintenance-java11 + project-name: 'dmaap-buscontroller-maintenance' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -42,15 +39,52 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/buscontroller' stream: - - 'elalto': - branch: 'elalto' + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-buscontroller-settings' files: '**' archive-artifacts: '' - java-version: openjdk8 + java-version: openjdk11 + cron: '' -# removed sonar job from this template because this repo only builds a docker container -# and the 0% coverage report from Sonar was causing repeated escalations. +- project: + name: dmaap-buscontroller-csit + jobs: + - '{project-name}-review-verification-maven-{stream}': + mvn-goals: clean install + mvn-params: '-P docker -DskipTests=true' + - '{project-name}-merge-verification-maven-{stream}': + mvn-goals: clean install + mvn-params: '-P docker' + project-name: 'dmaap-buscontroller' + recipients: 'fiachra.corcoran@est.tech' + project: 'dmaap/buscontroller' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dmaap-buscontroller-settings' + robot-options: '' + +- project: + name: dmaap-buscontroller-sonar + jobs: + - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: '{sonar_mvn_goal}' + cron: '@daily' + build-node: ubuntu1804-builder-4c-4g + project: 'dmaap/buscontroller' + project-name: 'dmaap-buscontroller' + branch: 'master' + mvn-settings: 'dmaap-buscontroller-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: dmaap-buscontroller-clm @@ -61,6 +95,7 @@ project-name: 'dmaap-buscontroller' branch: 'master' mvn-settings: 'dmaap-buscontroller-settings' + java-version: openjdk11 - project: name: dmaap-buscontroller-info diff --git a/jjb/dmaap/dmaap-csit.yaml b/jjb/dmaap/dmaap-csit.yaml deleted file mode 100644 index 77126de68..000000000 --- a/jjb/dmaap/dmaap-csit.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: dmaap-csit - jobs: - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'dmaap' - recipients: 'ms5838@att.com' - stream: 'master' - functionality: - - 'mrpubsub': - trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' - robot-options: '' - branch: 'master' diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml deleted file mode 100644 index 254e445ed..000000000 --- a/jjb/dmaap/dmaap-datarouter-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: dmaap-datarouter-csit-ssl - jobs: - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'dmaap-datarouter' - stream: - - 'master': - branch: 'master' - functionality: - - 'ssl-dr-suite': - trigger_jobs: - - '{project-name}-maven-docker-stage-{stream}' - robot-options: '' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index ffd5a2d8e..b79f2ed54 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -1,3 +1,4 @@ +--- - project: name: dmaap-datarouter-java11 project-name: 'dmaap-datarouter' @@ -6,6 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true mvn-goals: 'clean package -P docker docker:build docker:push' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -20,28 +22,45 @@ archive-artifacts: '' java-version: openjdk11 - - project: - name: dmaap-datarouter-java8 - project-name: 'dmaap-datarouter' + name: dmaap-datarouter-maintenance-java11 + project-name: 'dmaap-datarouter-maintenance' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true mvn-goals: 'clean package -P docker docker:build docker:push' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/datarouter' stream: - - 'frankfurt': - branch: 'frankfurt' - - 'elalto': - branch: 'elalto' + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-datarouter-settings' files: '**' archive-artifacts: '' - java-version: openjdk8 + java-version: openjdk11 + cron: '' + +- project: + name: dmaap-datarouter-csit-ssl + jobs: + - '{project-name}-{stream}-csit-{functionality}' + - '{project-name}-{stream}-verify-csit-{functionality}' + project-name: 'dmaap-datarouter' + recipients: 'fiachra.corcoran@est.tech' + stream: + - 'master': + branch: 'master' + functionality: + - 'ssl-dr-suite': + trigger_jobs: + - '{project-name}-maven-docker-stage-{stream}' + robot-options: '' - project: name: dmaap-datarouter-sonar diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml deleted file mode 100644 index 4eeafa958..000000000 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ /dev/null @@ -1,92 +0,0 @@ ---- -- project: - name: dmaap-dbcapi-java11 - project-name: 'dmaap-dbcapi' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'dmaap/dbcapi' - mvn-settings: 'dmaap-dbcapi-settings' - java-version: openjdk11 - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - # 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: '' - -- project: - name: dmaap-dbcapi-java8 - project-name: 'dmaap-dbcapi' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - project: 'dmaap/dbcapi' - mvn-settings: 'dmaap-dbcapi-settings' - java-version: openjdk8 - stream: - - 'elalto': - branch: 'elalto' - # 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: '' - - -- project: - name: dmaap-dbcapi-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'dmaap/dbcapi' - project-name: 'dmaap-dbcapi' - branch: 'master' - mvn-settings: 'dmaap-dbcapi-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - java-version: openjdk11 - -- project: - name: dmaap-dbcapi-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dmaap/dbcapi - project-name: 'dmaap-dbcapi' - branch: 'master' - mvn-settings: 'dmaap-dbcapi-settings' - java-version: openjdk11 - -- project: - name: dmaap-dbcapi-info - project-name: dmaap-dbcapi - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: dmaap/dbcapi - branch: master diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml deleted file mode 100644 index 1b3bfa6f8..000000000 --- a/jjb/dmaap/dmaap-kafka-docker.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- project: - name: dmaap-kafka-docker - project-name: 'dmaap-kafka-docker' - jobs: - - gerrit-maven-docker-stage: - build-node: ubuntu1804-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': - build-node: centos7-docker-8c-8g - project: 'dmaap/kafka11aaf' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dmaap-kafka11aaf-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - build-node: ubuntu1804-docker-8c-8g - -- project: - name: dmaap-kafka-docker-info - project-name: dmaap-kafka-docker - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: dmaap/kafka11aaf - branch: master diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml deleted file mode 100644 index 350eb0308..000000000 --- a/jjb/dmaap/dmaap-kafka.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- project: - name: dmaap-kafka - project-name: 'dmaap-kafka' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - project: 'dmaap/kafka11aaf' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dmaap-kafka11aaf-settings' - -- project: - name: dmaap-kafka-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'dmaap/kafka11aaf' - project-name: 'dmaap-kafka' - branch: 'master' - mvn-settings: 'dmaap-kafka11aaf-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dmaap-kafka-info - project-name: dmaap-kafka - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: dmaap/kafka11aaf - branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 6549204a2..3e7ba92bd 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -1,7 +1,7 @@ --- - project: - name: dmaap-messagerouter-dmaapclient - project-name: 'dmaap-messagerouter-dmaapclient' + name: dmaap-messagerouter-dmaapclient-java11 + project-name: 'dmaap-messagerouter-dmaapclient-java11' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -18,6 +18,28 @@ mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' files: '**' archive-artifacts: '' + java-version: openjdk11 + +- project: + name: dmaap-messagerouter-dmaapclient-maintenance + project-name: 'dmaap-messagerouter-dmaapclient-maintenance' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'dmaap/messagerouter/dmaapclient' + stream: + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' + mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' + files: '**' + archive-artifacts: '' + cron: '' - project: name: dmaap-messagerouter-dmaapclient-sonar @@ -36,6 +58,7 @@ mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: dmaap-messagerouter-dmaapclient-clm @@ -46,6 +69,7 @@ project-name: 'dmaap-messagerouter-dmaapclient' branch: 'master' mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' + java-version: openjdk11 - project: name: dmaap-messagerouter-dmaapclient-info diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml deleted file mode 100644 index 82c12d3d3..000000000 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- - -- project: - name: dmaap-messagerouter-docker - project-name: 'dmaap-messagerouter-docker' - jobs: - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - mvn-params: '-P docker -Dmaven.test.skip=true' - 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/messagerouter/messageservice' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dmaap-messagerouter-messageservice-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - build-node: ubuntu1804-docker-8c-8g - -- project: - name: dmaap-messagerouter-docker-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dmaap/messagerouter/messageservice - project-name: 'dmaap-messagerouter-docker' - build-node: ubuntu1804-docker-8c-8g - branch: 'master' - mvn-settings: 'dmaap-messagerouter-messageservice-settings' - -- project: - name: dmaap-messagerouter-docker-info - project-name: dmaap-messagerouter-docker - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: dmaap/messagerouter/messageservice - branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-kafka.yaml b/jjb/dmaap/dmaap-messagerouter-kafka.yaml new file mode 100644 index 000000000..42c312b94 --- /dev/null +++ b/jjb/dmaap/dmaap-messagerouter-kafka.yaml @@ -0,0 +1,72 @@ +--- +- project: + name: dmaap-kafka + project-name: 'dmaap-kafka' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-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': + build-node: centos7-docker-8c-8g + project: 'dmaap/kafka11aaf' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dmaap-kafka11aaf-settings' + files: '**' + archive-artifacts: '' + +- project: + name: dmaap-kafka-maintenance + project-name: 'dmaap-kafka-maintenance' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-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: 'dmaap/kafka11aaf' + stream: + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' + mvn-settings: 'dmaap-kafka11aaf-settings' + files: '**' + archive-artifacts: '' + cron: '' + +- project: + name: dmaap-kafka-sonar + jobs: + - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: '{sonar_mvn_goal}' + cron: '@daily' + build-node: ubuntu1804-builder-4c-4g + project: 'dmaap/kafka11aaf' + project-name: 'dmaap-kafka' + branch: 'master' + mvn-settings: 'dmaap-kafka11aaf-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dmaap-kafka-info + project-name: dmaap-kafka + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: dmaap/kafka11aaf + branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 3c0df034a..9ad2d2e23 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -1,22 +1,69 @@ --- - project: - name: dmaap-messagerouter-messageservice - project-name: 'dmaap-messagerouter-messageservice' + name: dmaap-messagerouter-messageservice-java-11 + project-name: 'dmaap-messagerouter-messageservice-java-11' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + mvn-params: '-P docker -Dmaven.test.skip=true' 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/messagerouter/messageservice' stream: - 'master': branch: 'master' mvn-settings: 'dmaap-messagerouter-messageservice-settings' + java-version: openjdk11 files: '**' archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + +- project: + name: dmaap-messagerouter-messageservice-maintenance + project-name: 'dmaap-messagerouter-messageservice-maintenance' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + mvn-params: '-P docker -Dmaven.test.skip=true' + maven-versions-plugin: true + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'dmaap/messagerouter/messageservice' + stream: + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' + mvn-settings: 'dmaap-messagerouter-messageservice-settings' + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + cron: '' + +- project: + name: dmaap-csit + jobs: + - '{project-name}-{stream}-csit-{functionality}' + - '{project-name}-{stream}-verify-csit-{functionality}' + project-name: 'dmaap' + recipients: 'fiachra.corcoran@est.tech' + stream: + - 'master': + branch: 'master' + functionality: + - 'mrpubsub': + trigger_jobs: + - '{project-name}-maven-docker-stage-{stream}' + robot-options: '' - project: name: dmaap-messagerouter-messageservice-sonar @@ -35,6 +82,7 @@ mvn-settings: 'dmaap-messagerouter-messageservice-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: dmaap-messagerouter-messageservice-clm @@ -45,6 +93,7 @@ project-name: 'dmaap-messagerouter-messageservice' branch: 'master' mvn-settings: 'dmaap-messagerouter-messageservice-settings' + java-version: openjdk11 - project: name: dmaap-messagerouter-messageservice-info diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 331176ad3..1d476f91c 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -11,7 +11,6 @@ maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - project: 'dmaap/messagerouter/mirroragent' stream: - 'master': @@ -20,6 +19,27 @@ files: '**' archive-artifacts: '' +- project: + name: dmaap-messagerouter-mirroragent-maintenance + project-name: 'dmaap-messagerouter-mirroragent-maintenance' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true8g + project: 'dmaap/messagerouter/mirroragent' + stream: + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' + mvn-settings: 'dmaap-messagerouter-mirroragent-settings' + files: '**' + archive-artifacts: '' + cron: '' + - project: name: dmaap-messagerouter-mirroragent-sonar jobs: diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index 2d872f748..69dee313b 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -1,7 +1,7 @@ --- - project: - name: dmaap-messagerouter-msgrtr - project-name: 'dmaap-messagerouter-msgrtr' + name: dmaap-messagerouter-msgrtr-java-11 + project-name: 'dmaap-messagerouter-msgrtr-java-11' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -11,14 +11,35 @@ maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - project: 'dmaap/messagerouter/msgrtr' stream: - 'master': branch: 'master' mvn-settings: 'dmaap-messagerouter-msgrtr-settings' + java-version: openjdk11 + files: '**' + archive-artifacts: '' + +- project: + name: dmaap-messagerouter-msgrtr + project-name: 'dmaap-messagerouter-msgrtr' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'dmaap/messagerouter/msgrtr' + stream: + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' + mvn-settings: 'dmaap-messagerouter-msgrtr-settings' files: '**' archive-artifacts: '' + cron: '' - project: name: dmaap-messagerouter-msgrtr-sonar @@ -37,6 +58,7 @@ mvn-settings: 'dmaap-messagerouter-msgrtr-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: dmaap-messagerouter-msgrtr-clm @@ -47,6 +69,7 @@ project-name: 'dmaap-messagerouter-msgrtr' branch: 'master' mvn-settings: 'dmaap-messagerouter-msgrtr-settings' + java-version: openjdk11 - project: name: dmaap-messagerouter-msgrtr-info diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml similarity index 62% rename from jjb/dmaap/dmaap-zookeeper.yaml rename to jjb/dmaap/dmaap-messagerouter-zookeeper.yaml index 4a0b523bd..3258275e9 100644 --- a/jjb/dmaap/dmaap-zookeeper.yaml +++ b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml @@ -3,16 +3,28 @@ name: dmaap-zookeeper project-name: 'dmaap-zookeeper' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + mvn-params: '-P docker -Dmaven.test.skip=true' + 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': branch: 'master' mvn-settings: 'dmaap-zookeeper-settings' + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + build-node: ubuntu1804-docker-8c-8g + - project: - name: dmaap-zookeeper-docker - project-name: 'dmaap-zookeeper-docker' + name: dmaap-zookeeper-maintenance + project-name: 'dmaap-zookeeper-maintenance' jobs: - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -20,18 +32,19 @@ 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': - branch: 'master' + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-zookeeper-settings' files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: 'docker' build-node: ubuntu1804-docker-8c-8g + cron: '' - project: name: dmaap-zookeeper-info diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml index be97b2943..d4e542404 100644 --- a/jjb/doc/doc-templates-rtd.yaml +++ b/jjb/doc/doc-templates-rtd.yaml @@ -82,8 +82,7 @@ mv docs/_build/html "$WORKSPACE/archives/" publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for merging/publishing Sphinx/Restructured Text at RTD @@ -160,6 +159,4 @@ - shell: !include-raw: doc-post-rtd.sh publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - + - lf-infra-publish diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index c71411251..f9f2cf267 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -18,16 +18,8 @@ rtdproject: 'onap/58810/' mvn-settings: 'doc-settings' stream: - - amsterdam: - branch: 'amsterdam' - - beijing: - branch: 'beijing' - - casablanca: - branch: 'casablanca' - - dublin: - branch: 'dublin' - - elalto: - branch: 'elalto' + - frankfurt: + branch: 'frankfurt' - project: name: doc-info diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index 7620cca0c..6bda3cba0 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -67,7 +67,7 @@ - project: name: externalapi-nbi-sonar jobs: - - gerrit-maven-sonar + - gerrit-maven-sonar-prescan-script sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' @@ -82,6 +82,7 @@ mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' java-version: openjdk11 + sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - project: name: externalapi-nbi-info diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 74479f299..e29f27883 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -11,6 +11,9 @@ build-artifact-days-to-keep: -1 build-artifact-num-to-keep: 5 + failure-notification: "releng+onap@linuxfoundation.org" + failure-notification-prefix: "[releng]" + # lf-infra defaults lftools-version: <1.0.0 @@ -56,7 +59,7 @@ # SonarCloud sonarcloud_project_organization: onap sonarcloud_api_token: da97604dfdc36ec82488a97ebea96ad01f7b10ff - sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar" + sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.8.0.2131:sonar" # Nexus3 docker registries container-public-registry: nexus3.onap.org:10001 diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 13afecf1c..0c614bf85 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -239,35 +239,6 @@ new-normal: 1 new-low: 1 -- publisher: - name: infra-shiplogs - # lf-infra macro to finish up a build. - # - # Handles the following: - # - Shipping logs to Nexus logs site repository - # - Cleanup workspace - publishers: - - postbuildscript: - builders: - - role: BOTH - build-on: - - ABORTED - - FAILURE - - NOT_BUILT - - SUCCESS - - UNSTABLE - build-steps: - - lf-infra-sysstat - - lf-infra-ship-logs - mark-unstable-if-failed: true - - workspace-cleanup: - exclude: - # Do not clean up *.jenkins-trigger files for jobs that use a - # properties file as input for triggering another build. - - '**/*.jenkins-trigger' - fail-build: false - - # SCMS - scm: name: git-scm diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index eecedd464..23a554ba9 100644 --- a/jjb/global-templates-docker.yaml +++ b/jjb/global-templates-docker.yaml @@ -127,52 +127,6 @@ # Provided all steps have already passed, push the docker image - shell: !include-raw: ../shell/docker-push.sh -- job-template: - name: '{project-name}-{stream}-merge-docker-cascade-trigger' - # Job template for Docker merge jobs - # - # The purpose of this job template is to run a docker build, and potentially - # test validation of the docker image. This job is triggered by the it's corresponding - # job that builds the artifacts from which the docker image is built from. Projects - # using the {project-name}-{stream}-merge-docker job should move to this job. Because - # the {project-name}-{stream}-merge-docker has no garanties that the docker image is built - # from merged artifact. - - <<: *docker_job_boiler_plate - # yamllint disable-line rule:key-duplicates - <<: *docker_merge_boiler_plate - - builders: - - lf-infra-pre-build - - lf-infra-docker-login: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: '{pre_build_script}' - - inject: - # Docker registry is purposely not using an '_' so as to not conflict - # with the Jenkins global env var - properties-content: | - DOCKER_ARGS={docker_build_args} - DOCKER_NAME={docker_name} - DOCKER_ROOT={docker_root} - DOCKER_TAG={docker_tag} - BUILD_MODE=SNAPSHOT - DOCKERREGISTRY={docker_registry} - # Do the docker build - - shell: !include-raw: ../shell/docker-build.sh - - inject: - # Import the docker image information from the build step - properties-file: 'env_inject.txt' - # Execute any post build clean-up or testing - - shell: '{post_build_script}' - # Provided all steps have already passed, push the docker image - - shell: !include-raw: ../shell/docker-push.sh - triggers: - - reverse: - jobs: - - '{parent_job}' - result: 'success' - - job-template: name: '{project-name}-{stream}-verify-docker' # Job template for Docker verify jobs @@ -212,565 +166,6 @@ # Execute any post build clean-up or testing - shell: '{post_build_script}' -- job-template: - name: '{project-name}-{stream}-verify-docker-cascade-trigger' - # Job template for Docker verify jobs - # - # The purpose of this job template is to run a docker build, and potentially - # test validation of the docker image. This job is triggered by the it's corresponding - # job that builds the artifacts from which the docker image is built from. Projects - # using the {project-name}-{stream}-verify-docker job should move to this job. Because - # the {project-name}-{stream}-verify-docker has no garanties that the docker image is built - # from merged artifact. - - ###################### - # Default parameters # - ###################### - - <<: *docker_job_boiler_plate - # yamllint disable-line rule:key-duplicates - <<: *docker_verify_boiler_plate - - builders: - - lf-infra-pre-build - - lf-infra-docker-login: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: '{pre_build_script}' - - inject: - # Docker registry is purposely not using an '_' so as to not conflict - # with the Jenkins global env var - properties-content: | - DOCKER_ARGS={docker_build_args} - DOCKER_NAME={docker_name} - DOCKER_ROOT={docker_root} - DOCKER_TAG={docker_tag} - BUILD_MODE=SNAPSHOT - DOCKERREGISTRY={docker_registry} - # Do the docker build - - shell: !include-raw: ../shell/docker-build.sh - - inject: - # Import the docker image information from the build step - properties-file: 'env_inject.txt' - # Execute any post build clean-up or testing - - shell: '{post_build_script}' - triggers: - - reverse: - jobs: - - '{parent_job}' - result: 'success' - -- job-template: - name: '{project-name}-{stream}-release-version-docker-daily-no-sonar' - # Job template for Docker daily release jobs - # - # The purpose of this job template is to run "docker build and docker push" - # for projects using this template. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - <<: *docker_job_boiler_plate - - docker_registry: '$DOCKER_REGISTRY:10003' - - scm: - - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '$GIT_URL/$PROJECT' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: true - submodule-timeout: '{submodule-timeout}' - submodule-disable: '{submodule-disable}' - choosing-strategy: default - - builders: - - lf-infra-pre-build - - lf-infra-docker-login: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: '{pre_build_script}' - - inject: - # Docker registry is purposely not using an '_' so as to not conflict - # with the Jenkins global env var - properties-content: | - DOCKER_ARGS={docker_build_args} - DOCKER_NAME={docker_name} - DOCKER_ROOT={docker_root} - DOCKER_TAG={docker_tag} - DOCKERREGISTRY={docker_registry} - BUILD_MODE=STAGING - - # Do the docker build - - shell: !include-raw: ../shell/snapshot-strip.sh - - shell: !include-raw: ../shell/docker-build.sh - - inject: - # Import the docker image information from the build step - properties-file: 'env_inject.txt' - # Execute any post build clean-up or testing - - shell: '{post_build_script}' - # Provided all steps have already passed, push the docker image - - shell: !include-raw: ../shell/docker-push.sh - - triggers: - # 11 AM UTC - - timed: '@daily' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - -- job-template: - name: '{project-name}-{stream}-release-version-docker-daily-no-sonar-cascade-trigger' - # Job template for Docker daily release job. - # - # The purpose of this job template is to run "docker build and docker push" - # for projects using this template. This job is triggered by the daily build - # that builds the artifacts required for building the Docker image. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - <<: *docker_job_boiler_plate - - docker_registry: '$DOCKER_REGISTRY:10003' - - scm: - - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '$GIT_URL/$PROJECT' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: true - submodule-timeout: '{submodule-timeout}' - submodule-disable: '{submodule-disable}' - choosing-strategy: default - - builders: - - lf-infra-pre-build - - lf-infra-docker-login: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: '{pre_build_script}' - - inject: - # Docker registry is purposely not using an '_' so as to not conflict - # with the Jenkins global env var - properties-content: | - DOCKER_ARGS={docker_build_args} - DOCKER_NAME={docker_name} - DOCKER_ROOT={docker_root} - DOCKER_TAG={docker_tag} - DOCKERREGISTRY={docker_registry} - BUILD_MODE=STAGING - - # Do the docker build - - shell: !include-raw: ../shell/snapshot-strip.sh - - shell: !include-raw: ../shell/docker-build.sh - - inject: - # Import the docker image information from the build step - properties-file: 'env_inject.txt' - # Execute any post build clean-up or testing - - shell: '{post_build_script}' - # Provided all steps have already passed, push the docker image - - shell: !include-raw: ../shell/docker-push.sh - - triggers: - - reverse: - jobs: - - '{parent_job}' - result: 'success' - -- job-template: - name: '{project-name}-{subproject}-{stream}-merge-docker' - # Job template for Docker merge jobs - # - # The purpose of this job template is to run a docker build, and potentially - # test validation of the docker image - - <<: *docker_job_boiler_plate - # yamllint disable-line rule:key-duplicates - <<: *docker_merge_boiler_plate - - builders: - - lf-infra-pre-build - - lf-infra-docker-login: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: '{pre_build_script}' - - inject: - # Docker registry is purposely not using an '_' so as to not conflict - # with the Jenkins global env var - properties-content: | - DOCKER_ARGS={docker_build_args} - DOCKER_NAME={docker_name} - DOCKER_ROOT={docker_root} - DOCKER_TAG={docker_tag} - DOCKERREGISTRY={docker_registry} - BUILD_MODE=SNAPSHOT - # Do the docker build - - shell: !include-raw: ../shell/docker-build.sh - - inject: - # Import the docker image information from the build step - properties-file: 'env_inject.txt' - # Execute any post build clean-up or testing - - shell: '{post_build_script}' - # Provided all steps have already passed, push the docker image - - shell: !include-raw: ../shell/docker-push.sh - -- job-template: - name: '{project-name}-{subproject}-{stream}-merge-docker-cascade-trigger' - # Job template for Docker merge jobs - # - # The purpose of this job template is to run a docker build, and potentially - # test validation of the docker image. This job is triggered by the merge job - # that builds the artifacts required for building the Docker image. - - <<: *docker_job_boiler_plate - # yamllint disable-line rule:key-duplicates - <<: *docker_merge_boiler_plate - - builders: - - lf-infra-pre-build - - lf-infra-docker-login: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: '{pre_build_script}' - - inject: - # Docker registry is purposely not using an '_' so as to not conflict - # with the Jenkins global env var - properties-content: | - DOCKER_ARGS={docker_build_args} - DOCKER_NAME={docker_name} - DOCKER_ROOT={docker_root} - DOCKER_TAG={docker_tag} - DOCKERREGISTRY={docker_registry} - BUILD_MODE=SNAPSHOT - # Do the docker build - - shell: !include-raw: ../shell/docker-build.sh - - inject: - # Import the docker image information from the build step - properties-file: 'env_inject.txt' - # Execute any post build clean-up or testing - - shell: '{post_build_script}' - # Provided all steps have already passed, push the docker image - - shell: !include-raw: ../shell/docker-push.sh - triggers: - - reverse: - jobs: - - '{parent_job}' - result: 'success' - -- job-template: - name: '{project-name}-{subproject}-{stream}-verify-docker' - # Job template for Docker verify jobs - # - # The purpose of this job template is to run a docker build, and potentially - # test validation of the docker image - - ###################### - # Default parameters # - ###################### - - <<: *docker_job_boiler_plate - # yamllint disable-line rule:key-duplicates - <<: *docker_verify_boiler_plate - - builders: - - lf-infra-pre-build - - lf-infra-docker-login: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: '{pre_build_script}' - - inject: - # Docker registry is purposely not using an '_' so as to not conflict - # with the Jenkins global env var - properties-content: | - DOCKER_ARGS={docker_build_args} - DOCKER_NAME={docker_name} - DOCKER_ROOT={docker_root} - DOCKER_TAG={docker_tag} - DOCKERREGISTRY={docker_registry} - BUILD_MODE=SNAPSHOT - # Do the docker build - - shell: !include-raw: ../shell/docker-build.sh - - inject: - # Import the docker image information from the build step - properties-file: 'env_inject.txt' - # Execute any post build clean-up or testing - - shell: '{post_build_script}' - -- job-template: - name: '{project-name}-{subproject}-{stream}-verify-docker-cascade-trigger' - # Job template for Docker verify jobs - # - # The purpose of this job template is to run a docker build, and potentially - # test validation of the docker image - - ###################### - # Default parameters # - ###################### - - <<: *docker_job_boiler_plate - # yamllint disable-line rule:key-duplicates - <<: *docker_verify_boiler_plate - - builders: - - lf-infra-pre-build - - lf-infra-docker-login: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: '{pre_build_script}' - - inject: - # Docker registry is purposely not using an '_' so as to not conflict - # with the Jenkins global env var - properties-content: | - DOCKER_ARGS={docker_build_args} - DOCKER_NAME={docker_name} - DOCKER_ROOT={docker_root} - DOCKER_TAG={docker_tag} - DOCKERREGISTRY={docker_registry} - BUILD_MODE=SNAPSHOT - # Do the docker build - - shell: !include-raw: ../shell/docker-build.sh - - inject: - # Import the docker image information from the build step - properties-file: 'env_inject.txt' - # Execute any post build clean-up or testing - - shell: '{post_build_script}' - triggers: - - reverse: - jobs: - - '{parent_job}' - result: 'success' - -- job-template: - name: '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar' - # Job template for Docker daily release jobs - # - # The purpose of this job template is to run "docker build and docker push" - # for projects using this template. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - <<: *docker_job_boiler_plate - - docker_registry: '$DOCKER_REGISTRY:10003' - - scm: - - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '$GIT_URL/$PROJECT' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: true - submodule-timeout: '{submodule-timeout}' - submodule-disable: '{submodule-disable}' - choosing-strategy: default - - builders: - - lf-infra-pre-build - - lf-infra-docker-login: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: '{pre_build_script}' - - inject: - # Docker registry is purposely not using an '_' so as to not conflict - # with the Jenkins global env var - properties-content: | - DOCKER_ARGS={docker_build_args} - DOCKER_NAME={docker_name} - DOCKER_ROOT={docker_root} - DOCKER_TAG={docker_tag} - DOCKERREGISTRY={docker_registry} - BUILD_MODE=STAGING - - # Do the docker build - - shell: !include-raw: ../shell/snapshot-strip.sh - - shell: !include-raw: ../shell/docker-build.sh - - inject: - # Import the docker image information from the build step - properties-file: 'env_inject.txt' - # Execute any post build clean-up or testing - - shell: '{post_build_script}' - # Provided all steps have already passed, push the docker image - - shell: !include-raw: ../shell/docker-push.sh - - triggers: - # 11 AM UTC - - timed: '@daily' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - -- job-template: - name: '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar-cascade-trigger' - # Job template for Docker daily release jobs - # - # The purpose of this job template is to run "docker build and docker push" - # for projects using this template. This job is triggered by the daily job - # that builds the artifacts required for building the Docker image. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - <<: *docker_job_boiler_plate - - docker_registry: '$DOCKER_REGISTRY:10003' - - scm: - - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '$GIT_URL/$PROJECT' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: true - submodule-timeout: '{submodule-timeout}' - submodule-disable: '{submodule-disable}' - choosing-strategy: default - - builders: - - lf-infra-pre-build - - lf-infra-docker-login: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: '{pre_build_script}' - - inject: - # Docker registry is purposely not using an '_' so as to not conflict - # with the Jenkins global env var - properties-content: | - DOCKER_ARGS={docker_build_args} - DOCKER_NAME={docker_name} - DOCKER_ROOT={docker_root} - DOCKER_TAG={docker_tag} - DOCKERREGISTRY={docker_registry} - BUILD_MODE=STAGING - - # Do the docker build - - shell: !include-raw: ../shell/snapshot-strip.sh - - shell: !include-raw: ../shell/docker-build.sh - - inject: - # Import the docker image information from the build step - properties-file: 'env_inject.txt' - # Execute any post build clean-up or testing - - shell: '{post_build_script}' - # Provided all steps have already passed, push the docker image - - shell: !include-raw: ../shell/docker-push.sh - - triggers: - - reverse: - jobs: - - '{parent_job}' - result: 'success' - -- job-template: - name: '{project-name}-{subproject}-{stream}-release-version-docker-no-sonar' - # Job template for Docker final release job - # - # The purpose of this job template is to run "docker build and docker push" - # for projects using this template. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - <<: *docker_job_boiler_plate - - docker_registry: '$DOCKER_REGISTRY:10003' - - scm: - - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '$GIT_URL/$PROJECT' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: true - submodule-timeout: '{submodule-timeout}' - submodule-disable: '{submodule-disable}' - choosing-strategy: default - - builders: - - lf-infra-pre-build - - lf-infra-docker-login: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: '{pre_build_script}' - - inject: - # Docker registry is purposely not using an '_' so as to not conflict - # with the Jenkins global env var - properties-content: | - DOCKER_ARGS={docker_build_args} - DOCKER_NAME={docker_name} - DOCKER_ROOT={docker_root} - DOCKER_TAG={docker_tag} - DOCKERREGISTRY={docker_registry} - BUILD_MODE=STAGING - - # Do the docker build - - shell: !include-raw: ../shell/snapshot-strip.sh - - shell: !include-raw: ../shell/docker-build.sh - - inject: - # Import the docker image information from the build step - properties-file: 'env_inject.txt' - # Execute any post build clean-up or testing - - shell: '{post_build_script}' - # Provided all steps have already passed, push the docker image - - shell: !include-raw: ../shell/docker-push.sh - -- job-template: - name: '{project-name}-{subproject}-{stream}-release-version-docker-cascade-trigger-no-sonar' - # Job template for Docker final release job - # - # The purpose of this job template is to run "docker build and docker push" - # for projects using this template. This job has no cascading counterpart, because the - # final release is moved manually to the release repo. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - <<: *docker_job_boiler_plate - - docker_registry: '$DOCKER_REGISTRY:10003' - - scm: - - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '$GIT_URL/$PROJECT' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - submodule-recursive: true - submodule-timeout: '{submodule-timeout}' - submodule-disable: '{submodule-disable}' - choosing-strategy: default - - builders: - - lf-infra-pre-build - - lf-infra-docker-login: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: '{pre_build_script}' - - inject: - # Docker registry is purposely not using an '_' so as to not conflict - # with the Jenkins global env var - properties-content: | - DOCKER_ARGS={docker_build_args} - DOCKER_NAME={docker_name} - DOCKER_ROOT={docker_root} - DOCKER_TAG={docker_tag} - DOCKERREGISTRY={docker_registry} - BUILD_MODE=STAGING - - # Do the docker build - - shell: !include-raw: ../shell/snapshot-strip.sh - - shell: !include-raw: ../shell/docker-build.sh - - inject: - # Import the docker image information from the build step - properties-file: 'env_inject.txt' - # Execute any post build clean-up or testing - - shell: '{post_build_script}' - # Provided all steps have already passed, push the docker image - - shell: !include-raw: ../shell/docker-push.sh - triggers: - - reverse: - jobs: - - '{parent_job}' - result: 'success' - - job-template: # Job template for creating a docker manifest list # @@ -905,3 +300,6 @@ predefined-parameters: | PARENT_JOB_NAME=$JOB_NAME DOCKERHUB_REGISTRY=docker.io + + publishers: + - lf-infra-publish diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index 4d48b871f..72004dc8d 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -68,8 +68,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for Golang verify jobs with subproject support @@ -139,8 +138,7 @@ make deploy publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for building & pushing docker images @@ -169,7 +167,6 @@ branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' - scm: - gerrit-trigger-scm: refspec: '' @@ -200,5 +197,4 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index a147e1a51..4f7db3386 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -18,9 +18,8 @@ post_build_script: '' pre_build_script: '' submodule-disable: false - submodule-recursive: true submodule-timeout: 10 - build-timeout: 120 + build-timeout: 240 ##################### # Job Configuration # @@ -52,7 +51,7 @@ # JOB TEMPLATES # ################# - job-template: - name: '{project-name}-{stream}-verify-helm' + name: '{project-name}-{stream}-verify-{helm_bin}' # Job template for helm verify jobs <<: *helm_job_boiler_plate @@ -70,10 +69,13 @@ server: '{server-name}' project: '{project}' branch: '{branch}' + helm_bin: '{helm_bin}' files: '{files}' builders: - lf-infra-pre-build + - shell: | + echo "export HELM_BIN={helm_bin}" > helm.prop - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' @@ -101,6 +103,8 @@ - lf-provide-maven-settings: global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' - lf-infra-create-netrc: @@ -148,6 +152,8 @@ - inject: properties-content: 'HELM_MODULE={helm-module}' - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' @@ -189,6 +195,8 @@ - lf-provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' - lf-infra-create-netrc: @@ -200,7 +208,7 @@ - lf-provide-maven-settings-cleanup - job-template: - name: '{project-name}-{stream}-stage-helm' + name: '{project-name}-{stream}-release-helm' # Job template for Helm stage jobs <<: *helm_job_boiler_plate @@ -212,25 +220,25 @@ submodule-recursive: '{submodule-recursive}' triggers: - - pollscm: - cron: '0 22 * * *' - gerrit: trigger-on: - comment-added-contains-event: - comment-contains-value: '^stage-helm$' + comment-contains-value: '^release-helm$' builders: - lf-infra-pre-build - lf-provide-maven-settings: global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' - lf-infra-create-netrc: server-id: oom-helm - inject: properties-content: | - BUILD_TYPE=staging + BUILD_TYPE=release - shell: '{obj:post_build_script}' - lf-provide-maven-settings-cleanup @@ -243,6 +251,8 @@ disabled: true builders: - lf-infra-pre-build + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' @@ -256,6 +266,8 @@ disabled: true builders: - lf-infra-pre-build + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' @@ -282,6 +294,8 @@ builders: - lf-infra-pre-build + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' @@ -293,4 +307,3 @@ server: '{server-name}' project: '{project}' branch: '{branch}' - diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 60f1ad6f5..ff021db1c 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -75,8 +75,7 @@ global-settings-type: cfp publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for Java verify jobs running checkstyle at the end @@ -93,9 +92,9 @@ <<: *verify_java_defaults name: '{project-name}-{stream}-verify-java-checkstyle' + publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - checkstyle-result - job-template: @@ -134,75 +133,6 @@ branch: '{branch}' files: '{obj:pattern}' -- job-template: - # Job template for Java daily release jobs - # - # The purpose of this job template is to run: - # 1. maven clean deploy with Sonar scans - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - - name: '{project-name}-{stream}-release-java-daily' - - project-type: freestyle - node: '{build-node}' - disabled: '{disabled}' - maven-deploy-properties: - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # 11 AM UTC - - timed: '@daily' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - - builders: - - lf-infra-pre-build - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - - maven-target: - maven-version: '{maven-version}' - goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - properties: - - '{maven-deploy-properties}' - java-opts: - - '-Xmx4096m -XX:MaxPermSize=512m' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - - job-template: # Job template for Java daily release jobs running checkstyle at the end # When checkstyle will be fully incorporated, it is meant to replace @@ -273,9 +203,9 @@ settings-type: cfp global-settings: 'global-settings' global-settings-type: cfp + publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - checkstyle-result-daily - job-template: @@ -350,8 +280,7 @@ global-settings-type: cfp publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: &merge_java_defaults # Job template for Java merge jobs @@ -394,8 +323,9 @@ submodule-recursive: '{submodule-recursive}' wrappers: - - infra-wrappers: + - lf-infra-wrappers: build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - gerrit-trigger-patch-merged: @@ -433,8 +363,7 @@ properties: '{obj:mvn_properties}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for Java merge jobs based on @@ -520,6 +449,7 @@ project-type: freestyle node: '{build-node}' disabled: '{disabled}' + java-version: openjdk8 properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -555,6 +485,9 @@ builders: - lf-infra-pre-build + - lf-update-java-alternatives: + java-version: "{java-version}" + - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -570,8 +503,7 @@ mvn-params: '{mvn-params}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for Docker daily jobs @@ -656,8 +588,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for building & pushing docker images @@ -725,8 +656,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for building & pushing docker images @@ -801,8 +731,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for building & pushing docker images @@ -880,8 +809,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: &docker_version_java_defaults # Job template for building & pushing docker images @@ -958,8 +886,7 @@ mvn-params: '{mvn-params}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for building & pushing docker images @@ -999,6 +926,7 @@ node: '{build-node}' docker-image-name: '' disabled: '{disabled}' + java-version: 'openjdk8' properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1034,6 +962,8 @@ builders: - lf-infra-pre-build + - lf-update-java-alternatives: + java-version: "{java-version}" - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1066,8 +996,7 @@ - shell: !include-raw-escape: include-docker-push.sh publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for Java merge jobs for SDC specific repos @@ -1086,6 +1015,8 @@ builders: - lf-infra-pre-build + - lf-update-java-alternatives: + java-version: "{java-version}" - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index 6480daa81..6f3c8363d 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -68,9 +68,7 @@ tox publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - + - lf-infra-publish - job-template: # Job template for docker daily jobs for 3 SCMs @@ -130,6 +128,6 @@ properties-file: version.properties - docker-login - shell: '{script}' + publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index 831c77049..20735ae62 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -124,10 +124,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - - + - lf-infra-publish # vim: sw=2 ts=2 sts=2 et : @@ -197,8 +194,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for two scm and script trigger - for docker daily release @@ -265,5 +261,4 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 5a3c5cbe3..94d9d3af6 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -15,13 +15,18 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + java-version: openjdk11 - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - + java-version: openjdk11 project: 'holmes/common' stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'holmes-common-settings' files: '**' archive-artifacts: '' @@ -45,6 +50,7 @@ mvn-settings: 'holmes-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: holmes-common-clm @@ -55,6 +61,7 @@ project-name: 'holmes-common' branch: 'master' mvn-settings: 'holmes-common-settings' + java-version: openjdk11 - project: name: holmes-common-info diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index c27a6267c..2b6aeef26 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -9,15 +9,22 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + java-version: openjdk11 - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g + java-version: openjdk11 - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g + java-version: openjdk11 project: 'holmes/engine-management' stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'holmes-engine-management-settings' files: '**' archive-artifacts: '' @@ -43,6 +50,7 @@ mvn-settings: 'holmes-engine-management-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: holmes-engine-management-clm @@ -53,6 +61,7 @@ project-name: 'holmes-engine-management' branch: 'master' mvn-settings: 'holmes-engine-management-settings' + java-version: openjdk11 - project: name: holmes-engine-management-info diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index fee52ac63..00791b131 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -9,15 +9,22 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + java-version: openjdk11 - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g + java-version: openjdk11 - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g + java-version: openjdk11 project: 'holmes/rule-management' stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'holmes-rule-management-settings' files: '**' archive-artifacts: '' @@ -43,6 +50,7 @@ mvn-settings: 'holmes-rule-management-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: holmes-rule-management-clm @@ -53,6 +61,7 @@ project-name: 'holmes-rule-management' branch: 'master' mvn-settings: 'holmes-rule-management-settings' + java-version: openjdk11 - project: name: holmes-rule-management-info diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh index 9ca248c7d..d10b0f014 100644 --- a/jjb/integration/include-raw-integration-install-robotframework.sh +++ b/jjb/integration/include-raw-integration-install-robotframework.sh @@ -18,12 +18,12 @@ set -exu # Make sure pip itself us up-to-date. pip install --upgrade pip -pip install --upgrade --no-binary pycparser pycparser -pip install --upgrade pyOpenSSL==16.2.0 docker-py importlib requests scapy netifaces netaddr ipaddr simplejson demjson -pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library,xvfb}} +pip install --no-binary pycparser==2.20 pycparser==2.20 +pip install pyOpenSSL==16.2.0 docker-py==1.10.6 importlib==1.0.4 requests==2.25.1 scapy==2.4.4 netifaces==0.10.9 netaddr==0.8.0 ipaddr==2.2.0 simplejson==3.17.2 demjson==2.2.4 +pip install robotframework-httplibrary==0.4.2 robotframework-requests==0.8.2 robotframework-sshlibrary==3.6.0 robotframework-selenium2library==1.8.0 robotframework-xvfb==1.2.2 -pip install xvfbwrapper -pip install PyVirtualDisplay +pip install xvfbwrapper==0.2.9 +pip install PyVirtualDisplay==2.1 # Print installed versions. pip freeze diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index b315bc443..da2b798d9 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -10,18 +10,13 @@ - 'master': branch: 'master' subproject: + - 'aai-simulator': + pom: 'test/mocks/aai-simulator/pom.xml' + pattern: 'test/mocks/aai-simulator/**' + mvn-goals: 'mvn clean install -Dcheckstyle.skip' - 'sniroemulator': pom: 'test/mocks/sniroemulator/pom.xml' pattern: 'test/mocks/sniroemulator/**' - - 'mass-pnf-sim': - pom: 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/pom.xml' - pattern: 'test/mocks/mass-pnf-sim/**' - 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/test/mocks/mass-pnf-sim - tox mvn-settings: 'integration-settings' files: '**' archive-artifacts: '' diff --git a/jjb/integration/integration-ietf-actn-tools.yaml b/jjb/integration/integration-ietf-actn-tools.yaml new file mode 100644 index 000000000..304a36cdb --- /dev/null +++ b/jjb/integration/integration-ietf-actn-tools.yaml @@ -0,0 +1,51 @@ +--- +- project: + name: integration-ietf-actn-tools-project-view + project-name: integration-ietf-actn-tools + views: + - project-view + +- project: + name: integration-ietf-actn-tools-info + project: integration/ietf-actn-tools + project-name: integration-ietf-actn-tools + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: integration-ietf-actn-tools-linters + project: integration/ietf-actn-tools + project-name: integration-ietf-actn-tools + 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' + - 'js': + tox-dir: '.' + tox-envs: 'js' + pattern: '**/*.js' + stream: + - 'master': + branch: 'master' + diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 11680b6b0..66c8b7003 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -31,6 +31,22 @@ 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: @@ -43,6 +59,11 @@ builders: - shell: "${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}" +- builder: + name: integration-run-project-test + builders: + - shell: "${WORKSPACE}/csit/run-project-csit.sh ${TESTOPTIONS}" + - builder: name: integration-autorelease-fix-relativepaths builders: @@ -65,8 +86,33 @@ vagrant plugin install vagrant-libvirt vagrant plugin install vagrant-disksize vagrant plugin install vagrant-sshfs + vagrant plugin install vagrant-reload 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: @@ -77,6 +123,22 @@ publishers: - robot: output-path: 'archives' + output-xml: '**/output.xml' + report-html: '**/report.html' + log-html: '**/log.html' + other-files: '' + unstable-threshold: '{unstable-if}' + pass-threshold: '{pass-if}' + only-critical: false + +- publisher: + name: integration-project-robot + publishers: + - robot: + output-path: 'csit/archives' + output-xml: '**/output.xml' + report-html: '**/report.html' + log-html: '**/log.html' other-files: '' unstable-threshold: '{unstable-if}' pass-threshold: '{pass-if}' diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index 40a6a93ff..95d8fb36d 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -8,6 +8,7 @@ node: '{build-node}' recipients: '' java-version: 'openjdk11' + python-version: python3 properties: - lf-infra-properties: @@ -41,7 +42,7 @@ server: '{server-name}' project: 'integration/csit' branch: '{branch}' - files: '**/{project-name}/**' + files: '*/{project-name}/**' builders: - lf-update-java-alternatives: @@ -61,236 +62,6 @@ notify-every-unstable-build: false send-to-individuals: true -- job-template: - name: '{project-name}-arm64-{stream}-verify-csit-{functionality}' - disabled: false - - project-type: freestyle - build-node: 'ubuntu1804-docker-arm64-4c-2g' - node: '{build-node}' - recipients: '' - java-version: 'openjdk11' - - properties: - - lf-infra-properties: - project: 'integration/csit' - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: 'integration/csit' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - integration-test-plan: - test-plan: 'plans/{project-name}/{functionality}' - - integration-test-options: - test-options: '{robot-options}' - - scm: - - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' - - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: 'integration/csit' - branch: '{branch}' - files: '**/{project-name}/**' - - builders: - - lf-update-java-alternatives: - java-version: '{java-version}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-run-test - - publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - lf-infra-publish - - email: - recipients: '{recipients}' - notify-every-unstable-build: false - send-to-individuals: true - -- job-template: - name: '{project-name}-{stream}-verify-csit-{functionality}-testng' - disabled: false - - project-type: freestyle - build-node: 'ubuntu1804-docker-8c-8g' - node: '{build-node}' - recipients: '' - java-version: 'openjdk11' - - properties: - - lf-infra-properties: - project: 'integration/csit' - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: 'integration/csit' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - integration-test-plan: - test-plan: 'plans/{project-name}/{functionality}' - - integration-test-options: - test-options: '{robot-options}' - - html-publisher-dir: - html-dir: '{html-dir}' - - html-publisher-files: - html-files: '{html-files}' - - scm: - - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' - - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: 'integration/csit' - branch: '{branch}' - files: '**/{project-name}/**' - - builders: - - lf-update-java-alternatives: - java-version: '{java-version}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-run-test - - publishers: - - testng: - pattern: archives/testng-results.xml - escape-test-description: true - escape-exception-msg: true - show-failed-builds: true - unstable-on-skipped-tests: false - failure-on-failed-test-config: false - - junit: - results: archives/testng-results.xml - health-scale-factor: 1.0 - allow-empty-results: true - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - html-publisher: - allow-missing: true - dir: '{html-dir}' - files: '{html-files}' - keep-all: false - link-to-last-build: false - name: ExtentReport - - lf-infra-publish - - email: - recipients: '{recipients}' - notify-every-unstable-build: false - send-to-individuals: true - -- job-template: - name: '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng' - disabled: false - - project-type: freestyle - build-node: 'ubuntu1804-docker-arm64-4c-2g' - node: '{build-node}' - recipients: '' - java-version: 'openjdk11' - - properties: - - lf-infra-properties: - project: 'integration/csit' - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: 'integration/csit' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - integration-test-plan: - test-plan: 'plans/{project-name}/{functionality}' - - integration-test-options: - test-options: '{robot-options}' - - html-publisher-dir: - html-dir: '{html-dir}' - - html-publisher-files: - html-files: '{html-files}' - - scm: - - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' - - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: 'integration/csit' - branch: '{branch}' - files: '**/{project-name}/**' - - builders: - - lf-update-java-alternatives: - java-version: '{java-version}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-run-test - - publishers: - - testng: - pattern: archives/testng-results.xml - escape-test-description: true - escape-exception-msg: true - show-failed-builds: true - unstable-on-skipped-tests: false - failure-on-failed-test-config: false - - junit: - results: archives/testng-results.xml - health-scale-factor: 1.0 - allow-empty-results: true - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - html-publisher: - allow-missing: true - dir: '{html-dir}' - files: '{html-files}' - keep-all: false - link-to-last-build: false - name: ExtentReport - - lf-infra-publish - - email: - recipients: '{recipients}' - notify-every-unstable-build: false - send-to-individuals: true - - job-template: name: '{project-name}-{stream}-csit-{functionality}' disabled: '{disabled}' @@ -300,6 +71,7 @@ node: '{build-node}' recipients: '' java-version: 'openjdk11' + python-version: python3 properties: - lf-infra-properties: @@ -333,12 +105,13 @@ server: '{server-name}' project: 'integration/csit' branch: '{branch}' - files: '**/{project-name}/**' + files: '*/{project-name}/**' - timed: '@daily' - reverse: jobs: '{obj:trigger_jobs}' builders: + - lf-infra-pre-build - lf-update-java-alternatives: java-version: '{java-version}' - integration-install-robotframework @@ -356,63 +129,106 @@ notify-every-unstable-build: false send-to-individuals: true -- job-template: - name: '{project-name}-arm64-{stream}-csit-{functionality}' - disabled: false +- verification_maven_job_boiler_plate: &verification_maven_job_boiler_plate + name: verification_maven_job_boiler_plate + + ###################### + # Default parameters # + ###################### + + branch: master + build-concurrent: false + build-days-to-keep: 30 # 30 days in case a release takes long to get approved. + build-node: ubuntu1804-docker-8c-8g + build-timeout: 60 + container-public-registry: 'nexus3.onap.org:10001' + git-url: "$GIT_URL/$PROJECT" + github-url: "https://github.com" + maven-versions-plugin: false + version-properties-file: version.properties + mvn-central: false + mvn-global-settings: global-settings + mvn-goals: clean deploy + mvn-opts: "" + mvn-pom: "" + mvn-version: mvn36 + stream: master + submodule-recursive: true + submodule-timeout: 10 + submodule-disable: false + + disabled: '{disabled}' + archive-artifacts: > + **/*.log + **/hs_err_*.log + **/target/**/feature.xml + **/target/failsafe-reports/failsafe-summary.xml + **/target/surefire-reports/*-output.txt project-type: freestyle - build-node: 'ubuntu1804-docker-arm64-4c-2g' node: '{build-node}' - recipients: '' java-version: 'openjdk11' + ##################### + # Job Configuration # + ##################### + concurrent: "{build-concurrent}" properties: - lf-infra-properties: - project: 'integration/csit' + project: '{project}' build-days-to-keep: '{build-days-to-keep}' - parameters: - infra-parameters: - project: 'integration/csit' + project: '{project}' branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' - - integration-test-plan: - test-plan: 'plans/{project-name}/{functionality}' + - lf-infra-maven-parameters: + mvn-opts: "{mvn-opts}" + mvn-params: "{mvn-params}" + mvn-version: "{mvn-version}" + - string: + name: ARCHIVE_ARTIFACTS + default: "{archive-artifacts}" + description: Artifacts to archive to the logs server. - integration-test-options: test-options: '{robot-options}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - wrappers: - lf-infra-wrappers: build-timeout: '{build-timeout}' jenkins-ssh-credential: '{jenkins-ssh-credential}' - - triggers: - - gerrit-trigger-patch-merged: - server: '{server-name}' - project: 'integration/csit' - branch: '{branch}' - files: '**/{project-name}/**' - - timed: '@daily' - - reverse: - jobs: '{obj:trigger_jobs}' - builders: + - lf-infra-pre-build + - lf-jacoco-nojava-workaround + - lf-maven-install: + mvn-version: "{mvn-version}" - lf-update-java-alternatives: - java-version: '{java-version}' + java-version: "{java-version}" + - lf-infra-docker-login: + global-settings-file: "{mvn-global-settings}" + settings-file: "{mvn-settings}" + # must provide maven settings AFTER docker-login due to its cleanup + - lf-provide-maven-settings: + global-settings-file: "{mvn-global-settings}" + settings-file: "{mvn-settings}" + - lf-maven-versions-plugin: + maven-versions-plugin: "{maven-versions-plugin}" + version-properties-file: "{version-properties-file}" + mvn-version: "{mvn-version}" + mvn-pom: "{mvn-pom}" + mvn-settings: "{mvn-settings}" + - inject: + properties-content: | + CONTAINER_PULL_REGISTRY={container-public-registry} + - lf-maven-build: + mvn-goals: "{mvn-goals}" - integration-install-robotframework - inject: properties-file: 'env.properties' - - integration-run-test - + - integration-run-project-test + - lf-provide-maven-settings-cleanup publishers: - - integration-robot: + - integration-project-robot: unstable-if: 0.0 pass-if: 100.0 - lf-infra-publish @@ -422,175 +238,52 @@ send-to-individuals: true - job-template: - name: '{project-name}-{stream}-csit-{functionality}-testng' - disabled: false - - project-type: freestyle - build-node: 'ubuntu1804-docker-8c-8g' - node: '{build-node}' - recipients: '' - java-version: 'openjdk11' + # Job template for unified review verification jobs in + # project-specific CSIT flow for projects built with maven + # + # The purpose of this job template is to: + # 1. build local snapshot docker images with maven + # 2. run CSIT job with the local images + # 3. give a verify vote to the triggering review + # - properties: - - lf-infra-properties: - project: 'integration/csit' - build-days-to-keep: '{build-days-to-keep}' + name: '{project-name}-review-verification-maven-{stream}' - parameters: - - infra-parameters: - project: 'integration/csit' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - integration-test-plan: - test-plan: 'plans/{project-name}/{functionality}' - - integration-test-options: - test-options: '{robot-options}' - - html-publisher-dir: - html-dir: '{html-dir}' - - html-publisher-files: - html-files: '{html-files}' + <<: *verification_maven_job_boiler_plate scm: - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' submodule-recursive: '{submodule-recursive}' - - wrappers: - - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' - triggers: - - gerrit-trigger-patch-merged: + - gerrit-trigger-patch-submitted: server: '{server-name}' - project: 'integration/csit' + project: '{project}' branch: '{branch}' - files: '**/{project-name}/**' - - timed: '@daily' - - reverse: - jobs: '{obj:trigger_jobs}' - - builders: - - lf-update-java-alternatives: - java-version: '{java-version}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-run-test - - publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - testng: - pattern: archives/testng-results.xml - escape-test-description: true - escape-exception-msg: true - show-failed-builds: true - unstable-on-skipped-tests: false - failure-on-failed-test-config: false - - junit: - results: archives/testng-results.xml - health-scale-factor: 1.0 - allow-empty-results: true - - html-publisher: - allow-missing: true - dir: '{html-dir}' - files: '{html-files}' - keep-all: false - link-to-last-build: false - name: ExtentReport - - lf-infra-publish - - email: - recipients: '{recipients}' - notify-every-unstable-build: false - send-to-individuals: true + files: '**' - job-template: - name: '{project-name}-arm64-{stream}-csit-{functionality}-testng' - disabled: false + # Job template for unified merge verification jobs in + # project-specific CSIT flow for projects built with maven + # + # The purpose of this job template is to: + # 1. build local snapshot docker images from master with maven + # 2. run CSIT job with the local images + # - project-type: freestyle - build-node: 'ubuntu1804-docker-arm64-4c-2g' - node: '{build-node}' - recipients: '' - java-version: 'openjdk11' - - properties: - - lf-infra-properties: - project: 'integration/csit' - build-days-to-keep: '{build-days-to-keep}' + name: '{project-name}-merge-verification-maven-{stream}' - parameters: - - infra-parameters: - project: 'integration/csit' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - integration-test-plan: - test-plan: 'plans/{project-name}/{functionality}' - - integration-test-options: - test-options: '{robot-options}' - - html-publisher-dir: - html-dir: '{html-dir}' - - html-publisher-files: - html-files: '{html-files}' + <<: *verification_maven_job_boiler_plate scm: - gerrit-trigger-scm: refspec: '' choosing-strategy: 'default' submodule-recursive: '{submodule-recursive}' - - wrappers: - - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' - triggers: - gerrit-trigger-patch-merged: server: '{server-name}' - project: 'integration/csit' + project: '{project}' branch: '{branch}' - files: '**/{project-name}/**' - - timed: '@daily' - - reverse: - jobs: '{obj:trigger_jobs}' - - builders: - - lf-update-java-alternatives: - java-version: '{java-version}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-run-test - - publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - testng: - pattern: archives/testng-results.xml - escape-test-description: true - escape-exception-msg: true - show-failed-builds: true - unstable-on-skipped-tests: false - failure-on-failed-test-config: false - - junit: - results: archives/testng-results.xml - health-scale-factor: 1.0 - allow-empty-results: true - - html-publisher: - allow-missing: true - dir: '{html-dir}' - files: '{html-files}' - keep-all: false - link-to-last-build: false - name: ExtentReport - - lf-infra-publish - - email: - recipients: '{recipients}' - notify-every-unstable-build: false - send-to-individuals: true + files: '**' diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml index 9c2682d43..a0fafde4e 100644 --- a/jjb/integration/integration-templates-docker.yaml +++ b/jjb/integration/integration-templates-docker.yaml @@ -59,8 +59,7 @@ - docker.push.registry=nexus3.onap.org:10003 publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: name: '{project-name}-{stream}-{subproject}-docker-verify' @@ -124,8 +123,7 @@ - shell: '{post-docker-verify-script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: name: '{project-name}-{stream}-{subproject}-docker-compose-verify' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 622d523a7..77be42b97 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -104,3 +104,33 @@ name: '{project-name}-{stream}-{subproject}-tox-verify' id: integration-tox-verify description: 'Job intended for running tox' + +- job-template: + <<: *tox_verify_boilerplate + name: '{project-name}-{stream}-{subproject}-terraform-verify' + terraform-version: 0.13.2 + terragrunt-version: 0.24.1 + python-version: python3 + id: integration-terraform-verify + description: 'Job intended for validating terraform modules' + + parameters: + - lf-infra-parameters: + project: '{project}' + stream: '{stream}' + branch: '{branch}' + - lf-infra-tox-parameters: + tox-dir: '{tox-dir}' + tox-envs: '{tox-envs}' + - integration-terraform-version: + terraform-version: '{terraform-version}' + - integration-terragrunt-version: + terragrunt-version: '{terragrunt-version}' + + builders: + - integration-install-terraform + - integration-install-terragrunt + - lf-infra-tox-install: + python-version: '{python-version}' + - lf-infra-tox-run: + parallel: 'false' diff --git a/jjb/integration/integration-terraform.yaml b/jjb/integration/integration-terraform.yaml new file mode 100644 index 000000000..008945454 --- /dev/null +++ b/jjb/integration/integration-terraform.yaml @@ -0,0 +1,55 @@ +--- +- 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 new file mode 100644 index 000000000..04391fb02 --- /dev/null +++ b/jjb/integration/integration-terragrunt.yaml @@ -0,0 +1,61 @@ +--- +- 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/integration.yaml b/jjb/integration/integration.yaml index 5b211d745..6296ff12d 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -21,14 +21,15 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'integration-settings' - build-node: 'centos7-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'test-vcpe': path: 'test/vcpe' pattern: 'test/vcpe/**' + - 'ran-nssmf-simulator': + path: 'test/mocks/ran-nssmf-simulator' + pattern: 'test/mocks/ran-nssmf-simulator/**' jobs: - '{project-name}-{stream}-{subproject}-verify-python' @@ -46,7 +47,7 @@ name: integration-verify-golang project-name: 'integration' project: 'integration' - golangver: 'golang112' + golangver: 'golang114' mvn-settings: 'integration-settings' archive-artifacts: '' jobs: diff --git a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml new file mode 100644 index 000000000..09edda6d9 --- /dev/null +++ b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml @@ -0,0 +1,68 @@ +--- +- project: + name: integration-5G-core-nf-simulator-info + project-name: integration-5G-core-nf-simulator + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/simulators/5G-core-nf-simulator + branch: master + +- project: + name: integration-5G-core-nf-simulator + project-name: integration-5G-core-nf-simulator + project: integration/simulators/5G-core-nf-simulator + stream: + - 'master': + branch: 'master' + mvn-settings: 'integration-simulators-5G-core-nf-simulator-settings' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + subproject: + - 'AMF': + path: 'coresim/AMF/' + pattern: 'coresim/AMF/**' + pom: 'coresim/AMF/pom.xml' + - 'SMF': + path: 'coresim/SMF/' + pattern: 'coresim/SMF/**' + pom: 'coresim/SMF/pom.xml' + - 'UPF': + path: 'coresim/UPF/' + pattern: 'coresim/UPF/**' + pom: 'coresim/UPF/pom.xml' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java': + mvn-goals: 'clean install' + +- project: + name: integration-5G-core-nf-simulator-linters + project: integration/simulators/5G-core-nf-simulator + project-name: integration-5G-core-nf-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' + - 'md': + tox-dir: '.' + tox-envs: 'md' + pattern: '**/*.md' + - 'python': + tox-dir: '.' + tox-envs: 'py' + pattern: '**/*.py' + stream: + - 'master': + branch: 'master' diff --git a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml new file mode 100644 index 000000000..65ac3633d --- /dev/null +++ b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml @@ -0,0 +1,57 @@ +--- + +- project: + name: integration-simulators-A1-policy-enforcement-simulator-info + project: integration/simulators/A1-policy-enforcement-simulator + project-name: integration-simulators-A1-policy-enforcement-simulator + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: integration-simulators-A1-policy-enforcement-simulator + project: integration/simulators/A1-policy-enforcement-simulator + project-name: integration-simulators-A1-policy-enforcement-simulator + java-version: openjdk11 + stream: + - 'master': + branch: 'master' + mvn-settings: 'integration-simulators-A1-policy-enforcement-simulator-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + jobs: + - '{project-name}-{stream}-verify-java': + mvn-goals: 'clean install' + +- project: + name: integration-simulators-A1-policy-enforcement-simulator-linters + project: integration/simulators/A1-policy-enforcement-simulator + project-name: integration-simulators-A1-policy-enforcement-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/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml new file mode 100644 index 000000000..8c77db70a --- /dev/null +++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml @@ -0,0 +1,34 @@ +--- +- project: + name: integration-simulators-core-nssmf-simulator-info + project: integration/simulators/core-nssmf-simulator + project-name: integration-simulators-core-nssmf-simulator + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: integration-simulators-core-nssmf-simulator + project: integration/simulators/core-nssmf-simulator + project-name: integration-simulators-core-nssmf-simulator + stream: + - 'master': + branch: 'master' + mvn-settings: 'integration-simulators-core-nssmf-simulator-settings' + files: '**' + maven-deploy-properties: | + deployAtEnd=true + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + jobs: + - '{project-name}-{stream}-verify-java': + mvn-goals: 'clean install' + - '{project-name}-{stream}-merge-java': + mvn-goals: 'clean deploy' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-goals: 'clean deploy' diff --git a/jjb/integration/simulators/integration-masspnf-simulator.yaml b/jjb/integration/simulators/integration-masspnf-simulator.yaml new file mode 100644 index 000000000..8121708b3 --- /dev/null +++ b/jjb/integration/simulators/integration-masspnf-simulator.yaml @@ -0,0 +1,70 @@ +--- +- 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/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml index 481aca909..f426209a7 100644 --- a/jjb/integration/simulators/integration-pnf-simulator.yaml +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -15,7 +15,7 @@ build-node: ubuntu1804-docker-8c-8g jobs: - '{project-name}-{stream}-verify-java': - mvn-goals: 'clean install' + mvn-goals: 'clean install -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true' - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml new file mode 100644 index 000000000..f31dd1d7d --- /dev/null +++ b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml @@ -0,0 +1,46 @@ +--- +- project: + name: integration-simulators-ran-nssmf-simulator-project-view + project-name: integration-simulators-ran-nssmf-simulator + views: + - project-view + +- project: + name: integration-simulators-ran-nssmf-simulator-info + project: integration/simulators/ran-nssmf-simulator + project-name: integration-simulators-ran-nssmf-simulator + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: integration-simulators-ran-nssmf-simulator-linters + project: integration/simulators/ran-nssmf-simulator + project-name: integration-simulators-ran-nssmf-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/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml index 895854a55..4e60e9b32 100644 --- a/jjb/integration/simulators/integration-ran-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-simulator.yaml @@ -1,4 +1,32 @@ --- +- project: + name: integration-simulators-ran-simulator + project-name: integration-simulators-ran-simulator + stream: + - 'master': + branch: 'master' + project: 'integration/simulators/ran-simulator' + mvn-settings: 'integration-simulators-ran-simulator-settings' + maven-deploy-properties: | + deployAtEnd=true + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + jobs: + - '{project-name}-{stream}-verify-java': + mvn-goals: 'clean install' + pattern: 'ransim/**' + pom: 'ransim/pom.xml' + - '{project-name}-{stream}-merge-java': + mvn-goals: 'clean deploy' + pom: 'ransim/pom.xml' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-goals: 'clean deploy' + - project: name: integration-simulators-ran-simulator-info project-name: integration-simulators-ran-simulator diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml new file mode 100644 index 000000000..a64a4dc48 --- /dev/null +++ b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml @@ -0,0 +1,66 @@ +--- +- project: + name: integration-simulators-nf-simulator-pm-https-server + project-name: 'integration-simulators-nf-simulator-pm-https-server' + java-version: openjdk11 + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean install -P docker -DskipDockerPush=false' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'integration/simulators/nf-simulator/pm-https-server' + stream: + - 'master': + branch: 'master' + mvn-settings: 'integration-simulators-nf-simulator-pm-https-server-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: '' + build-node: 'ubuntu1804-docker-8c-8g' + +- project: + name: integration-simulators-nf-simulator-pm-https-server-sonar + java-version: openjdk11 + 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: 'integration/simulators/nf-simulator/pm-https-server' + project-name: 'integration-simulators-nf-simulator-pm-https-server' + branch: 'master' + mvn-settings: 'integration-simulators-nf-simulator-pm-https-server-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: integration-simulators-nf-simulator-pm-https-server-view + project-name: integration-simulators-nf-simulator-pm-https-server + views: + - project-view + +- project: + name: integration-simulators-nf-simulator-pm-https-server-info + project: integration/simulators/nf-simulator/pm-https-server + project-name: integration-simulators-nf-simulator-pm-https-server + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml new file mode 100644 index 000000000..43e316138 --- /dev/null +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml @@ -0,0 +1,66 @@ +--- +- project: + name: integration-simulators-nf-simulator-avcn-manager + project-name: 'integration-simulators-nf-simulator-avcn-manager' + java-version: openjdk11 + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean deploy -P docker -DskipDockerPush=false' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'integration/simulators/nf-simulator/avcn-manager' + stream: + - 'master': + branch: 'master' + mvn-settings: 'integration-simulators-nf-simulator-avcn-manager-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: '' + build-node: 'ubuntu1804-docker-8c-8g' + +- project: + name: integration-simulators-nf-simulator-avcn-manager-sonar + java-version: openjdk11 + 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: 'integration/simulators/nf-simulator/avcn-manager' + project-name: 'integration-simulators-nf-simulator-avcn-manager' + branch: 'master' + mvn-settings: 'integration-simulators-nf-simulator-avcn-manager-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: integration-simulators-nf-simulator-avcn-manager-view + project-name: integration-simulators-nf-simulator-avcn-manager + views: + - project-view + +- project: + name: integration-simulators-nf-simulator-avcn-manager-info + project: integration/simulators/nf-simulator/avcn-manager + project-name: integration-simulators-nf-simulator-avcn-manager + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml new file mode 100644 index 000000000..141639448 --- /dev/null +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml @@ -0,0 +1,15 @@ +- project: + name: integration-simulators-nf-simulator-netconf-server-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'integration-simulators-nf-simulator-netconf-server' + recipients: 'krzysztof.kuzmicki@nokia.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com' + stream: + - 'master': + branch: 'master' + functionality: + - 'testsuites': + trigger_jobs: + - '{project-name}-{stream}-merge-java' + robot-options: '' diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml new file mode 100644 index 000000000..aeb03ee4f --- /dev/null +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml @@ -0,0 +1,66 @@ +--- + +- project: + name: integration-simulators-nf-simulator-netconf-server + project-name: 'integration-simulators-nf-simulator-netconf-server' + python-version: python3.8 + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean install -P docker -DskipDockerPush=false' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'integration/simulators/nf-simulator/netconf-server' + stream: + - 'master': + branch: 'master' + mvn-settings: 'integration-simulators-nf-simulator-netconf-server-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: '' + build-node: 'ubuntu1804-docker-8c-8g' + +- project: + name: integration-simulators-nf-simulator-netconf-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: ubuntu1804-docker-8c-8g + project: 'integration/simulators/nf-simulator/netconf-server' + project-name: 'integration-simulators-nf-simulator-netconf-server' + branch: 'master' + mvn-settings: 'integration-simulators-nf-simulator-netconf-server-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: integration-simulators-nf-simulator-netconf-server-view + project-name: integration-simulators-nf-simulator-netconf-server + views: + - project-view + +- project: + name: integration-simulators-nf-simulator-netconf-server-info + project: integration/simulators/nf-simulator/netconf-server + project-name: integration-simulators-nf-simulator-netconf-server + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml new file mode 100644 index 000000000..e26074597 --- /dev/null +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml @@ -0,0 +1,41 @@ +--- +- project: + name: integration-simulators-nf-simulator-simulator-cli + project-name: 'integration-simulators-nf-simulator' + python-version: python3 + tox-dir: '.' + tox-envs: '' + subproject: + - simulator-cli: + path: './simulator-cli' + pattern: '**' + project: 'integration/simulators/nf-simulator' + stream: + - 'master': + branch: 'master' + mvn-settings: 'integration-simulators-nf-simulator-settings' + build-node: ubuntu1804-builder-4c-4g + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + +- project: + name: integration-simulators-nf-simulator-sonar + jobs: + - gerrit-tox-sonar + cron: '@daily' + build-node: ubuntu1804-builder-4c-4g + project: 'integration/simulators/nf-simulator' + project-name: 'integration-simulators-nf-simulator' + branch: 'master' + mvn-settings: 'integration-simulators-nf-simulator-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: integration-simulators-nf-simulator-info + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: 'integration/simulators/nf-simulator' + project-name: 'integration-simulators-nf-simulator' + branch: 'master' diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml new file mode 100644 index 000000000..299457328 --- /dev/null +++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml @@ -0,0 +1,66 @@ +--- +- project: + name: integration-simulators-nf-simulator-ves-client + project-name: 'integration-simulators-nf-simulator-ves-client' + java-version: openjdk11 + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean deploy -P docker -DskipDockerPush=false' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'integration/simulators/nf-simulator/ves-client' + stream: + - 'master': + branch: 'master' + mvn-settings: 'integration-simulators-nf-simulator-ves-client-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: '' + build-node: 'ubuntu1804-docker-8c-8g' + +- project: + name: integration-simulators-nf-simulator-ves-client-sonar + java-version: openjdk11 + 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: 'integration/simulators/nf-simulator/ves-client' + project-name: 'integration-simulators-nf-simulator-ves-client' + branch: 'master' + mvn-settings: 'integration-simulators-nf-simulator-ves-client-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: integration-simulators-nf-simulator-ves-client-view + project-name: integration-simulators-nf-simulator-ves-client + views: + - project-view + +- project: + name: integration-simulators-nf-simulator-ves-client-info + project: integration/simulators/nf-simulator/ves-client + project-name: integration-simulators-nf-simulator-ves-client + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml new file mode 100644 index 000000000..f61a8783c --- /dev/null +++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml @@ -0,0 +1,40 @@ +--- +- project: + name: integration-usecases-A1-policy-enforcement-r-apps-info + project: integration/usecases/A1-policy-enforcement-r-apps + project-name: integration-usecases-A1-policy-enforcement-r-apps + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: integration-usecases-A1-policy-enforcement-r-apps-linters + project: integration/usecases/A1-policy-enforcement-r-apps + project-name: integration-usecases-A1-policy-enforcement-r-apps + 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-A1-policy-enforcement.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml new file mode 100644 index 000000000..13659e68d --- /dev/null +++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml @@ -0,0 +1,41 @@ +--- + +- project: + name: integration-usecases-A1-policy-enforcement-info + project: integration/usecases/A1-policy-enforcement + project-name: integration-usecases-A1-policy-enforcement + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: integration-usecases-A1-policy-enforcement-linters + project: integration/usecases/A1-policy-enforcement + project-name: integration-usecases-A1-policy-enforcement + 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/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 2065813c5..5ac5d8d5e 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -16,6 +16,10 @@ jobs: - integration-linters subproject: + - 'commit': + tox-dir: '.' + tox-envs: 'gitlint' + pattern: '**' - 'yaml': tox-dir: '.' tox-envs: 'yaml' @@ -35,11 +39,17 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' - project: name: integration-xtesting-release project-name: 'integration-xtesting' - project: 'integration/docker/onap-python' + project: 'integration/xtesting' mvn-settings: 'integration-settings' jobs: - '{project-name}-gerrit-release-jobs': @@ -88,26 +98,6 @@ docker-root: ./smoke-usecases-robot docker-name: 'onap/xtesting-smoke-usecases-robot' docker-build-args: '-f ./docker/Dockerfile' - - gerrit-docker-verify: - project-name: 'integration-xtesting-benchmarking' - docker-root: ./benchmarking - docker-name: 'onap/xtesting-benchmarking' - docker-build-args: '-f ./docker/Dockerfile' - - gerrit-docker-merge: - project-name: 'integration-xtesting-benchmarking' - docker-root: ./benchmarking - docker-name: 'onap/xtesting-benchmarking' - docker-build-args: '-f ./docker/Dockerfile' - - gerrit-docker-verify: - project-name: 'integration-xtesting-candidate-usecases' - docker-root: ./candidate-usecases - docker-name: 'onap/xtesting-candidate-usecases' - docker-build-args: '-f ./docker/Dockerfile' - - gerrit-docker-merge: - project-name: 'integration-xtesting-candidate-usecases' - docker-root: ./candidate-usecases - docker-name: 'onap/xtesting-candidate-usecases' - docker-build-args: '-f ./docker/Dockerfile' - gerrit-docker-verify: project-name: 'integration-xtesting-security' docker-root: ./security @@ -123,6 +113,17 @@ - 'master': branch: 'master' files: '' + - 'honolulu': + branch: 'honolulu' + files: '' + - 'guilin': + branch: 'guilin' + files: '' + - 'develop': + branch: 'develop' + files: '' docker-root: '$WORKSPACE' mvn-settings: 'integration-settings' build-node: ubuntu1804-docker-8c-8g + cron: '@daily' + container-tag-method: stream diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml index 62d07a710..fac518140 100644 --- a/jjb/lf-infra-releasedockerhub.yaml +++ b/jjb/lf-infra-releasedockerhub.yaml @@ -16,9 +16,9 @@ disable-job: false disabled: '{disable-job}' - # Runs once a week + # Runs once a day triggers: - - timed: '@weekly' + - timed: '@daily' # Define needed parameters for lf-infra-docker-login parameters: diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 8b6c39180..7ef2950a9 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: centos7-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-settings: 'logging-analytics-settings' subproject: - 'pylog': diff --git a/jjb/clamp/dashboard/info-clamp-dashboard.yaml b/jjb/modeling/modeling-modelspec.yaml similarity index 52% rename from jjb/clamp/dashboard/info-clamp-dashboard.yaml rename to jjb/modeling/modeling-modelspec.yaml index efff6fcc0..1cae6b721 100644 --- a/jjb/clamp/dashboard/info-clamp-dashboard.yaml +++ b/jjb/modeling/modeling-modelspec.yaml @@ -1,9 +1,9 @@ --- - project: - name: clamp-dashboard-info - project-name: clamp-dashboard + name: modeling-modelspec-info + project-name: modeling-modelspec jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g - project: clamp/dashboard + project: modeling/modelspec branch: master diff --git a/jjb/multicloud/build-multicloud-azure-docker-image.sh b/jjb/multicloud/build-multicloud-azure-docker-image.sh deleted file mode 100755 index e4e6d8d79..000000000 --- a/jjb/multicloud/build-multicloud-azure-docker-image.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./azure/docker/*.* - -./azure/docker/build_image.sh - diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml deleted file mode 100644 index da9827bc0..000000000 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ /dev/null @@ -1,91 +0,0 @@ ---- -- project: - name: multicloud-azure-java - project-name: 'multicloud-azure' - project: 'multicloud/azure' - stream: - - 'master': - branch: 'master' - mvn-settings: 'multicloud-azure-settings' - subproject: - - 'azure': - pom: 'azure/pom.xml' - pattern: 'azure/**' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-goals: install - mvn-params: '-P docker' - maven-versions-plugin: true - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -#- project: -# name: multicloud-azure-arm64-java -# project-name: 'multicloud-azure-arm64' -# project: 'multicloud/azure' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'multicloud-azure-settings' -# subproject: -# - 'azure': -# pom: 'azure/pom.xml' -# pattern: 'azure/**' -# jobs: -# - '{project-name}-{stream}-docker-java-version-shell-daily': -# docker-pom: 'pom.xml' -# mvn-goals: 'install' -# script: -# !include-raw-escape: 'build-multicloud-azure-docker-image.sh' -# files: '**' -# archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g -# -- project: - name: multicloud-azure-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'multicloud/azure' - project-name: 'multicloud-azure' - branch: 'master' - mvn-settings: 'multicloud-azure-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: multicloud-azure-java-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: multicloud/azure - project-name: 'multicloud-azure' - branch: 'master' - mvn-settings: 'multicloud-azure-settings' - -- project: - name: multicloud-azure-info - project-name: multicloud-azure - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: multicloud/azure - branch: master diff --git a/jjb/multicloud/multicloud-azure-python.yaml b/jjb/multicloud/multicloud-azure-python.yaml deleted file mode 100644 index 8aec29b5e..000000000 --- a/jjb/multicloud/multicloud-azure-python.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- project: - name: multicloud-azure-python - project-name: 'multicloud-azure' - project: 'multicloud/azure' - stream: - - 'master': - branch: 'master' - mvn-settings: 'multicloud-azure-settings' - build-node: 'ubuntu1804-builder-4c-4g' - subproject: - - 'azure': - path: 'azure' - pattern: 'azure/**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' diff --git a/jjb/multicloud/multicloud-csit.yaml b/jjb/multicloud/multicloud-csit.yaml index 8538713f4..274e4f4c7 100644 --- a/jjb/multicloud/multicloud-csit.yaml +++ b/jjb/multicloud/multicloud-csit.yaml @@ -9,6 +9,6 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: '{project-name}-{stream}-multivimbroker-merge-java' + trigger_jobs: robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 323311824..5f0bbfc27 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -6,6 +6,10 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'multicloud-framework-settings' subproject: - 'multivimbroker': @@ -102,6 +106,7 @@ project: 'multicloud/framework' project-name: 'multicloud-framework-artifactbroker' branch: 'master' + java-version: openjdk11 mvn-params: '-f artifactbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' mvn-goals: 'clean install' @@ -115,5 +120,6 @@ project: multicloud/framework project-name: 'multicloud-framework-artifactbroker' branch: 'master' + java-version: openjdk11 mvn-params: '-f artifactbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' diff --git a/jjb/multicloud/multicloud-framework-python.yaml b/jjb/multicloud/multicloud-framework-python.yaml index d81081a1d..113bce7e9 100644 --- a/jjb/multicloud/multicloud-framework-python.yaml +++ b/jjb/multicloud/multicloud-framework-python.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' mvn-settings: 'multicloud-framework-settings' build-node: 'ubuntu1804-builder-4c-4g' subproject: diff --git a/jjb/multicloud/multicloud-info.yaml b/jjb/multicloud/multicloud-info.yaml new file mode 100644 index 000000000..c1aa85e86 --- /dev/null +++ b/jjb/multicloud/multicloud-info.yaml @@ -0,0 +1,37 @@ +--- + +- project: + name: multicloud-info + project-name: multicloud + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: multicloud + branch: master + +- project: + name: multicloud-windriver-info + project-name: multicloud-windriver + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: multicloud/openstack/windriver + branch: master + +- project: + name: multicloud-oom-info + project-name: multicloud-oom + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: multicloud/oom + branch: master + +- project: + name: multicloud-k8s-info + project-name: multicloud-k8s + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: multicloud/k8s + branch: master diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index dd43c952f..88047251c 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -26,6 +26,8 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'multicloud-k8s-settings' files: '**' archive-artifacts: '' @@ -52,12 +54,3 @@ # files: '**' # archive-artifacts: '' # build-node: ubuntu1804-docker-arm64-4c-2g - -- project: - name: multicloud-k8s-info - project-name: multicloud-k8s - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: multicloud/k8s - branch: master diff --git a/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml b/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml index f6710b2c2..f0d38b498 100644 --- a/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml @@ -9,6 +9,6 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml b/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml index 39dae5efa..353b18fa5 100644 --- a/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml @@ -10,7 +10,5 @@ functionality: - 'functionality1': trigger_jobs: - - 'multicloud-openstack-master-docker-java-version-shell-daily' - - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml index ebae9037f..ea35a5eee 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml @@ -10,7 +10,5 @@ functionality: - 'functionality1': trigger_jobs: - - 'multicloud-openstack-vmware-master-docker-java-version-shell-daily' -# - 'multicloud-openstack-vmware-arm64-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/music/build-music-distributed-kv-store-image.sh b/jjb/music/build-music-distributed-kv-store-image.sh index d11f0534d..20c1e19c6 100755 --- a/jjb/music/build-music-distributed-kv-store-image.sh +++ b/jjb/music/build-music-distributed-kv-store-image.sh @@ -1,6 +1,7 @@ #!/bin/bash echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' +echo "============== Unique docker tag: ${UNIQUE_DOCKER_TAG}" CURRENTDIR="$(pwd)" echo $CURRENTDIR diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml index ca94fcdbc..ab491475d 100644 --- a/jjb/music/music-distributed-kv-store-csit.yaml +++ b/jjb/music/music-distributed-kv-store-csit.yaml @@ -1,13 +1,25 @@ ---- -- project: - name: music-distributed-kv-store-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'music' - stream: 'master' - functionality: - - 'music-distributed-kv-store-test-plan': - trigger_jobs: 'music-distributed-kv-store-master-docker-golang-shell-daily' - robot-options: '' - branch: 'master' +# Integration templates no longer support these +# job definitions; if Music CSIT needs to be restored, +# '{project-name}-review-verification-golang-{stream}' +# '{project-name}-merge-verification-golag-{stream}' +# would have to be added to integration templates and +# applied here +# +#--- +#- project: +# name: music-distributed-kv-store-csit +# jobs: +# - '{project-name}-{stream}-project-csit' +# - '{project-name}-review-verification-{stream}' +# - '{project-name}-merge-verification-{stream}' +# project-name: 'music-distributed-kv-store' +# project: 'music/distributed-kv-store' +# disabled: true +# stream: 'master' +# artifact-type: 'golang' +# java-version: openjdk11 +# mvn-version: 'mvn36' +# mvn-settings: 'music-distributed-kv-store-settings' +# mvn-global-settings: global-settings +# robot-options: '' +# branch: 'master' diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml index d5b030879..0985d66c2 100644 --- a/jjb/music/music-distributed-kv-store.yaml +++ b/jjb/music/music-distributed-kv-store.yaml @@ -13,6 +13,7 @@ stream: - 'master': branch: 'master' + artifact-type: 'golang' mvn-settings: 'music-distributed-kv-store-settings' files: '**' archive-artifacts: '' diff --git a/jjb/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml deleted file mode 100644 index 5f2c15496..000000000 --- a/jjb/music/music-mdbc.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- project: - name: music-mdbc - project-name: 'music-mdbc' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - project: 'music/mdbc' - stream: - - 'master': - branch: 'master' - mvn-settings: 'music-mdbc-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - -- project: - name: music-mdbc-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: music/mdbc - project-name: 'music-mdbc' - branch: 'master' - mvn-settings: 'music-mdbc-settings' - -- project: - name: music-mdbc-info - project-name: music-mdbc - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: music/mdbc - branch: master diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml deleted file mode 100644 index 93ffe4511..000000000 --- a/jjb/music/music-prom.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- project: - name: music-prom - project-name: 'music-prom' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - project: 'music/prom' - stream: - - 'master': - branch: 'master' - - 'casablanca': - branch: 'casablanca' - mvn-settings: 'music-prom-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - -- project: - name: music-prom-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: music/prom - project-name: 'music-prom' - branch: 'master' - mvn-settings: 'music-prom-settings' - -- project: - name: music-prom-info - project-name: music-prom - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: music/prom - branch: master diff --git a/jjb/music/tag-music-distributed-kv-store-image-staging.sh b/jjb/music/tag-music-distributed-kv-store-image-staging.sh new file mode 100755 index 000000000..0c28eec0f --- /dev/null +++ b/jjb/music/tag-music-distributed-kv-store-image-staging.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +echo '=========== CALLING SCRIPT TO TAG DOCKER IMAGES AS STAGING ===========' +echo "=========== Unique docker tag: ${UNIQUE_DOCKER_TAG}" +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./deployment/*.sh +cd ./deployment +./tag-docker-staging.sh diff --git a/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml b/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml new file mode 100644 index 000000000..f6940517b --- /dev/null +++ b/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: oom-platform-cert-manager-project-view + project-name: oom-platform-cert-manager + views: + - project-view + +- project: + name: oom-platform-cert-manager-info + project: oom/platform/cert-manager + project-name: oom-platform-cert-manager + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml new file mode 100644 index 000000000..c4c388fa2 --- /dev/null +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml @@ -0,0 +1,18 @@ +# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed +- project: + name: oom-platform-cert-service-csit + jobs: + - "{project-name}-{stream}-verify-csit-{functionality}" + - "{project-name}-{stream}-csit-{functionality}" + project-name: "oom-platform-cert-service" + stream: + - "master": + branch: "master" + - "guilin": + branch: "guilin" + functionality: + - "certservice": + trigger_jobs: + - "postprocessor": + trigger_jobs: + robot-options: "" diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml new file mode 100644 index 000000000..d4602e354 --- /dev/null +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -0,0 +1,83 @@ +--- +- project: + name: oom-platform-cert-service-project-view + project-name: oom-platform-cert-service + views: + - project-view + +- project: + name: oom-platform-cert-service-info + project: oom/platform/cert-service + project-name: oom-platform-cert-service + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: oom-platform-cert-service + project-name: 'oom-platform-cert-service' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + project: 'oom/platform/cert-service' + mvn-settings: 'oom-platform-cert-service-settings' + files: '**' + maven-deploy-properties: | + deployAtEnd=true + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + jobs: + - '{project-name}-{stream}-verify-java': + mvn-goals: 'clean install' + - '{project-name}-{stream}-merge-java': + mvn-goals: 'clean deploy' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-goals: 'clean deploy -P docker' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false' + +- project: + name: oom-platform-cert-service-sonar + subproject: 'oom-platform-cert-service' + path: 'certService' + java-version: openjdk11 + 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: 'oom/platform/cert-service' + project-name: 'oom-platform-cert-service' + branch: 'master' + mvn-settings: 'oom-platform-cert-service-settings' + mvn-pom: 'certService/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: oom-platform-cert-service-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: oom/platform/cert-service + project-name: 'oom-platform-cert-service' + branch: 'master' + build-node: ubuntu1804-docker-8c-8g + mvn-settings: 'oom-platform-cert-service-settings' diff --git a/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml b/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml new file mode 100644 index 000000000..308dd5be4 --- /dev/null +++ b/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: oom-platform-keycloak-project-view + project-name: oom-platform-keycloak + views: + - project-view + +- project: + name: oom-platform-keycloak-info + project: oom/platform/keycloak + project-name: oom-platform-keycloak + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/oom-utils/oom-utils.yaml b/jjb/oom-utils/oom-utils.yaml new file mode 100644 index 000000000..477d66ee3 --- /dev/null +++ b/jjb/oom-utils/oom-utils.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: oom-utils-project-view + project-name: oom-utils + views: + - project-view + +- project: + name: oom-utils-info + project: oom/utils + project-name: oom-utils + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml index 5e96e1856..71ab43344 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -8,8 +8,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'honolulu': + branch: 'honolulu' jobs: - '{project-name}-{stream}-review': @@ -23,3 +23,19 @@ build-node: centos7-builder-2c-1g project: oom/offline-installer branch: master + +- project: + name: offline-installer-linters + project: oom/offline-installer + project-name: offline-installer + python-version: python3 + jobs: + - integration-linters + subproject: + - 'py': + tox-dir: '.' + tox-envs: 'py' + pattern: '**/*.py' + stream: + - 'master': + branch: 'master' diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml new file mode 100644 index 000000000..b466f19e0 --- /dev/null +++ b/jjb/oom/oom-consul.yaml @@ -0,0 +1,67 @@ +--- +- project: + name: oom-consul-project-view + project-name: oom-consul + views: + - project-view + +- project: + name: oom-consul-info + project: oom/consul + project-name: oom-consul + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: oom-consul-linters + project: oom/consul + project-name: oom-consul + python-version: python3 + jobs: + - oom-linters + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'py': + tox-dir: '.' + tox-envs: 'python' + pattern: '**/*.python' + stream: + - 'master': + branch: 'master' + - 'frankfurt': + branch: 'frankfurt' + + +- project: + name: oom-consul-release + project-name: oom-consul + project: oom/consul + mvn-settings: 'oom-settings' + jobs: + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + +- project: + name: 'oom-consul-docker' + jobs: + - gerrit-docker-verify + - gerrit-docker-merge + project-name: 'oom-consul' + project: 'oom/consul' + stream: + - 'master': + branch: 'master' + files: '' + docker-name: 'onap/oom/consul' + docker-build-args: '-f ./Dockerfile' + docker-root: '$WORKSPACE' + mvn-settings: 'oom-settings' + build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/oom/oom-helm-legacy.yaml b/jjb/oom/oom-helm-legacy.yaml new file mode 100644 index 000000000..e70dac9c6 --- /dev/null +++ b/jjb/oom/oom-helm-legacy.yaml @@ -0,0 +1,84 @@ +--- +- project: + name: oom-legacy + project-name: oom-legacy + project: oom-legacy + mvn-settings: oom-settings + mvn-global-settings: global-settings + archive-artifacts: "" + build-node: ubuntu1804-helm-2c-1g + pre_build_script: !include-raw-escape: shell/helm-repo-init.sh + oom_build_script: | + #!/bin/bash + source helm.prop + set -e -o pipefail + cd kubernetes/ + make HELM_BIN=$HELM_BIN all + subproject_build_script: | + #!/bin/bash + cd kubernetes/ + make HELM_BIN=$HELM_BIN common + make HELM_BIN=$HELM_BIN {subproject} + + helm_bin: + - helm3.5 + - helm3.3 + + exclude: + - stream: guilin + helm_bin: helm3.5 + - stream: frankfurt + helm_bin: helm3.5 + - stream: frankfurt + helm_bin: helm3.3 + - stream: dublin + helm_bin: helm3.5 + - stream: dublin + helm_bin: helm3.3 + - stream: casablanca + helm_bin: helm3.5 + - stream: casablanca + helm_bin: helm3.3 + + stream: + - "guilin": + branch: "guilin" + - "frankfurt": + branch: "frankfurt" + - "dublin": + branch: "dublin" + - "casablanca": + branch: "casablanca" + + subproject: + - "aai": + files: "kubernetes/aai/**" + - "robot": + files: "kubernetes/robot/**" + + jobs: + - "{project-name}-{stream}-image-verify": + files: "**" + - "{project-name}-{stream}-verify-helm2": + files: "**" + build-timeout: 360 + - "{project-name}-{stream}-verify-{helm_bin}": + build_script: "{oom_build_script}" + files: "**" + build-timeout: 360 + - "{project-name}-{stream}-merge-helm": + build_script: "{oom_build_script}" + files: "**" + - "{project-name}-{stream}-release-helm": + build_script: "{oom_build_script}" + post_build_script: !include-raw-escape: shell/publish_helm_charts.sh + files: "**" + + # Below jobs disabled until future need. + - "{project-name}-{subproject}-{stream}-verify-helm2": + build_script: "{subproject_build_script}" + - "{project-name}-{subproject}-{stream}-merge-helm": + build_script: "{subproject_build_script}" + - "{project-name}-{stream}-update-helm-weekly": + build_script: "{oom_build_script}" + files: "**" diff --git a/jjb/oom/oom-helm-verify-helm2.yaml b/jjb/oom/oom-helm-verify-helm2.yaml new file mode 100644 index 000000000..f816e4cce --- /dev/null +++ b/jjb/oom/oom-helm-verify-helm2.yaml @@ -0,0 +1,61 @@ +--- +- job-template: &helm-verify2 + name: "{project-name}-{stream}-verify-helm2" + concurrent: true + branch: master + submodule-recursive: true + build_script: "" + post_build_script: "" + pre_build_script: "" + submodule-disable: false + submodule-timeout: 10 + + project-type: freestyle + node: "{build-node}" + + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" + + parameters: + - lf-infra-parameters: + branch: "{branch}" + project: "{project}" + stream: "{stream}" + lftools-version: "{lftools-version}" + + wrappers: + - lf-infra-wrappers: + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" + + publishers: + - lf-infra-publish + + scm: + - gerrit-trigger-scm: + refspec: "$GERRIT_REFSPEC" + choosing-strategy: "gerrit" + submodule-recursive: "{submodule-recursive}" + + triggers: + - gerrit-trigger-helm-patch-submitted: + status-context: "{project}-Helm-Verify" + server: "{server-name}" + project: "{project}" + branch: "{branch}" + files: "{files}" + + builders: + - lf-infra-pre-build + - shell: !include-raw-escape: shell/helm2-repo-init.sh + - shell: !include-raw-escape: shell/helm2-verify.sh + +- job-template: + <<: *helm-verify2 + name: "{project-name}-{subproject}-{stream}-verify-helm2" + + builders: + - lf-infra-pre-build + - shell: !include-raw-escape: shell/helm2-repo-init.sh + - shell: "cd kubernetes/ ; make common ; make {subproject}" diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 4b0803c06..3c1329a44 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -5,117 +5,56 @@ project: oom mvn-settings: oom-settings mvn-global-settings: global-settings - archive-artifacts: '' + archive-artifacts: "" build-node: ubuntu1804-helm-2c-1g pre_build_script: !include-raw-escape: shell/helm-repo-init.sh oom_build_script: | - #!/bin/bash - set -e -o pipefail - cd kubernetes/ - if [ "$GERRIT_BRANCH" != "staging" ]; then - if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then - echo "[ERROR] Only release images are allowed in helm charts." - exit 1 - fi - fi - make all + #!/bin/bash + source helm.prop + set -e -o pipefail + cd kubernetes/ + make HELM_BIN=$HELM_BIN all subproject_build_script: | - #!/bin/bash - cd kubernetes/ - if [ "$GERRIT_BRANCH" != "staging" ]; then - if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then - echo "[ERROR] Only release images are allowed in helm charts." - exit 1 - fi - fi - make common - make {subproject} - oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh + #!/bin/bash + cd kubernetes/ + make HELM_BIN=$HELM_BIN common + make HELM_BIN=$HELM_BIN {subproject} stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - - 'dublin': - branch: 'dublin' - - 'casablanca': - branch: 'casablanca' + - "master": + branch: "master" + - "honolulu": + branch: "honolulu" - subproject: - - 'aaf': - files: 'kubernetes/aaf/**' - - 'aai': - files: 'kubernetes/aai/**' - - 'appc': - files: 'kubernetes/appc/**' - - 'clamp': - files: 'kubernetes/clamp/**' - - 'cli': - files: 'kubernetes/cli/**' - - 'common': - files: 'kubernetes/common/**' - - 'consul': - files: 'kubernetes/consul/**' - - 'dcaegen2': - files: 'kubernetes/dcaegen2/**' - - 'dmaap': - files: 'kubernetes/dmaap/**' - - 'esr': - files: 'kubernetes/esr/**' - - 'log': - files: 'kubernetes/log/**' - - 'msb': - files: 'kubernetes/msb/**' - - 'multicloud': - files: 'kubernetes/multicloud/**' - - 'nbi': - files: 'kubernetes/nbi/**' - - 'oof': - files: 'kubernetes/oof/**' - - 'policy': - files: 'kubernetes/policy/**' - - 'portal': - files: 'kubernetes/portal/**' - - 'readiness': - files: 'kubernetes/readiness/**' - - 'robot': - files: 'kubernetes/robot/**' - - 'sdc': - files: 'kubernetes/sdc/**' - - 'sdnc': - files: 'kubernetes/sdnc/**' - - 'sniro-emulator': - files: 'kubernetes/sniro-emulator/**' - - 'so': - files: 'kubernetes/so/**' - - 'uui': - files: 'kubernetes/uui/**' - - 'vfc': - files: 'kubernetes/vfc/**' - - 'vid': - files: 'kubernetes/vid/**' - - 'vnfsdk': - files: 'kubernetes/vnfsdk/**' + helm_bin: + - helm3.5 + - helm3.3 + + exclude: [] + subproject: [] jobs: - - '{project-name}-{stream}-verify-helm': - build_script: '{oom_build_script}' - files: '**' - - '{project-name}-{stream}-merge-helm': - build_script: '{oom_build_script}' - post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - files: '**' - - '{project-name}-{stream}-stage-helm': - build_script: '{oom_build_script}' + - "{project-name}-{stream}-image-verify": + files: "**" + - "{project-name}-{stream}-verify-{helm_bin}": + build_script: "{oom_build_script}" + files: "**" + build-timeout: 360 + - "{project-name}-{stream}-merge-helm": + build_script: "{oom_build_script}" + files: "**" + - "{project-name}-{stream}-release-helm": + build_script: "{oom_build_script}" post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - files: '**' + files: "**" # Below jobs disabled until future need. - - '{project-name}-{subproject}-{stream}-verify-helm': - build_script: '{subproject_build_script}' - - '{project-name}-{subproject}-{stream}-merge-helm': - build_script: '{subproject_build_script}' - - '{project-name}-{stream}-update-helm-weekly': - build_script: '{oom_build_script}' - files: '**' + - "{project-name}-{subproject}-{stream}-verify-helm2": + build_script: "{subproject_build_script}" + - "{project-name}-{subproject}-{stream}-verify-helm": + build_script: "{subproject_build_script}" + - "{project-name}-{subproject}-{stream}-merge-helm": + build_script: "{subproject_build_script}" + - "{project-name}-{stream}-update-helm-weekly": + build_script: "{oom_build_script}" + files: "**" diff --git a/jjb/oom/oom-image-verify.yaml b/jjb/oom/oom-image-verify.yaml new file mode 100644 index 000000000..8ac6e3a25 --- /dev/null +++ b/jjb/oom/oom-image-verify.yaml @@ -0,0 +1,53 @@ +--- +- job-template: + name: '{project-name}-{stream}-image-verify' + concurrent: true + branch: master + submodule-recursive: true + + build_script: '' + git-url: '$GIT_URL/$PROJECT' + post_build_script: '' + pre_build_script: '' + submodule-disable: false + submodule-timeout: 10 + + project-type: freestyle + node: '{build-node}' + + properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: '{project}' + stream: '{stream}' + lftools-version: '{lftools-version}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + publishers: + - lf-infra-publish + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + triggers: + - gerrit-trigger-helm-patch-submitted: + status-context: '{project}-Helm-Verify' + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{files}' + + builders: + - lf-infra-pre-build + - shell: 'cd kubernetes; make check-for-staging-images 2>&1' diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml new file mode 100644 index 000000000..a3bc20e35 --- /dev/null +++ b/jjb/oom/oom-main-linter.yaml @@ -0,0 +1,31 @@ +- project: + name: oom-main-linters + project: oom + project-name: oom + python-version: python3 + jobs: + - oom-linters + subproject: + - "commit": + tox-dir: "." + tox-envs: "gitlint" + pattern: "**" + - "doc8": + tox-dir: "." + tox-envs: "doc8" + pattern: "docs/**" + - "linkcheck": + tox-dir: "." + tox-envs: "docs-linkcheck" + pattern: "docs/**" + - "sphinx": + tox-dir: "." + tox-envs: "docs" + pattern: "docs/**" + stream: + - "master": + branch: "master" + - "frankfurt": + branch: "frankfurt" + - "guilin": + branch: "guilin" diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index e6f600cf2..5c0cffc88 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -22,10 +22,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - - 'elalto': - branch: 'elalto' + - 'guilin': + branch: 'guilin' mvn-settings: 'oparent-settings' java-version: openjdk11 files: '**' diff --git a/jjb/optf/optf-cmso-csit.yaml b/jjb/optf/optf-cmso-csit.yaml index 3b1de276a..5c4347331 100644 --- a/jjb/optf/optf-cmso-csit.yaml +++ b/jjb/optf/optf-cmso-csit.yaml @@ -11,6 +11,6 @@ branch: master functionality: - 'cmso': - trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily' + trigger_jobs: robot-options: '' branch: 'master' diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index 88c2384e2..180872cad 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -31,8 +31,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'optf-cmso-settings' java-version: openjdk11 @@ -74,8 +74,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'optf-cmso-settings' java-version: openjdk11 diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml deleted file mode 100644 index 5f4509b24..000000000 --- a/jjb/optf/optf-fgps.yaml +++ /dev/null @@ -1,121 +0,0 @@ ---- -- project: - name: optf-fgps-engine - project-name: 'optf-fgps' - project: 'optf/fgps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-fgps-settings' - subproject: - - 'engine': - path: 'engine' - pattern: 'engine/**' - pom: 'pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-builder-4c-4g' - -- project: - name: optf-fgps-valetapi - project-name: 'optf-fgps' - project: 'optf/fgps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-fgps-settings' - subproject: - - 'valetapi': - path: 'valetapi' - pattern: 'valetapi/**' - pom: 'pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-builder-4c-4g' - -- project: - name: optf-fgps-docker - project-name: 'optf-fgps' - project: 'optf/fgps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-fgps-settings' - subproject: - - 'valetapi': - path: 'valetapi' - pattern: 'valetapi/**' - 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-fgps-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-fgps-docker-image.sh' - build-node: queue-docker-4c-4g - -- project: - name: optf-fgps-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'optf/fgps' - project-name: 'optf-fgps' - branch: 'master' - mvn-settings: 'optf-fgps-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: optf-fgps-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: optf/fgps - project-name: 'optf-fgps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-fgps-settings' - -- project: - name: optf-fgps-info - project-name: optf-fgps - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: optf/fgps - branch: master diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml index 73b2771f0..5a723e4bb 100644 --- a/jjb/optf/optf-has-csit.yaml +++ b/jjb/optf/optf-has-csit.yaml @@ -1,15 +1,17 @@ - project: name: optf-has-csit jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' + - '{project-name}-review-verification-maven-{stream}': + mvn-goals: clean install + - '{project-name}-merge-verification-maven-{stream}': + mvn-goals: clean install project-name: optf-has recipients: 'snarayanan@research.att.com' + project: optf/has stream: - 'master': branch: 'master' - functionality: - - 'has': - trigger_jobs: - - '{project-name}-{stream}-conductor-docker-java-version-shell-daily' + - 'honolulu': + branch: 'honolulu' + mvn-settings: 'optf-has-settings' robot-options: '' diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 516ec8495..706802b96 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'optf-has-settings' subproject: - 'conductor': @@ -66,8 +66,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'optf-has-settings' - project: diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml index 7a9c7fc8b..9398122d4 100644 --- a/jjb/optf/optf-osdf-csit.yaml +++ b/jjb/optf/optf-osdf-csit.yaml @@ -1,15 +1,17 @@ - project: name: optf-osdf-csit jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' + - '{project-name}-review-verification-maven-{stream}': + mvn-goals: clean install + - '{project-name}-merge-verification-maven-{stream}': + mvn-goals: clean install project-name: optf-osdf recipients: 'snarayanan@research.att.com' + project: optf/osdf stream: - 'master': branch: 'master' - functionality: - - 'osdf': - trigger_jobs: - - '{project-name}-{stream}-osdf-docker-java-version-shell-daily' + - 'honolulu': + branch: 'honolulu' + mvn-settings: 'optf-osdf-settings' robot-options: '' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index c5a91f272..511f1fb87 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -7,8 +7,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -67,8 +67,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'optf-osdf-settings' - project: diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 8d8321c88..4b570604a 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -31,8 +31,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'policy-apex-pdp-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 3c9579685..3746aed4a 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -25,8 +25,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'policy-api-settings' java-version: openjdk11 files: '**' diff --git a/jjb/clamp/clamp.yaml b/jjb/policy/policy-clamp.yaml similarity index 56% rename from jjb/clamp/clamp.yaml rename to jjb/policy/policy-clamp.yaml index 67b3f67f4..85d8d16b7 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/policy/policy-clamp.yaml @@ -1,51 +1,46 @@ --- - project: - name: clamp-project-view - project-name: clamp - views: - - project-view - -- project: - name: clamp - project-name: 'clamp' + name: policy-clamp + project-name: 'policy-clamp' jobs: - gerrit-maven-stage: - build-node: ubuntu1804-docker-8c-8g + build-node: centos7-docker-8c-8g maven-versions-plugin: true + sign-artifacts: true + mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - - '{project-name}-{stream}-verify-java-checkstyle': - mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' - - '{project-name}-{stream}-merge-properties-java': - mvn_properties: - - docker.pull.registry=nexus3.onap.org:10001 - - docker.push.registry=nexus3.onap.org:10003 + - '{project-name}-{stream}-verify-java': + mvn-params: '-P docker' + build-node: ubuntu1804-docker-8c-16g + - '{project-name}-{stream}-merge-java': + build-node: ubuntu1804-docker-8c-16g + mvn-params: '-P docker' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - project: 'clamp' + project: 'policy/clamp' stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - - 'elalto': - branch: 'elalto' - mvn-settings: 'clamp-settings' + - 'honolulu': + branch: 'honolulu' + - 'tosca-poc': + branch: 'tosca-poc' + mvn-settings: 'policy-clamp-settings' java-version: openjdk11 files: '**' archive-artifacts: '' build-node: ubuntu1804-docker-8c-8g - project: - name: clamp-sonar + name: policy-clamp-sonar jobs: - gerrit-maven-sonar: - mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' @@ -53,33 +48,31 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1804-docker-8c-8g - project: 'clamp' - project-name: 'clamp' + project: 'policy/clamp' + project-name: 'policy-clamp' branch: 'master' - mvn-settings: 'clamp-settings' + mvn-settings: 'policy-clamp-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' java-version: openjdk11 - project: - name: clamp-clm + name: policy-clamp-clm jobs: - gerrit-maven-clm: - mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' nexus-iq-namespace: 'onap-' - project: 'clamp' - project-name: 'clamp' + project: 'policy/clamp' + project-name: 'policy-clamp' branch: 'master' - mvn-settings: 'clamp-settings' + mvn-settings: 'policy-clamp-settings' build-node: ubuntu1804-docker-8c-8g - build-timeout: 120 java-version: openjdk11 - project: - name: clamp-info - project-name: clamp + name: policy-clamp-info + project-name: policy-clamp jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g - project: clamp + project: policy/clamp branch: master diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index e3e0ce80e..1ca5db6a4 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -16,8 +16,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'policy-common-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml new file mode 100644 index 000000000..d18891549 --- /dev/null +++ b/jjb/policy/policy-csit-jobs.yaml @@ -0,0 +1,120 @@ +- job-template: + name: '{project-name}-{stream}-project-csit-{functionality}' + disabled: '{disabled}' + project-type: freestyle + build-node: 'ubuntu1804-docker-8c-8g' + node: '{build-node}' + recipients: '' + java-version: 'openjdk11' + python-version: python3 + + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - integration-test-options: + test-options: '{functionality}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - timed: '@daily' + - reverse: + jobs: '{obj:trigger_jobs}' + + builders: + - lf-infra-pre-build + - lf-update-java-alternatives: + java-version: '{java-version}' + - integration-install-robotframework + - inject: + properties-file: 'env.properties' + - integration-run-project-test + + publishers: + - integration-project-robot: + unstable-if: 0.0 + pass-if: 100.0 + - lf-infra-publish + - email: + recipients: '{recipients}' + notify-every-unstable-build: false + send-to-individuals: true + +- job-template: + name: '{project-name}-{stream}-project-csit-verify-{functionality}' + disabled: '{disabled}' + + project-type: freestyle + build-node: 'ubuntu1804-docker-8c-8g' + node: '{build-node}' + recipients: '' + java-version: 'openjdk11' + python-version: python3 + + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - integration-test-options: + test-options: '{functionality}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '**/csit/**' + + builders: + - lf-infra-pre-build + - lf-update-java-alternatives: + java-version: '{java-version}' + - integration-install-robotframework + - inject: + properties-file: 'env.properties' + - integration-run-project-test + + publishers: + - integration-project-robot: + unstable-if: 0.0 + pass-if: 100.0 + - lf-infra-publish + - email: + recipients: '{recipients}' + notify-every-unstable-build: false + send-to-individuals: true diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index 16025c0a8..7df8ae3c2 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -1,57 +1,185 @@ - project: - name: policy-apex-pdp-csit + name: policy-distribution-project-csit + jobs: + - '{project-name}-{stream}-project-csit-verify-{functionality}' + - '{project-name}-{stream}-project-csit-{functionality}' + project-name: 'policy-distribution' + recipients: 'ram_krishna.verma@bell.ca' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + functionality: + - 'distribution' + trigger_jobs: + - 'policy-distribution-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-xacml-pdp-project-csit + jobs: + - '{project-name}-{stream}-project-csit-verify-{functionality}' + - '{project-name}-{stream}-project-csit-{functionality}' + project-name: 'policy-xacml-pdp' + recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + functionality: + - 'xacml-pdp' + trigger_jobs: + - 'policy-xacml-pdp-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-drools-applications-project-csit + jobs: + - '{project-name}-{stream}-project-csit-verify-{functionality}' + - '{project-name}-{stream}-project-csit-{functionality}' + project-name: 'policy-drools-applications' + recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + functionality: + - 'drools-applications' + trigger_jobs: + - 'policy-drools-applications-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-drools-pdp-project-csit + jobs: + - '{project-name}-{stream}-project-csit-verify-{functionality}' + - '{project-name}-{stream}-project-csit-{functionality}' + project-name: 'policy-drools-pdp' + recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + functionality: + - 'drools-pdp' + trigger_jobs: + - 'policy-drools-pdp-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-apex-pdp-project-csit + jobs: + - '{project-name}-{stream}-project-csit-verify-{functionality}' + - '{project-name}-{stream}-project-csit-{functionality}' + project-name: 'policy-apex-pdp' + recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + functionality: + - 'apex-pdp' + trigger_jobs: + - 'policy-apex-pdp-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-pap-project-csit + jobs: + - '{project-name}-{stream}-project-csit-verify-{functionality}' + - '{project-name}-{stream}-project-csit-{functionality}' + project-name: 'policy-pap' + recipients: 'jrh3@att.com ram_krishna.verma@bell.ca' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + functionality: + - 'pap' + trigger_jobs: + - 'policy-pap-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-api-project-csit + jobs: + - '{project-name}-{stream}-project-csit-verify-{functionality}' + - '{project-name}-{stream}-project-csit-{functionality}' + project-name: 'policy-api' + recipients: 'jrh3@att.com ram_krishna.verma@bell.ca' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + functionality: + - 'api' + trigger_jobs: + - 'policy-api-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-api-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' java-version: openjdk11 - recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech' + recipients: 'jrh3@att.com ram_krishna.verma@bell.ca' stream: - - 'master': - branch: master - - 'frankfurt': - branch: frankfurt + - 'guilin': + branch: guilin functionality: - - 'apex-pdp' + - 'api' trigger_jobs: - - 'policy-apex-pdp-{stream}-merge-java' + - 'policy-api-{stream}-merge-java' robot-options: '' - project: - name: policy-distribution-csit + name: policy-apex-pdp-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' java-version: openjdk11 - recipients: 'ram.krishna.verma@est.tech' + recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca' stream: - - 'master': - branch: master - - 'frankfurt': - branch: frankfurt + - 'guilin': + branch: guilin functionality: - - 'distribution' + - 'apex-pdp' trigger_jobs: - - 'policy-distribution-{stream}-merge-java' + - 'policy-apex-pdp-{stream}-merge-java' robot-options: '' - project: - name: policy-api-csit + name: policy-distribution-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' java-version: openjdk11 + recipients: 'ram_krishna.verma@bell.ca' stream: - - 'master': - branch: master - - 'frankfurt': - branch: frankfurt + - 'guilin': + branch: guilin functionality: - - 'api' + - 'distribution' trigger_jobs: - - 'policy-api-{stream}-merge-java' + - 'policy-distribution-{stream}-merge-java' robot-options: '' - project: @@ -61,12 +189,10 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' java-version: openjdk11 - recipients: 'ah999m@att.com' + recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' stream: - - 'master': - branch: master - - 'frankfurt': - branch: frankfurt + - 'guilin': + branch: guilin functionality: - 'xacml-pdp' trigger_jobs: @@ -80,12 +206,10 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' java-version: openjdk11 - recipients: 'jrh3@att.com ram.krishna.verma@est.tech' + recipients: 'jrh3@att.com ram_krishna.verma@bell.ca' stream: - - 'master': - branch: master - - 'frankfurt': - branch: frankfurt + - 'guilin': + branch: guilin functionality: - 'pap' trigger_jobs: @@ -99,11 +223,10 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' java-version: openjdk11 + recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' stream: - - 'master': - branch: master - - 'frankfurt': - branch: frankfurt + - 'guilin': + branch: guilin functionality: - 'drools-pdp' trigger_jobs: @@ -117,11 +240,10 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' java-version: openjdk11 + recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' stream: - - 'master': - branch: master - - 'frankfurt': - branch: frankfurt + - 'guilin': + branch: guilin functionality: - 'drools-applications' trigger_jobs: diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 8788f5da1..f614feba3 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -25,8 +25,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'policy-distribution-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index 96e9c17fe..cf8b967e2 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -22,63 +22,10 @@ stream: - 'master': branch: 'master' - mvn-settings: 'policy-docker-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: policy-docker-base-common-frankfurt - project-name: 'policy-docker' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - project-name: 'policy-docker-amd64' - 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: ubuntu1804-docker-8c-8g - pattern: 'do_not_match_any_file' - - '{project-name}-{stream}-merge-java': - project-name: 'policy-docker-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: ubuntu1804-docker-arm64-4c-2g - pattern: 'do_not_match_any_file' - - '{project-name}-multiarch-{stream}-merge-java' - - gerrit-maven-docker-stage: - project-name: 'policy-docker-arm64' - build-node: ubuntu1804-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: - project-name: 'policy-docker-amd64' - build-node: ubuntu1804-docker-8c-8g - 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' - - '{project-name}-docker-manifest-{stream}': - build-node: ubuntu1804-docker-8c-8g - - '{project-name}-multiarch-docker-stage-{stream}' -# - '{project-name}-gerrit-release-jobs': -# build-node: centos7-docker-8c-8g - - project: 'policy/docker' - stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'policy-docker-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 166f5ca09..81bc61a36 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -25,8 +25,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'policy-drools-applications-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index cc056ce93..c27aab8fc 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -25,8 +25,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'policy-drools-pdp-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index 862c04031..43f096649 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -36,7 +36,7 @@ - project: name: policy-gui-sonar jobs: - - gerrit-maven-sonar + - gerrit-maven-sonar-prescan-script sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' @@ -51,6 +51,7 @@ java-version: openjdk11 mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - project: name: policy-gui-clm diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index a3a7b31e2..c2d5b485f 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -4,7 +4,10 @@ project-name: 'policy-models' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: '-P docker' + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -16,8 +19,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'policy-models-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 3bf16e61a..a7a7ce58a 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -25,8 +25,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'policy-pap-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 8d803fa5d..2ec9cb072 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -16,8 +16,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'policy-parent-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 4607aec95..d8abd90ab 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -25,8 +25,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'policy-xacml-pdp-settings' java-version: openjdk11 files: '**' diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index dca6674d6..86b4e69c8 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -14,7 +14,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true mvn-pom: 'ecomp-sdk/pom.xml' - mvn-params: '-f ecomp-sdk/pom.xml' + mvn-params: '-f ecomp-sdk/pom.xml -Dskiptests=true' pattern: 'ecomp-sdk/**' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' @@ -24,8 +24,8 @@ stream: - 'master': branch: 'master' - - 'release-3.2.0': - branch: 'release-3.2.0' + - 'release-3.4.0': + branch: 'release-3.4.0' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' @@ -34,7 +34,7 @@ - project: name: portal-sdk-sonar jobs: - - gerrit-maven-sonar + - gerrit-maven-sonar-prescan-script sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' @@ -49,6 +49,7 @@ mvn-settings: 'portal-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - project: name: portal-sdk-clm diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml index 04a637403..5fd34556d 100644 --- a/jjb/portal/portal-docker.yaml +++ b/jjb/portal/portal-docker.yaml @@ -17,8 +17,8 @@ stream: - 'master': branch: 'master' - - 'release-3.2.0': - branch: 'release-3.2.0' + - 'guilin': + branch: 'guilin' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 325d79ac4..ec3377276 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -13,7 +13,6 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - - '{project-name}-{stream}-release-java-daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -21,8 +20,8 @@ stream: - 'master': branch: 'master' - - 'release-3.2.0': - branch: 'release-3.2.0' + - 'guilin': + branch: 'guilin' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' @@ -32,7 +31,7 @@ - project: name: portal-sonar jobs: - - gerrit-maven-sonar + - gerrit-maven-sonar-prescan-script sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' @@ -46,6 +45,7 @@ mvn-settings: 'portal-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - project: name: 'portal-coverity' diff --git a/jjb/rtdv3/rtdv3.yaml b/jjb/rtdv3/rtdv3.yaml index 017218aa8..a4cec8374 100644 --- a/jjb/rtdv3/rtdv3.yaml +++ b/jjb/rtdv3/rtdv3.yaml @@ -24,7 +24,8 @@ comment-contains-value: remerge$ jobs: - rtdv3-global-verify - - rtdv3-global-merge + - rtdv3-global-merge: + build-timeout: 30 stream: - master: branch: '*' diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index fe8d56c83..c4fcc36a3 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -1,43 +1,29 @@ --- - project: - name: sdc-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}-testng' - - '{project-name}-{stream}-csit-{functionality}-testng' - project-name: 'sdc' - recipients: 'ofir.sonsino@intl.att.com' - stream: - - 'master': - branch: 'master' - functionality: - - 'sanity': - trigger_jobs: '{project-name}-{stream}-sdc-merge-java' - - 'nightly': - trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' - - 'uiSanity': - trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' - robot-options: '' - branch: 'master' - html-dir: 'archives' - html-files: 'SDC_CI_Extent_Report.html' - -#- project: -# name: sdc-csit-arm64 -# jobs: -# - '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng' -# - '{project-name}-arm64-{stream}-csit-{functionality}-testng' -# project-name: 'sdc' -# stream: -# - 'master': -# branch: 'master' -# functionality: -# - 'sanity': -# trigger_jobs: '{project-name}-{stream}-sdc-merge-java' -# - 'nightly': -# trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' -# - 'uiSanity': -# trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' -# robot-options: '' -# branch: 'master' -# html-dir: 'archives' -# html-files: 'SDC_CI_Extent_Report.html' + name: sdc-csit + jobs: + - '{project-name}-{stream}-verify-java': + # this build is integration test only - CSIT (Verify 2/2) + mvn-goals: clean install + mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only' + build-node: 'ubuntu1804-docker-8c-16g' + archive-artifacts: > + **/*.log + **/hs_err_*.log + **/target/**/feature.xml + **/target/failsafe-reports/failsafe-summary.xml + integration-tests/target/ExtentReport/API/*.html + integration-tests/target/ExtentReport/UI/*.html + integration-tests/target/ExtentReport/UI/screenshots/*.png + project-name: 'sdc-integration-tests' + # project name in gerrit + project: 'sdc' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'sdc-settings' + mvn-global-settings: global-settings diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml deleted file mode 100644 index bd2f1d43f..000000000 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ /dev/null @@ -1,87 +0,0 @@ ---- -- project: - name: sdc-dcae-d-project-view - project-name: sdc-dcae-d - views: - - project-view - -- project: - name: sdc-dcae-d-ci - project-name: 'sdc-dcae-d-ci' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -DskipTests=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - project: 'sdc/dcae-d/ci' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-dcae-d-ci-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -#- project: -# name: sdc-dcae-d-ci-arm64 -# project-name: 'sdc-dcae-d-ci-arm64' -# jobs: -# - '{project-name}-{stream}-docker-version-java-daily': -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-DskipTests=true' -# build-node: 'ubuntu1804-docker-arm64-4c-2g' -# project: 'sdc/dcae-d/ci' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'sdc-dcae-d-ci-settings' -# files: '**' -# archive-artifacts: '' -# build-timeout: 60 -# -- project: - name: sdc-dcae-ci-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'sdc/dcae-d/ci' - project-name: 'sdc-dcae-d-ci' - branch: 'master' - mvn-settings: 'sdc-dcae-d-ci-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-dcae-d-ci-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: sdc/dcae-d/ci - project-name: 'sdc-dcae-d-ci' - branch: 'master' - mvn-settings: 'sdc-dcae-d-ci-settings' - -- project: - name: sdc-dcae-d-ci-info - project-name: sdc-dcae-d-ci - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/dcae-d/ci - branch: master diff --git a/jjb/sdc/sdc-dcae-d-csit.yaml b/jjb/sdc/sdc-dcae-d-csit.yaml deleted file mode 100644 index a8a8f3eed..000000000 --- a/jjb/sdc/sdc-dcae-d-csit.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- project: - name: sdc-dcae-d-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'sdc-dcae-d' - recipients: 'ofir.sonsino@intl.att.com' - stream: - - 'master': - branch: 'master' - functionality: - - 'dcaed': - trigger_jobs: - - 'sdc-{stream}-docker-version-java-daily' - - '{project-name}-dt-be-main-{stream}-docker-version-java-daily' - - '{project-name}-dt-{stream}-docker-version-java-daily' - - '{project-name}-fe-{stream}-docker-version-java-daily' - - '{project-name}-tosca-lab-{stream}-docker-java-daily' - robot-options: '' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml deleted file mode 100644 index 312761027..000000000 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -- project: - name: sdc-dcae-d-dt-be-main - project-name: 'sdc-dcae-d-dt-be-main' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -DskipTests=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: 'sdc/dcae-d/dt-be-main' - stream: - - 'master': - branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'sdc-dcae-d-dt-be-main-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -#- project: -# name: sdc-dcae-d-dt-be-main-arm64 -# project-name: 'sdc-dcae-d-dt-be-main-arm64' -# jobs: -# - '{project-name}-{stream}-docker-version-java-daily': -# build-node: 'ubuntu1804-docker-arm64-4c-2g' -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-DskipTests=true' -# project: 'sdc/dcae-d/dt-be-main' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'sdc-dcae-d-dt-be-main-settings' -# build-node: ubuntu1804-docker-arm64-4c-2g -# files: '**' -# archive-artifacts: '' -# build-timeout: 60 -# -- project: - name: sdc-dcae-d-dt-be-main-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'sdc/dcae-d/dt-be-main' - project-name: 'sdc-dcae-d-dt-be-main' - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-be-main-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-dcae-d-dt-be-main-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: sdc/dcae-d/dt-be-main - project-name: 'sdc-dcae-d-dt-be-main' - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-be-main-settings' - -- project: - name: sdc-dcae-d-dt-be-main-info - project-name: sdc-dcae-d-dt-be-main - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/dcae-d/dt-be-main - branch: master diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml deleted file mode 100644 index 71801952b..000000000 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ /dev/null @@ -1,57 +0,0 @@ ---- -- project: - name: sdc-dcae-d-dt-be-property - project-name: 'sdc-dcae-d-dt-be-property' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - project: 'sdc/dcae-d/dt-be-property' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-be-property-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -- project: - name: sdc-dcae-d-dt-be-property-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'sdc/dcae-d/dt-be-property' - project-name: 'sdc-dcae-d-dt-be-property' - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-be-property-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-dcae-d-dt-be-property-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: sdc/dcae-d/dt-be-property - project-name: 'sdc-dcae-d-dt-be-property' - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-be-property-settings' - -- project: - name: sdc-dcae-d-dt-be-property-info - project-name: sdc-dcae-d-dt-be-property - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/dcae-d/dt-be-property - branch: master diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml deleted file mode 100644 index 22117c78a..000000000 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ /dev/null @@ -1,89 +0,0 @@ ---- -- project: - name: sdc-dcae-d-dt - project-name: 'sdc-dcae-d-dt' - build-node: ubuntu1804-builder-4c-4g - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P server,docker -DskipTests=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: 'sdc/dcae-d/dt' - stream: - - 'master': - branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'sdc-dcae-d-dt-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -#- project: -# name: sdc-dcae-d-dt-arm64 -# project-name: 'sdc-dcae-d-dt-arm64' -# build-node: ubuntu1804-docker-arm64-4c-2g -# jobs: -# - '{project-name}-{stream}-docker-version-java-daily': -# build-node: 'ubuntu1804-docker-arm64-4c-2g' -# docker-pom: 'pom.xml' -# mvn-profile: 'server,docker' -# mvn-params: '-DskipTests=true' -# project: 'sdc/dcae-d/dt' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'sdc-dcae-d-dt-settings' -# files: '**' -# archive-artifacts: '' -# build-timeout: 60 -# -- project: - name: sdc-dcae-d-dt-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'sdc/dcae-d/dt' - project-name: 'sdc-dcae-d-dt' - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-dcae-d-dt-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: sdc/dcae-d/dt - project-name: 'sdc-dcae-d-dt' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-settings' - -- project: - name: sdc-dcae-d-dt-info - project-name: sdc-dcae-d-dt - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/dcae-d/dt - branch: master diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml deleted file mode 100644 index fcd7d51a4..000000000 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ /dev/null @@ -1,88 +0,0 @@ ---- -- project: - name: sdc-dcae-d-fe - project-name: 'sdc-dcae-d-fe' - build-node: ubuntu1804-builder-4c-4g - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -DskipTests=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: 'sdc/dcae-d/fe' - stream: - - 'master': - branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'sdc-dcae-d-fe-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -#- project: -# name: sdc-dcae-d-fe-arm64 -# project-name: 'sdc-dcae-d-fe-arm64' -# jobs: -# - '{project-name}-{stream}-docker-version-java-daily': -# build-node: 'ubuntu1804-docker-arm64-4c-2g' -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-DskipTests=true' -# project: 'sdc/dcae-d/fe' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'sdc-dcae-d-fe-settings' -# files: '**' -# archive-artifacts: '' -# build-timeout: 60 -# -- project: - name: sdc-dcae-d-fe-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'sdc/dcae-d/fe' - project-name: 'sdc-dcae-d-fe' - branch: 'master' - mvn-settings: 'sdc-dcae-d-fe-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-dcae-d-fe-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: sdc/dcae-d/fe - project-name: 'sdc-dcae-d-fe' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'sdc-dcae-d-fe-settings' - -- project: - name: sdc-dcae-d-fe-info - project-name: sdc-dcae-d-fe - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/dcae-d/fe - branch: master diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml deleted file mode 100644 index 1165d58cb..000000000 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ /dev/null @@ -1,73 +0,0 @@ ---- -- project: - name: sdc-dcae-d-tosca-lab - project-name: 'sdc-dcae-d-tosca-lab' - project: 'sdc/dcae-d/tosca-lab' - stream: - - 'master': - branch: 'master' - subproject: - - dcae-d-tosca-lab: - path: '.' - pattern: '**' - mvn-settings: 'sdc-dcae-d-tosca-lab-settings' - build-node: ubuntu1804-docker-8c-8g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P default -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 - docker-pom: 'pom.xml' - mvn-profile: 'default' - -#- project: -# name: sdc-dcae-d-tosca-lab-arm64 -# project-name: 'sdc-dcae-d-tosca-lab-arm64' -# project: 'sdc/dcae-d/tosca-lab' -# stream: -# - 'master': -# branch: 'master' -# subproject: -# - dcae-d-tosca-lab: -# path: '.' -# pattern: '**' -# mvn-settings: 'sdc-dcae-d-tosca-lab-settings' -# build-node: ubuntu1804-docker-arm64-4c-2g -# jobs: -# - '{project-name}-{stream}-docker-java-daily': -# mvn-params: '-Dmaven.test.skip=true' -# docker-pom: 'pom.xml' -# mvn-profile: 'default' -# -- project: - name: sdc-dcae-d-tosca-lab-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: '@daily' - build-node: ubuntu1804-docker-8c-8g - project: 'sdc/dcae-d/tosca-lab' - project-name: 'sdc-dcae-d-tosca-lab' - branch: 'master' - mvn-settings: 'sdc-dcae-d-tosca-lab-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-dcae-d-tosca-lab-info - project-name: sdc-dcae-d-tosca-lab - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/dcae-d/tosca-lab - branch: master diff --git a/jjb/sdc/sdc-microservices.yaml b/jjb/sdc/sdc-microservices.yaml deleted file mode 100644 index 0aad2486a..000000000 --- a/jjb/sdc/sdc-microservices.yaml +++ /dev/null @@ -1,74 +0,0 @@ ---- -- project: - name: sdc-microservices-project-view - project-name: sdc-microservices - views: - - project-view - -- project: - name: sdc-microservices - project-name: 'sdc-microservices' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-v1-8c-8g - maven-versions-plugin: true - mvn-params: '-DskipTests=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - subproject: - - 'catalog-facade-ms': - pom: 'catalog-facade-ms/pom.xml' - pattern: 'catalog-facade-ms/**' - project: 'sdc/microservices' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-microservices-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - maven-version: 'mvn35' - -- project: - name: sdc-microservices-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'sdc/microservices' - project-name: 'sdc-microservices' - branch: 'master' - mvn-settings: 'sdc-microservices-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-microservices-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: sdc/microservices - project-name: 'sdc-microservices' - branch: 'master' - mvn-settings: 'sdc-microservices-settings' - -- project: - name: sdc-microservices-info - project-name: sdc-microservices - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/microservices - branch: master diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml index ef6ff5a88..f7c811cdd 100644 --- a/jjb/sdc/sdc-onap-ui-angular.yaml +++ b/jjb/sdc/sdc-onap-ui-angular.yaml @@ -24,6 +24,8 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' 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 7f6689f2c..28d0a787d 100644 --- a/jjb/sdc/sdc-onap-ui-common.yaml +++ b/jjb/sdc/sdc-onap-ui-common.yaml @@ -18,6 +18,8 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'sdc-onap-ui-common-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-onap-ui-react.yaml b/jjb/sdc/sdc-onap-ui-react.yaml deleted file mode 100644 index 45b97928a..000000000 --- a/jjb/sdc/sdc-onap-ui-react.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- project: - name: sdc-onap-ui-react-info - project-name: 'sdc-onap-ui-react' - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: 'sdc/onap-ui-react' - branch: 'master' - -- project: - name: sdc-onap-ui-react - project-name: 'sdc-onap-ui-react' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - project: 'sdc/onap-ui-react' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-onap-ui-react-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - maven-version: 'mvn35' - -- project: - name: sdc-onap-ui-react-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'sdc/onap-ui-react' - project-name: 'sdc-onap-ui-react' - branch: 'master' - mvn-settings: 'sdc-onap-ui-react-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml index 487967d7a..c7e66c2d9 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' - - 'elalto': - branch: 'elalto' + - 'honolulu': + branch: 'honolulu' 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 7250a8472..c3b9ce346 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -22,12 +22,35 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: 'sdc-sdc-distribution-client-settings' files: '**' archive-artifacts: '' build-timeout: 60 maven-version: 'mvn35' +- project: + name: sdc-sdc-distribution-client-integration-pairwise + java-version: openjdk11 + jobs: + - '{project-name}-{stream}-integration-pairwise' + build-node: ubuntu1804-docker-8c-8g + project: 'sdc/sdc-distribution-client' + project-name: 'sdc-sdc-distribution-client' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: 'sdc-sdc-distribution-client-settings' + files: '**' + archive-artifacts: '' + build-timeout: 60 + maven-version: 'mvn35' + mvn-params: ' -P integration-pairwise' + - project: name: sdc-sdc-distribution-client-sonar jobs: @@ -43,6 +66,7 @@ project-name: 'sdc-sdc-distribution-client' branch: 'master' mvn-settings: 'sdc-sdc-distribution-client-settings' + java-version: openjdk11 mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' @@ -56,6 +80,7 @@ project-name: 'sdc-sdc-distribution-client' branch: 'master' mvn-settings: 'sdc-sdc-distribution-client-settings' + java-version: openjdk11 - project: name: sdc-sdc-distribution-client-info diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 57726b71e..d83b2e502 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -23,6 +23,8 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-helm-validator-csit.yaml b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml new file mode 100644 index 000000000..d8d2ba447 --- /dev/null +++ b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: sdc-sdc-helm-validator-csit + jobs: + - "{project-name}-{stream}-verify-csit-{functionality}" + - "{project-name}-{stream}-csit-{functionality}" + project-name: "sdc" + stream: + - "master": + branch: "master" + functionality: + - "sdc-helm-validator": + trigger_jobs: + robot-options: "" diff --git a/jjb/policy/policy-engine.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml similarity index 50% rename from jjb/policy/policy-engine.yaml rename to jjb/sdc/sdc-sdc-helm-validator.yaml index 64ba91e94..5b8780967 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/sdc/sdc-sdc-helm-validator.yaml @@ -1,38 +1,51 @@ --- - project: - name: policy-engine - project-name: 'policy-engine' + name: sdc-sdc-helm-validator-project-view + project-name: sdc-sdc-helm-validator + views: + - project-view + +- project: + name: sdc-sdc-helm-validator-info + project: sdc/sdc-helm-validator + project-name: sdc-sdc-helm-validator + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: sdc-sdc-helm-validator + project-name: 'sdc-sdc-helm-validator' + java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: "-P docker" + - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + mvn-goals: 'clean deploy' - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true' + mvn-goals: 'clean install docker:build docker:push' 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: 'policy/engine' + project: 'sdc/sdc-helm-validator' + mvn-settings: 'sdc-sdc-helm-validator-settings' stream: - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'policy-engine-settings' - java-version: openjdk11 + - 'master': + branch: 'master' files: '**' archive-artifacts: '' - build-node: 'ubuntu1804-docker-8c-8g' + build-node: ubuntu1804-docker-8c-8g + - project: - name: policy-engine-sonar + name: sdc-sdc-helm-validator-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -41,33 +54,22 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'policy/engine' - project-name: 'policy-engine' - branch: 'frankfurt' - mvn-settings: 'policy-engine-settings' - java-version: openjdk11 + build-node: ubuntu1804-docker-8c-8g + project: 'sdc/sdc-helm-validator' + project-name: 'sdc-sdc-helm-validator' + branch: 'master' + mvn-settings: 'sdc-sdc-helm-validator-settings' + mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' + mvn-opts: '-Xmx1024m' - project: - name: policy-engine-clm - jobs: - - gerrit-maven-clm: - build-timeout: 40 - nexus-iq-namespace: 'onap-' - project: policy/engine - project-name: 'policy-engine' - branch: 'frankfurt' - mvn-settings: 'policy-engine-settings' + name: sdc-sdc-helm-validator-clm java-version: openjdk11 - build-node: 'ubuntu1804-builder-4c-4g' - -- project: - name: policy-engine-info - project-name: policy-engine jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: policy/engine - branch: frankfurt + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'sdc/sdc-helm-validator' + project-name: 'sdc-sdc-helm-validator' + branch: 'master' + mvn-settings: 'sdc-sdc-helm-validator-settings' diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index adaa2d5d0..5cdb6fc9b 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -18,6 +18,8 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' 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 51d91ee5c..a86d3b2de 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -22,6 +22,8 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' 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 9c2d0576e..abc59665a 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -28,10 +28,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - - 'elalto': - branch: 'elalto' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'sdc-sdc-workflow-designer-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 862447a95..0fa71bef1 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -1,10 +1,4 @@ --- -- project: - name: sdc-master-project-view - project-name: sdc-master - views: - - project-view - - project: name: sdc-sdc-docker-project-view project-name: sdc-sdc-docker @@ -23,27 +17,45 @@ views: - project-view +- project: + name: sdc-project-view + project-name: sdc + views: + - project-view + - project: name: sdc project-name: 'sdc' jobs: - '{project-name}-{stream}-verify-java': - mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + # this build is unit test only (Verify 1/2) + mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' + build-node: 'ubuntu1804-docker-8c-8g' - '{project-name}-{stream}-sdc-merge-java': - build-node: 'ubuntu1804-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-8c-16g' docker-pom: 'pom.xml' mvn-profile: 'docker' - mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' + # running everything (unit tests and integration tests in a single job for merge, as we don't need // run + # for merge, but still saving integration tests results and report. + archive-artifacts: > + **/*.log + **/hs_err_*.log + **/target/**/feature.xml + **/target/failsafe-reports/failsafe-summary.xml + integration-tests/target/ExtentReport/API/*.html + integration-tests/target/ExtentReport/UI/*.html + integration-tests/target/ExtentReport/UI/screenshots/*.png - gerrit-maven-stage: build-timeout: 90 sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -53,10 +65,13 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - - 'elalto': - branch: 'elalto' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 +# - 'frankfurt': +# branch: 'frankfurt' +# java-version: openjdk8 mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' @@ -90,44 +105,32 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu1804-docker-8c-16g project: 'sdc' project-name: 'sdc' branch: 'master' mvn-settings: 'sdc-settings' - mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + java-version: openjdk11 + mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' - project: - name: sdc-clm-catalog - jobs: - - gerrit-maven-clm: - build-timeout: 120 - submodule-timeout: 30 - mvn-params: '-P catalog -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' - nexus-iq-namespace: 'onap-' - project: sdc - project-name: 'sdc-catalog' - build-node: ubuntu1804-docker-8c-8g - branch: 'master' - mvn-settings: 'sdc-settings' - -- project: - name: sdc-clm-onboarding + name: sdc-clm jobs: - gerrit-maven-clm: build-timeout: 120 submodule-timeout: 30 - mvn-params: '-P onboarding -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' nexus-iq-namespace: 'onap-' project: sdc - project-name: 'sdc-onboarding' + project-name: 'sdc' build-node: ubuntu1804-docker-8c-8g branch: 'master' mvn-settings: 'sdc-settings' + java-version: openjdk11 - project: name: sdc-info @@ -152,3 +155,4 @@ mvn-clean-install: true project: 'sdc' branch: master + java-version: openjdk11 diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 0b04a27f7..4e5b1c201 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - maven-version: "mvn35" + maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -30,8 +30,12 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version : "mvn36" mvn-settings: 'sdnc-apps-settings' # due to a strange macro / variable translation problem this needs to be @@ -41,7 +45,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -60,10 +64,12 @@ project: 'sdnc/apps' project-name: 'sdnc-apps' branch: 'master' + java-version: openjdk11 + mvn-version : "mvn36" mvn-settings: 'sdnc-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" # #- project: @@ -94,6 +100,8 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 + mvn-version : "mvn36" mvn-settings: 'sdnc-apps-settings' - project: diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index 4450a34b7..71f7180fd 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -1,18 +1,20 @@ --- - project: - name: sdnc-csit + name: sdnc-oam-csit jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'sdnc' + - '{project-name}-review-verification-maven-{stream}': + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' + maven-versions-plugin: true + - '{project-name}-merge-verification-maven-{stream}': + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' + maven-versions-plugin: true + project-name: 'sdnc-oam' recipients: 'dtimoney@att.com' + # project name in gerrit + project: 'sdnc/oam' stream: - 'master': branch: 'master' - functionality: - - 'healthcheck': - trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' - - 'sdnc_netconf_tls_post_deploy': - trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' + mvn-settings: 'sdnc-oam-settings' robot-options: '' branch: 'master' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index ee7c79dd1..9ba264e76 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -17,8 +17,12 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: "mvn36" mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be @@ -49,7 +53,8 @@ branch: 'master' mvn-settings: 'sdnc-northbound-settings' mvn-goals: 'clean install' - maven-version: "mvn35" + java-version: openjdk11 + mvn-version: "mvn36" mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: @@ -64,6 +69,8 @@ - 'master': branch: 'master' mvn-settings: 'sdnc-northbound-settings' + java-version: openjdk11 + mvn-version: 'mvn36' - project: name: sdnc-northbound-info diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 428251ac8..7380359f0 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -26,10 +26,12 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-version: "mvn36" mvn-settings: 'sdnc-oam-settings' maven-version: "mvn35" files: '**' @@ -69,6 +71,8 @@ - 'master': branch: 'master' mvn-settings: 'sdnc-oam-settings' + java-version: openjdk11 + mvn-version: 'mvn36' - project: name: sdnc-oam-info diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml deleted file mode 100644 index ae86ef5bf..000000000 --- a/jjb/sdnc/sdnc-oom.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -- project: - name: sdnc-oom - helm-module: 'sdnc' - project-name: 'sdnc-oom' - project: 'sdnc/oom' - jobs: - - '{project-name}-{stream}-verify-external-helm' - - '{project-name}-{stream}-merge-external-helm': - build_script: '{oom_build_script}' - post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - files: '**' - stream: - - 'master': - branch: 'master' - - mvn-settings: 'sdnc-oom-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-helm-2c-1g - pre_build_script: !include-raw-escape: shell/helm-repo-init.sh - oom_build_script: | - #!/bin/bash - set -e -o pipefail - cd kubernetes/ - make all - build_script: | - #!/bin/bash - cd kubernetes/ - make common - make {helm-module} - oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - -- project: - name: sdnc-oom-info - project-name: sdnc-oom - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdnc/oom - branch: master diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml similarity index 52% rename from jjb/aai/aai-esr-server.yaml rename to jjb/so/so-adapters-so-cnf-adapter.yaml index 1c8b96110..e0f1fa141 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@ -1,13 +1,21 @@ --- - project: - name: aai-esr-server-project-view - project-name: aai-esr-server + name: so-adapters-so-cnf-adapter-project-view + project-name: so-adapters-so-cnf-adapter views: - project-view - project: - name: aai-esr-server-master - project-name: 'aai-esr-server' + name: so-adapters-so-cnf-adapter-info + project: so/adapters/so-cnf-adapter + project-name: so-adapters-so-cnf-adapter + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: so-adapters-so-cnf-adapter + project-name: 'so-adapters-so-cnf-adapter' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -16,27 +24,29 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: '-f standalone/pom.xml -P docker docker:build -B -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - project: 'aai/esr-server' + project: 'so/adapters/so-cnf-adapter' stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'aai-esr-server-settings' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: 'so-adapters-so-cnf-adapter-settings' files: '**' archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu1804-docker-v1-8c-8g - project: - name: aai-esr-server-sonar + name: so-adapters-so-cnf-adapter-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -45,31 +55,11 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'aai/esr-server' - project-name: 'aai-esr-server' + max-git-repo-age-hours: 48 + build-node: ubuntu1804-docker-v1-8c-8g + project: 'so/adapters/so-cnf-adapter' + project-name: 'so-adapters-so-cnf-adapter' branch: 'master' - mvn-settings: 'aai-esr-server-settings' + mvn-settings: 'so-adapters-so-cnf-adapter-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: aai-esr-server-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/esr-server' - project-name: 'aai-esr-server' - stream: - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'aai-esr-server-settings' - -- project: - name: aai-esr-server-info - project-name: aai-esr-server - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aai/esr-server - branch: master diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml new file mode 100644 index 000000000..86f3f21a6 --- /dev/null +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -0,0 +1,79 @@ +--- +- project: + name: so-adapters-so-etsi-sol003-adapter-project-view + project-name: so-adapters-so-etsi-sol003-adapter + views: + - project-view + +- project: + name: so-adapters-so-etsi-sol003-adapter-info + project: so/adapters/so-etsi-sol003-adapter + project-name: so-adapters-so-etsi-sol003-adapter + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: so-adapters-so-etsi-sol003-adapter + project-name: 'so-adapters-so-etsi-sol003-adapter' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-v1-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -DskipTests' + 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: 'so/adapters/so-etsi-sol003-adapter' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-v1-8c-8g + +- project: + name: so-adapters-so-etsi-sol003-adapter-sonar + java-version: openjdk11 + 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' + max-git-repo-age-hours: 48 + build-node: ubuntu1804-docker-v1-8c-8g + project: 'so/adapters/so-etsi-sol003-adapter' + project-name: 'so-adapters-so-etsi-sol003-adapter' + branch: 'master' + mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: so-adapters-so-etsi-sol003-adapter-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'so/adapters/so-etsi-sol003-adapter' + project-name: 'so-adapters-so-etsi-sol003-adapter' + build-node: ubuntu1804-docker-v1-8c-8g + stream: + - 'master': + branch: 'master' + mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings' diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml new file mode 100644 index 000000000..2d1a8d545 --- /dev/null +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@ -0,0 +1,65 @@ +--- +- project: + name: so-adapters-so-etsi-sol005-adapter-project-view + project-name: so-adapters-so-etsi-sol005-adapter + views: + - project-view + +- project: + name: so-adapters-so-etsi-sol005-adapter-info + project: so/adapters/so-etsi-sol005-adapter + project-name: so-adapters-so-etsi-sol005-adapter + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: so-adapters-so-etsi-sol005-adapter + project-name: 'so-adapters-so-etsi-sol005-adapter' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-v1-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -DskipTests' + 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: 'so/adapters/so-etsi-sol005-adapter' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-v1-8c-8g + +- project: + name: so-adapters-so-etsi-sol005-adapter-sonar + java-version: openjdk11 + 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' + max-git-repo-age-hours: 48 + build-node: ubuntu1804-docker-v1-8c-8g + project: 'so/adapters/so-etsi-sol005-adapter' + project-name: 'so-adapters-so-etsi-sol005-adapter' + branch: 'master' + mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml new file mode 100644 index 000000000..a39a460f7 --- /dev/null +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -0,0 +1,65 @@ +--- +- project: + name: so-adapters-so-nssmf-adapter-project-view + project-name: so-adapters-so-nssmf-adapter + views: + - project-view + +- project: + name: so-adapters-so-nssmf-adapter-info + project: so/adapters/so-nssmf-adapter + project-name: so-adapters-so-nssmf-adapter + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: so-adapters-so-nssmf-adapter + project-name: 'so-adapters-so-nssmf-adapter' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-v1-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -DskipTests' + 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: 'so/adapters/so-nssmf-adapter' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: 'so-adapters-so-nssmf-adapter-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-v1-8c-8g + +- project: + name: so-adapters-so-nssmf-adapter-sonar + java-version: openjdk11 + 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' + max-git-repo-age-hours: 48 + build-node: ubuntu1804-docker-v1-8c-8g + project: 'so/adapters/so-nssmf-adapter' + project-name: 'so-adapters-so-nssmf-adapter' + branch: 'master' + mvn-settings: 'so-adapters-so-nssmf-adapter-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml new file mode 100644 index 000000000..2138fcf9a --- /dev/null +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@ -0,0 +1,65 @@ +--- +- project: + name: so-adapters-so-oof-adapter-project-view + project-name: so-adapters-so-oof-adapter + views: + - project-view + +- project: + name: so-adapters-so-oof-adapter-info + project: so/adapters/so-oof-adapter + project-name: so-adapters-so-oof-adapter + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: so-adapters-so-oof-adapter + project-name: 'so-adapters-so-oof-adapter' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-v1-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -DskipTests' + 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: 'so/adapters/so-oof-adapter' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: 'so-adapters-so-oof-adapter-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-v1-8c-8g + +- project: + name: so-adapters-so-oof-adapter-sonar + java-version: openjdk11 + 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' + max-git-repo-age-hours: 48 + build-node: ubuntu1804-docker-v1-8c-8g + project: 'so/adapters/so-oof-adapter' + project-name: 'so-adapters-so-oof-adapter' + branch: 'master' + mvn-settings: 'so-adapters-so-oof-adapter-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index d976f855c..d142a34e3 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -1,6 +1,7 @@ --- - project: name: so-csit + java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' @@ -9,13 +10,20 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - - 'frankfurt': - branch: 'frankfurt' + java-version: openjdk11 + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 functionality: - - 'integration-testing': - trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' - - 'integration-etsi-testing': - trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' +# integration testing suites disabled until brought up to date, +# see https://jira.onap.org/browse/SO-3632 +# - 'integration-testing': +# trigger_jobs: +# - 'integration-etsi-testing': +# trigger_jobs: + - 'macroflow': + trigger_jobs: robot-options: '' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index c6d9ab5d1..c7d7bb71a 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -15,10 +15,13 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - - 'frankfurt': - branch: 'frankfurt' + java-version: openjdk11 + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: 'so-libs-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 @@ -30,6 +33,7 @@ - project: name: so-libs-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -41,6 +45,7 @@ build-node: ubuntu1804-builder-4c-4g project: 'so/libs' project-name: 'so-libs' + java-version: openjdk11 branch: 'master' mvn-settings: 'so-libs-settings' mvn-goals: 'clean install' @@ -48,20 +53,23 @@ - project: name: so-libs-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' project: so/libs project-name: 'so-libs' + java-version: openjdk11 branch: 'master' mvn-settings: 'so-libs-settings' - project: name: so-libs-info project-name: so-libs + java-version: openjdk11 jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g project: so/libs branch: master - branch: elalto + branch: guilin diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml new file mode 100644 index 000000000..7e5614400 --- /dev/null +++ b/jjb/so/so-so-admin-cockpit.yaml @@ -0,0 +1,108 @@ +--- +- project: + name: so-so-admin-cockpit-project-view + project-name: so-so-admin-cockpit + views: + - project-view + +- project: + name: so-so-admin-cockpit-info + project: so/so-admin-cockpit + project-name: so-so-admin-cockpit + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: so-so-admin-cockpit + project-name: 'so-so-admin-cockpit' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-v1-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -DskipTests' + 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: 'so/so-admin-cockpit' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: 'so-so-admin-cockpit-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-v1-8c-8g + +- project: + name: so-so-admin-cockpit-sonar + java-version: openjdk11 + 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' + max-git-repo-age-hours: 48 + build-node: ubuntu1804-docker-v1-8c-8g + project: 'so/so-admin-cockpit' + project-name: 'so-so-admin-cockpit' + branch: 'master' + mvn-settings: 'so-so-admin-cockpit-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: 'so-so-admin-cockpit-coverity' + java-version: openjdk11 + jobs: + - 'onap-gerrit-maven-coverity' + cron: '@daily' + build-node: 'ubuntu1804-docker-v1-8c-8g' + project: 'so/so-admin-cockpit' + project-name: 'so-so-admin-cockpit' + branch: 'master' + mvn-settings: 'so-so-admin-cockpit-settings' + mvn-params: '-DskipTests' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + coverity-project-name: 'onap-so' + coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ' + coverity-user-email: 'A.Naluzhnyy@samsung.com' + coverity-search-paths: > + so-admin-cockpit-monitoring-workflow/so-admin-cockpit-monitoring-workflow-ui/src/main/frontend/src + coverity-search-exclude-regexs: > + /cov-int/ + /cov-analysis- + ^/usr/ + ^/home/ + /node_modules/ + /bower_components/ + /bower_components_external/ + /src/test/ + /__test__/ + +- project: + name: so-so-admin-cockpit-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'so/so-admin-cockpit' + project-name: 'so-so-admin-cockpit' + build-node: ubuntu1804-docker-v1-8c-8g + stream: + - 'master': + branch: 'master' + mvn-settings: 'so-so-admin-cockpit-settings' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/so/so-so-etsi-nfvo.yaml similarity index 55% rename from jjb/aai/aai-data-router.yaml rename to jjb/so/so-so-etsi-nfvo.yaml index 823dab737..5a54d934a 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/so/so-so-etsi-nfvo.yaml @@ -1,13 +1,21 @@ --- - project: - name: aai-data-router-project-view - project-name: aai-data-router + name: so-so-etsi-nfvo-project-view + project-name: so-so-etsi-nfvo views: - project-view - project: - name: aai-data-router-master - project-name: 'aai-data-router' + name: so-so-etsi-nfvo-info + project: so/so-etsi-nfvo + project-name: so-so-etsi-nfvo + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: so-so-etsi-nfvo + project-name: 'so-so-etsi-nfvo' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -16,24 +24,29 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: '-P docker -B -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - project: 'aai/data-router' + project: 'so/so-etsi-nfvo' stream: - - 'frankfurt': - branch: 'frankfurt' - 'master': branch: 'master' - mvn-settings: 'aai-data-router-settings' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: 'so-so-etsi-nfvo-settings' files: '**' archive-artifacts: '' + build-node: ubuntu1804-docker-v1-8c-8g - project: - name: aai-data-router-sonar + name: so-so-etsi-nfvo-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -42,31 +55,25 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'aai/data-router' - project-name: 'aai-data-router' + max-git-repo-age-hours: 48 + build-node: ubuntu1804-docker-v1-8c-8g + project: 'so/so-etsi-nfvo' + project-name: 'so-so-etsi-nfvo' branch: 'master' - mvn-settings: 'aai-data-router-settings' + mvn-settings: 'so-so-etsi-nfvo-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: - name: aai-data-router-clm + name: so-so-etsi-nfvo-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - project: 'aai/data-router' - project-name: 'aai-data-router' + project: 'so/so-etsi-nfvo' + project-name: 'so-so-etsi-nfvo' + build-node: ubuntu1804-docker-v1-8c-8g stream: - 'master': branch: 'master' - mvn-settings: 'aai-data-router-settings' - -- project: - name: aai-data-router-info - project-name: aai-data-router - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aai/data-router - branch: master + mvn-settings: 'so-so-etsi-nfvo-settings' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index fd41484fb..6fae06bc6 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -2,6 +2,7 @@ - project: name: so-project-view project-name: so + java-version: openjdk11 views: - project-view @@ -27,10 +28,13 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - - 'elalto': - branch: 'elalto' + java-version: openjdk11 + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 mvn-settings: 'so-settings' files: '**' archive-artifacts: '' @@ -38,6 +42,7 @@ - project: name: so-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -57,6 +62,7 @@ - project: name: 'so-coverity' + java-version: openjdk11 jobs: - 'onap-gerrit-maven-coverity' cron: '@daily' @@ -85,6 +91,7 @@ - project: name: so-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -99,9 +106,11 @@ - project: name: so-info project-name: so + java-version: openjdk11 jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g project: so branch: master - branch: frankfurt + branch: guilin + branch: honolulu diff --git a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml index b1b3f54c2..1486ba987 100644 --- a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml +++ b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml @@ -43,3 +43,7 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' diff --git a/jjb/testsuite/testsuite-cds-mock-odl.yaml b/jjb/testsuite/testsuite-cds-mock-odl.yaml new file mode 100644 index 000000000..65c818c1f --- /dev/null +++ b/jjb/testsuite/testsuite-cds-mock-odl.yaml @@ -0,0 +1,70 @@ +--- +- project: + name: testsuite-cds-mock-odl-project-view + project-name: testsuite-cds-mock-odl + views: + - project-view + +- project: + name: testsuite-cds-mock-odl-info + project: testsuite/cds-mock-odl + project-name: testsuite-cds-mock-odl + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: testsuite-cds-mock-odl-linters + project: 'testsuite/cds-mock-odl' + project-name: 'testsuite-cds-mock-odl' + 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: 'testsuite-cds-mock-odl-docker' + jobs: + - gerrit-docker-verify: + project-name: 'testsuite-cds-mock-odl' + docker-root: . + docker-name: 'onap/cds-mock-odl' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'testsuite-cds-mock-odl' + docker-root: . + docker-name: 'onap/cds-mock-odl' + docker-build-args: '-f ./docker/Dockerfile' + project: 'testsuite/cds-modk-odl' + stream: + - 'master': + branch: 'master' + files: '' + docker-root: '$WORKSPACE' + mvn-settings: 'testsuite-cds-mock-odl-settings' + build-node: ubuntu1804-docker-8c-8g + cron: '@daily' + container-tag-method: stream diff --git a/jjb/testsuite/testsuite-cds-mock-server.yaml b/jjb/testsuite/testsuite-cds-mock-server.yaml new file mode 100644 index 000000000..c6bc7a308 --- /dev/null +++ b/jjb/testsuite/testsuite-cds-mock-server.yaml @@ -0,0 +1,47 @@ +--- +- project: + name: testsuite-cds-mock-server-project-view + project-name: testsuite-cds-mock-server + views: + - project-view + +- project: + name: testsuite-cds-mock-server-info + project: testsuite/cds-mock-server + project-name: testsuite-cds-mock-server + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: testsuite-cds-mock-server-linters + project: 'testsuite/cds-mock-server' + project-name: 'testsuite-cds-mock-server' + 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/testsuite/testsuite-cds-mock-ssh.yaml b/jjb/testsuite/testsuite-cds-mock-ssh.yaml new file mode 100644 index 000000000..9fad20fa9 --- /dev/null +++ b/jjb/testsuite/testsuite-cds-mock-ssh.yaml @@ -0,0 +1,47 @@ +--- +- project: + name: testsuite-cds-mock-ssh-project-view + project-name: testsuite-cds-mock-ssh + views: + - project-view + +- project: + name: testsuite-cds-mock-ssh-info + project: testsuite/cds-mock-ssh + project-name: testsuite-cds-mock-ssh + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: testsuite-cds-mock-ssh-linters + project: 'testsuite/cds-mock-ssh' + project-name: 'testsuite-cds-mock-ssh' + 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/testsuite/testsuite-cds.yaml b/jjb/testsuite/testsuite-cds.yaml new file mode 100644 index 000000000..2fef96a11 --- /dev/null +++ b/jjb/testsuite/testsuite-cds.yaml @@ -0,0 +1,40 @@ +--- +- project: + name: testsuite-cds-info + project: testsuite/cds + project-name: testsuite-cds + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: testsuite-cds-linters + project: 'testsuite/cds' + project-name: 'testsuite-cds' + 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/testsuite/testsuite-heatbridge.yaml b/jjb/testsuite/testsuite-heatbridge.yaml index 77f8cb502..e0f9c9f0c 100644 --- a/jjb/testsuite/testsuite-heatbridge.yaml +++ b/jjb/testsuite/testsuite-heatbridge.yaml @@ -16,10 +16,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' - - 'elalto': - branch: 'elalto' mvn-settings: 'testsuite-heatbridge-settings' files: '**' archive-artifacts: '' diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml index a8993e130..fd84d7e8a 100644 --- a/jjb/testsuite/testsuite-python-testing-utils.yaml +++ b/jjb/testsuite/testsuite-python-testing-utils.yaml @@ -14,10 +14,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' - - 'elalto': - branch: 'elalto' mvn-settings: 'testsuite-python-testing-utils-settings' files: '**' archive-artifacts: '' @@ -30,10 +26,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' - - 'elalto': - branch: 'elalto' mvn-settings: 'testsuite-python-testing-utils-settings' build-node: 'centos7-builder-4c-4g' subproject: diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index cb70a0819..0ea7129b7 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -27,8 +27,10 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' mvn-settings: 'testsuite-settings' - project: @@ -60,10 +62,14 @@ tox-dir: '.' tox-envs: 'json' pattern: '**/*.json' -# - 'robot': -# tox-dir: '.' -# tox-envs: 'robot' -# pattern: '**/*.robot' + - 'robot': + tox-dir: '.' + tox-envs: 'robot' + pattern: 'robot/testsuites/usecases/*.robot' stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' diff --git a/jjb/ubuntu-latest-nodejs.sh b/jjb/ubuntu-latest-nodejs.sh new file mode 100644 index 000000000..04e3a10fb --- /dev/null +++ b/jjb/ubuntu-latest-nodejs.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# SPDX-License-Identifier: EPL-1.0 +############################################################################## +# Copyright (c) 2021 The Linux Foundation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################## +echo "---> ubuntu-latest-nodejs.sh" + +set -eufo pipefail + +sudo apt update +sudo apt install -y nodejs npm +sudo npm install -g n +sudo n stable diff --git a/jjb/usecases/usecases-csit.yaml b/jjb/usecases/usecases-csit.yaml index 8e7098360..c9e70d8b7 100644 --- a/jjb/usecases/usecases-csit.yaml +++ b/jjb/usecases/usecases-csit.yaml @@ -1,20 +1,4 @@ --- -- project: - name: usecases-5G-bulkpm-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'usecases-5G-bulkpm' - recipients: 'morgan.richomm@orange.com bf1936@att.com lego@est.tech' - stream: - - 'master': - branch: 'master' - functionality: - - '5G-bulkpm': - trigger_jobs: - - '{project-name}-{stream}-docker-java-shell-daily' - robot-options: '' - - project: name: usecases-pnf-sw-upgrade jobs: @@ -28,7 +12,6 @@ functionality: - 'pnf-sw-upgrade': trigger_jobs: - - '{project-name}-{stream}-docker-java-shell-daily' robot-options: '' - project: @@ -44,6 +27,4 @@ functionality: - 'config-over-netconf': trigger_jobs: - - '{project-name}-{stream}-docker-java-shell-daily' robot-options: '' - diff --git a/jjb/music/music.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml similarity index 62% rename from jjb/music/music.yaml rename to jjb/usecaseui/usecase-ui-nlp.yaml index 0d152365b..bb984aebb 100644 --- a/jjb/music/music.yaml +++ b/jjb/usecaseui/usecase-ui-nlp.yaml @@ -1,13 +1,13 @@ --- -- project: - name: music-project-view - project-name: music - views: - - project-view - project: - name: music - project-name: 'music' + name: usecase-ui-nlp + project-name: 'usecase-ui-nlp' + project: 'usecase-ui/nlp' + stream: + - 'master': + branch: 'master' + mvn-settings: 'usecase-ui-nlp-settings' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -15,27 +15,19 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - - gerrit-maven-docker-stage: + - '{project-name}-{stream}-docker-java-daily': + mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - project: 'music' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'music-settings' files: '**' archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: docker build-node: ubuntu1804-builder-4c-4g - project: - name: music-sonar + name: usecase-ui-nlp-sonar jobs: - gerrit-maven-sonar sonarcloud: true @@ -45,29 +37,35 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1804-builder-4c-4g - project: 'music' - project-name: 'music' + project: 'usecase-ui/nlp' + project-name: 'usecase-ui-nlp' branch: 'master' - mvn-settings: 'music-settings' + mvn-settings: 'usecase-ui-nlp-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - - project: - name: music-clm + name: usecase-ui-nlp-clm jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - project: music - project-name: 'music' + project: usecase-ui/nlp + project-name: 'usecase-ui-nlp' + build-node: ubuntu1804-builder-4c-4g branch: 'master' - mvn-settings: 'music-settings' + mvn-settings: 'usecase-ui-nlp-settings' - project: - name: music-info - project-name: music + name: usecase-ui-nlp-info + project-name: usecase-ui-nlp jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g - project: music + project: usecase-ui/nlp branch: master + +- project: + name: usecase-ui-nlp-project-view + project-name: usecase-ui-nlp + views: + - project-view diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index f8784524a..1db7b6777 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -2,6 +2,7 @@ - project: name: vfc-nfvo-driver-svnfm-huawei project-name: 'vfc-nfvo-driver-svnfm-huawei' + java-version: openjdk11 project: 'vfc/nfvo/driver/vnfm/svnfm' stream: - 'master': @@ -28,6 +29,7 @@ - project: name: vfc-nfvo-driver-svnfm-huawei-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -47,6 +49,7 @@ - project: name: vfc-nfvo-driver-svnfm-huawei-clm + java-version: openjdk11 jobs: - gerrit-maven-clm: mvn-params: '-f huawei/pom.xml' @@ -60,6 +63,7 @@ - project: name: vfc-nfvo-driver-svnfm-huawei-info project-name: vfc-nfvo-driver-svnfm-huawei + java-version: openjdk11 jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml index 6f734e5fc..7722ce035 100644 --- a/jjb/vid/vid-csit.yaml +++ b/jjb/vid/vid-csit.yaml @@ -11,19 +11,5 @@ branch: 'master' functionality: - 'healthCheck': - trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' + trigger_jobs: robot-options: '' - -#- project: -# name: vid-csit-arm64 -# jobs: -# - '{project-name}-arm64-{stream}-verify-csit-{functionality}' -# - '{project-name}-arm64-{stream}-csit-{functionality}' -# project-name: 'vid' -# stream: -# - 'master': -# branch: 'master' -# functionality: -# - 'healthCheck': -# trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' -# robot-options: '' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 75da082a1..748bb5e16 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -27,8 +27,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' @@ -53,7 +53,7 @@ - project: name: vid-sonar jobs: - - gerrit-maven-sonar + - gerrit-maven-sonar-prescan-script sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' @@ -67,6 +67,7 @@ mvn-settings: 'vid-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - project: name: vid-clm diff --git a/jjb/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml index 69f158cea..0df13c59e 100644 --- a/jjb/vnfrqts/build-and-upload.yaml +++ b/jjb/vnfrqts/build-and-upload.yaml @@ -66,5 +66,4 @@ - lf-provide-maven-settings-cleanup publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish diff --git a/jjb/vnfsdk/generate-dosc.sh b/jjb/vnfsdk/generate-dosc.sh new file mode 100644 index 000000000..06b00ab80 --- /dev/null +++ b/jjb/vnfsdk/generate-dosc.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +cd $WORKSPACE/csarvalidation/python/ +virtualenv -p python3 ./venv +source ./venv/bin/activate +pip install --upgrade pip +pip install -r ./requirements.txt + +cd ./main +export OUTPUT_DIRECTORY="$WORKSPACE/generated/active-validation-rules/Honolulu/" +python3 ./generate_active_validation_rules_table.py diff --git a/jjb/vnfsdk/upload-artifact.sh b/jjb/vnfsdk/upload-artifact.sh new file mode 100644 index 000000000..f384f4725 --- /dev/null +++ b/jjb/vnfsdk/upload-artifact.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -e -o pipefail +if [ -z "$PROJECT_ID" ] +then + echo "ERROR: NO PROJECT ID ENTERED" + exit 1 +else + cd $WORKSPACE/generated/active-validation-rules/Honolulu/ + for FILE_NAME in *.csv ; do + echo "-n --upload-file $FILE_NAME https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$FILE_NAME" + curl -n --upload-file "$FILE_NAME" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$FILE_NAME" + done + exit 0 +fi diff --git a/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml b/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml new file mode 100644 index 000000000..2a970b3a4 --- /dev/null +++ b/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml @@ -0,0 +1,14 @@ +- project: + name: vnfsdk-marketplace-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vnfsdk-marketplace' + recipients: 'kanagaraj.manickam@huawei.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com' + stream: + - 'master': + branch: 'master' + functionality: + - 'testsuites': + trigger_jobs: + robot-options: '' diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml new file mode 100644 index 000000000..bff645b9e --- /dev/null +++ b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml @@ -0,0 +1,14 @@ +- project: + name: vnfsdk-refrepo-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vnfsdk-refrepo' + recipients: 'kanagaraj.manickam@huawei.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com' + stream: + - 'master': + branch: 'master' + functionality: + - 'testsuites': + trigger_jobs: + robot-options: '' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index d43564192..ffc6c064b 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -17,45 +17,24 @@ container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g -# - '{project-name}-{stream}-docker-version-java-daily': -# docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-Dmaven.test.skip=true' -# build-node: ubuntu1804-docker-8c-8g project: 'vnfsdk/refrepo' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + java-version: openjdk11 + - 'frankfurt': + branch: 'frankfurt' + java-version: openjdk8 mvn-settings: 'vnfsdk-refrepo-settings' files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g -#- project: -# name: vnfsdk-refrepo-arm64 -# project-name: 'vnfsdk-refrepo-arm64' -# jobs: -# - '{project-name}-{stream}-aai-docker-java-daily': -# pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml' -# mvn-goals: 'docker:build' -# docker-image-name: 'onap/vnfsdk/refrepo' -# - '{project-name}-{stream}-docker-version-java-daily': -# docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-Dmaven.test.skip=true' -# project: 'vnfsdk/refrepo' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'vnfsdk-refrepo-settings' -# files: '**' -# archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g -# - project: name: vnfsdk-refrepo-sonar jobs: - gerrit-maven-sonar + java-version: openjdk11 sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' @@ -81,6 +60,7 @@ - project: name: vnfsdk-refrepo-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 3d5a602a1..55a011703 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -13,8 +13,12 @@ build-node: centos7-docker-8c-8g project: 'vnfsdk/validation' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + java-version: openjdk11 + - 'frankfurt': + branch: 'frankfurt' + java-version: openjdk8 mvn-settings: 'vnfsdk-validation-settings' files: '**' archive-artifacts: '' @@ -24,6 +28,7 @@ name: vnfsdk-validation-sonar jobs: - gerrit-maven-sonar + java-version: openjdk11 sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' @@ -49,6 +54,7 @@ - project: name: vnfsdk-validation-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -57,3 +63,18 @@ build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'vnfsdk-validation-settings' + +- project: + name: vnfsdk-validation-upload-docs + project: 'vnfsdk/validation' + project-name: 'vnfsdk-requirements' + mvn-settings: 'vnfsdk-validation-settings' + mvn-global-settings: 'global-settings' + stream: + - 'master': + branch: 'master' + jobs: + - '{project-name}-{stream}-build-and-upload': + pre_script: !include-raw-escape: ./generate-dosc.sh + project_id: org.onap.vnfsdk.validation + post_script: !include-raw-escape: ./upload-artifact.sh diff --git a/packer/common-packer b/packer/common-packer index da5d5cf92..74b6be730 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit da5d5cf92fafcdc0f31a76d2955e8ac9c327c100 +Subproject commit 74b6be7301b5c407d1ccf4cf6093b3b8cd308ad7 diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml index daecffee9..479be5396 100644 --- a/packer/provision/helm.yaml +++ b/packer/provision/helm.yaml @@ -8,31 +8,109 @@ vars: kubectl_version: 1.15.11 helm_version: 2.16.6 + helm3_3_version: 3.3.4 + helm3_5_version: 3.5.1 + chartmuseum_version: 0.12.0 tasks: - name: 'Install kubectl {{kubectl_version}}' get_url: - url: https://storage.googleapis.com/kubernetes-release/release/v{{kubectl_version}}/bin/linux/amd64/kubectl + url: "https://storage.googleapis.com/kubernetes-release/release/v{{kubectl_version}}/bin/linux/amd64/kubectl" dest: /usr/local/bin/kubectl mode: 0775 become: yes - name: 'Install Helm {{helm_version}}' block: - - name: 'Fetch tar.gz' + - name: 'Fetch tar.gz for {{helm_version}}' get_url: - url: http://storage.googleapis.com/kubernetes-helm/helm-v{{helm_version}}-linux-amd64.tar.gz - dest: /tmp/helm-v{{helm_version}}-linux-amd64.tar.gz - - name: 'Unarchive' + url: "http://storage.googleapis.com/kubernetes-helm/helm-v{{helm_version}}-linux-amd64.tar.gz" + dest: "/tmp/helm-v{{helm_version}}-linux-amd64.tar.gz" + - name: 'Unarchive {{helm_version}}' unarchive: - src: /tmp/helm-v{{helm_version}}-linux-amd64.tar.gz + src: "/tmp/helm-v{{helm_version}}-linux-amd64.tar.gz" dest: /tmp remote_src: true become: yes - - name: 'Move helm to /usr/local/bin and set as executable' + - name: 'Move {{helm_version}} bin to /usr/local/bin and set as executable' command: 'mv /tmp/linux-amd64/helm /usr/local/bin/helm' become: yes - - name: 'Check helm.' + - name: 'Check Helm {{helm_version}}' command: 'which helm' - - name: 'Check kubectl.' + + - name: 'Install Helm 3.3 {{helm3_3_version}}' + block: + - name: 'Create directory /tmp/helm3_3' + file: + path: /tmp/helm3_3 + state: directory + - name: 'Fetch tar.gz for Helm 3.3' + get_url: + url: "https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz" + dest: /tmp/helm3_3 + - name: 'Unarchive Helm 3.3' + unarchive: + src: "/tmp/helm3_3/helm-v{{helm3_3_version}}-linux-amd64.tar.gz" + dest: /tmp/helm3_3 + remote_src: true + become: yes + - name: 'Move Helm 3.3 bin to /usr/local/bin and set as executable' + command: 'mv /tmp/helm3_3/linux-amd64/helm /usr/local/bin/helm3.3' + become: yes + - name: 'Check Helm 3.3' + command: 'which helm3.3' + - name: 'Check kubectl {{kubectl_version}}' command: 'which kubectl' + + - name: 'Install Helm 3.3' + shell: | + echo "----> Installing helm 3.3" + wget 'https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz' + tar -xvf 'https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz' + mv linux-amd64/helm /usr/local/bin/helm3.3 + which helm3.3 + become: true + + - name: 'Install Helm3.5 {{helm3_5_version}}' + block: + - name: 'Create directory /tmp/helm3.5' + file: + path: /tmp/helm3.5 + state: directory + - name: 'Fetch tar.gz for Helm 3.5' + get_url: + url: "https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz" + dest: /tmp/helm3.5 + - name: 'Unarchive Helm 3.5' + unarchive: + src: "/tmp/helm3.5/helm-v{{helm3_5_version}}-linux-amd64.tar.gz" + dest: /tmp/helm3.5 + remote_src: true + become: yes + - name: 'Move Helm 3.5 bin to /usr/local/bin and set as executable' + command: 'mv /tmp/helm3.5/linux-amd64/helm /usr/local/bin/helm3.5' + become: yes + - name: 'Check Helm 3.5' + command: 'which helm3.5' + - name: 'Check kubectl {{kubectl_version}}' + command: 'which kubectl' + + - name: 'Install Helm 3.5' + shell: | + echo "----> Installing helm3.5" + wget 'https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz' + tar -xvf 'https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz' + mv linux-amd64/helm /usr/local/bin/helm3.5 + which helm3.5 + become: true + + - name: 'Install ChartMuseum {{chartmuseum_version}}' + block: + - name: 'Fetch bin for ChartMuseum' + get_url: + url: "https://s3.amazonaws.com/chartmuseum/release/v{{ chartmuseum_version }}/bin/linux/amd64/chartmuseum" + dest: /usr/local/bin/chartmuseum + mode: "0755" + become: yes + - name: 'Check ChartMuseum {{chartmuseum_version}}' + command: 'which chartmuseum' diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index 346098144..18017b888 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -52,6 +52,25 @@ become: true when: ansible_distribution == 'Ubuntu' + - name: Install Python 3.8 + apt: + name: + - python3.8 + - python3.8-dev + - python3.8-tk + become: true + when: ansible_distribution == 'Ubuntu' + + - name: Install Python 3.9 + apt: + name: + - python3.9 + - python3.9-dev + - python3.9-tk + - python3.9-distutils + become: true + when: ansible_distribution == 'Ubuntu' + - name: Install libssl1.0-dev dep apt: name: libssl1.0-dev diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index 0948cd004..5d9b7c35a 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -106,6 +106,25 @@ become: true when: ansible_distribution == 'Ubuntu' + - name: Install Python 3.8 + apt: + name: + - python3.8 + - python3.8-dev + - python3.8-tk + become: true + when: ansible_distribution == 'Ubuntu' + + - name: Install Python 3.9 + apt: + name: + - python3.9 + - python3.9-dev + - python3.9-tk + - python3.9-distutils + become: true + when: ansible_distribution == 'Ubuntu' + - name: Install nodejs-dev libssl1.0-dev dep apt: name: diff --git a/packer/templates/helm.json b/packer/templates/helm.json index 51a151cbf..93f9161b9 100644 --- a/packer/templates/helm.json +++ b/packer/templates/helm.json @@ -14,7 +14,7 @@ }, "builders": [ { - "name": "vexxhost", + "name": "openstack", "image_name": "ZZCI - {{user `distro`}} - helm - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-builder-{{uuid}}", "source_image_name": "{{user `base_image`}}", diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json index 5bf17839f..cd6daeebe 100644 --- a/packer/templates/memcached.json +++ b/packer/templates/memcached.json @@ -14,7 +14,7 @@ }, "builders": [ { - "name": "vexxhost", + "name": "openstack", "image_name": "{{user `distro`}} - memcached - {{user `arch`}} - {{isotime \"20180101-1003\"}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", diff --git a/packer/templates/redis.json b/packer/templates/redis.json index 87caeee08..b52a8ac7e 100644 --- a/packer/templates/redis.json +++ b/packer/templates/redis.json @@ -14,7 +14,7 @@ }, "builders": [ { - "name": "vexxhost", + "name": "openstack", "image_name": "{{user `distro`}} - redis - {{user `arch`}} - {{isotime \"20180101-1003\"}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", diff --git a/shell/helm-repo-init.sh b/shell/helm-repo-init.sh old mode 100644 new mode 100755 index fb2f81029..d8990434a --- a/shell/helm-repo-init.sh +++ b/shell/helm-repo-init.sh @@ -2,8 +2,9 @@ # Ensure we fail the job if any steps fail set -e -o pipefail -# client only init, tiller will not be installed -helm init --client-only -cd kubernetes/ || exit -make repo -cd .. +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 +$HELM_BIN repo add local http://localhost:6464 diff --git a/shell/helm2-repo-init.sh b/shell/helm2-repo-init.sh new file mode 100755 index 000000000..23bcdce02 --- /dev/null +++ b/shell/helm2-repo-init.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# Ensure we fail the job if any steps fail +set -e -o pipefail + +# client only init, tiller will not be installed +helm init --client-only --skip-refresh +helm repo rm stable +cd kubernetes/ || exit +make repo +cd .. diff --git a/shell/helm2-verify.sh b/shell/helm2-verify.sh new file mode 100755 index 000000000..c652a5cf9 --- /dev/null +++ b/shell/helm2-verify.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# Ensure we fail the job if any steps fail +set -e -o pipefail + +cd kubernetes/ +make all diff --git a/shell/publish_helm_charts.sh b/shell/publish_helm_charts.sh index 23c5fbd9d..9c511c5b6 100755 --- a/shell/publish_helm_charts.sh +++ b/shell/publish_helm_charts.sh @@ -20,8 +20,7 @@ for chart in "${helm_charts[@]}"; do curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GERRIT_BRANCH/$GIT_COMMIT/$chart" ;; 'release') - echo "Release automation not implemented yet." - exit 1 + curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$chart" ;; *) echo "You must set BUILD_TYPE to one of (snapshot, staging, release)."