From: Thanh Ha (zxiiro) Date: Tue, 4 Aug 2020 11:20:38 +0000 (+0000) Subject: Merge "Move unimgr Sonar scan to Sonarcloud" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=30a4c3cc962489798af3c74eb63ebf0624c7db22;hp=c232627c9b0bb36528924afc372cea0917193ac4 Merge "Move unimgr Sonar scan to Sonarcloud" --- diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 275074f2d..7ff009625 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ --- repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.2.1 + rev: v2.5.0 hooks: - id: check-json - id: flake8 @@ -10,12 +10,12 @@ repos: - id: trailing-whitespace - repo: https://github.com/jorisroovers/gitlint - rev: v0.11.0 + rev: v0.13.1 hooks: - id: gitlint - repo: https://github.com/jumanjihouse/pre-commit-hooks - sha: 1.11.0 + sha: 2.0.2 hooks: - id: shellcheck exclude: > @@ -25,6 +25,6 @@ repos: )$ - repo: https://github.com/adrienverge/yamllint - rev: v1.15.0 + rev: v1.23.0 hooks: - id: yamllint diff --git a/INFO.yaml b/INFO.yaml new file mode 100644 index 000000000..a1f7cc007 --- /dev/null +++ b/INFO.yaml @@ -0,0 +1,88 @@ +--- +project: 'releng_builder' +project_creation_date: '2014-10-22' +project_category: 'Integration & Testing' +lifecycle_state: 'Incubation' +project_lead: &odl_releng_builder_ptl + name: 'Thanh Ha' + email: 'zxiiro@gmail.com' + id: 'zxiiro' + company: 'Lumina Networks' + timezone: 'America/Toronto' +primary_contact: *odl_releng_builder_ptl +issue_tracking: + type: 'jira' + url: 'https://jira.opendaylight.org/projects/' + key: 'releng_builder' +mailing_list: + type: 'groups.io' + url: 'release@lists.opendaylight.org' + tag: '[]' +realtime_discussion: + type: 'irc' + server: 'freenode.net' + channel: '#lf-releng' +meetings: + - type: '' + agenda: 'https://wiki.opendaylight.org' + url: '' + server: 'freenode.net' + channel: '#lf-releng' + repeats: '' + time: '' +repositories: + - releng/builder +committers: + - <<: *odl_releng_builder_ptl + - name: 'Andrew Grimberg' + email: 'agrimberg@linuxfoundation.org' + company: 'Linux Foundation' + id: 'agrimberg' + timezone: 'America/Los_Angeles' + - name: 'Sam Hague' + email: 'shague@redhat.com' + company: 'redhat' + id: 'shague' + timezone: 'Unknown/Unknown' + - name: 'Jamo Luhrsen' + email: 'jluhrsen@gmail.com' + company: 'Lumina Networks' + id: 'jluhrsen' + timezone: 'America/Los_Angeles' + - name: 'Anil Belur' + email: 'abelur@linuxfoundation.org' + company: 'Linux Foundation' + id: 'askb' + timezone: 'Unknown/Unknown' + - name: 'Marcus Williams' + email: 'marcus.williams@intel.com' + company: 'intel' + id: 'mgkwill' + timezone: 'Unknown/Unknown' + - name: 'Luis Gomez' + email: 'ecelgp@gmail.com' + company: 'Lumina Networks' + id: 'ecelgp' + timezone: 'Unknown/Unknown' + - name: 'Daniel Farrell' + email: 'dfarrell07@gmail.com' + company: '' + id: 'dfarrell07' + timezone: 'Unknown/Unknown' + - name: 'Venkatrangan Govindarajan' + email: 'vgovindarajan@luminanetworks.com' + company: 'Lumina Networks' + id: 'gvrangan' + timezone: 'Asia/Kolkata' + - name: 'Faseela K' + email: 'k.faseela@gmail.com' + company: '' + id: 'k.faseela' + timezone: 'Asia/Kolkata' +tsc: + # yamllint disable rule:line-length + approval: 'https://meetings.opendaylight.org/opendaylight-meeting/2014/tsc/opendaylight-meeting-tsc.2014-10-23-16.59.html' + changes: + - type: '' + name: '' + link: '' diff --git a/docs/jenkins.rst b/docs/jenkins.rst index 622960279..e8a0c1962 100644 --- a/docs/jenkins.rst +++ b/docs/jenkins.rst @@ -260,8 +260,8 @@ Pool: ODLVEX prd-centos7-autorelease-4c-16g Packer Template
releng/builder/packer/templates/builder.json - Spinup Script
- releng/builder/jenkins-scripts/builder.sh + Playbook
+ releng/builder/packer/common-packer/provision/baseline.yaml @@ -278,7 +278,7 @@ Pool: ODLVEX Minion Template names
centos7-robot-2c-2g Packer Template
releng/builder/packer/templates/robot.json - Spinup Script
releng/builder/jenkins-scripts/robot.sh + Playbook
releng/builder/packer/provision/robot.yaml @@ -292,27 +292,38 @@ Pool: ODLVEX - Jenkins Labels
ubuntu1404-mininet-2c-2g - Minion Template names
ubuntu1404-mininet-2c-2g - Packer Template
- releng/builder/packer/teamplates/mininet.json - Spinup Script
releng/builder/jenkins-scripts/mininet-ubuntu.sh + Jenkins Labels
ubuntu1604-mininet-ovs-25-2c-2g + Minion Template names
ubuntu1604-mininet-ovs-25-2c-2g + Packer Template
releng/builder/packer/templates/mininet-ovs-2.5.json + Playbook
releng/builder/packer/provision//mininet-ovs-2.5.yaml + + + + Basic Ubuntu 16.04 (Xenial) system with ovs 2.5 and mininet 2.2.1 + + + + + Jenkins Labels
ubuntu1604-mininet-ovs-26-2c-2g + Minion Template names
ubuntu1604-mininet-ovs-26-2c-2g + Packer Template
releng/builder/packer/templates/mininet-ovs-2.6.json + Playbook
releng/builder/packer/provision//mininet-ovs-2.6.yaml - Basic Ubuntu 14.04 (Trusty) system with ovs 2.0.2 and mininet 2.1.0 + Ubuntu 16.04 (Xenial) system with ovs 2.6 and mininet 2.2.1 - Jenkins Labels
ubuntu1404-mininet-ovs-23-2c-2g - Minion Template names
ubuntu1404-mininet-ovs-23-2c-2g - Packer Template
releng/builder/packer/templates/mininet-ovs-2.3.json - Spinup Script
releng/builder/jenkins-scripts/mininet-ubuntu.sh + Jenkins Labels
ubuntu1604-mininet-ovs-28-2c-2g + Minion Template names
ubuntu1604-mininet-ovs-28-2c-2g + Packer Template
releng/builder/packer/templates/mininet-ovs-2.8.json + Playbook
releng/builder/packer/provision//mininet-ovs-2.8.yaml - Ubuntu 16.04 (Xenial) system with ovs 2.5 and mininet 2.2.1 + Ubuntu 16.04 (Xenial) system with ovs 2.8 and mininet 2.2.1 @@ -320,7 +331,7 @@ Pool: ODLVEX Jenkins Labels
centos7-devstack-2c-4g Minion Template names
centos7-devstack-2c-4g Packer Template
releng/builder/packer/templates/devstack.json - Spinup Script
releng/builder/jenkins-scripts/devstack.sh + Playbook
releng/builder/packer/provision/devstack.yaml @@ -335,7 +346,7 @@ Pool: ODLVEX Jenkins Labels
centos7-docker-2c-4g Minion Template names
centos7-docker-2c-4g Packer Template
releng/builder/packer/templates/docker.json - Spinup Script
releng/builder/jenkins-scripts/docker.sh + Playbook
releng/builder/packer/common-packer/provision/docker.yaml @@ -347,22 +358,10 @@ Pool: ODLVEX - Jenkins Labels
ubuntu1404-gbp-2c-2g - Minion Template names
ubuntu1404-gbp-2c-2g - Packer Template
releng/builder/packer/templates/gbp.json - Spinup Script
releng/builder/jenkins-scripts/ubuntu-docker-ovs.sh - - - - Ubuntu 14.04 (Trusty) node with latest OVS and docker installed. Used by Group Based Policy. - - - - - Jenkins Labels
ubuntu1604-gbp-2c-4g - Minion Template names
ubuntu1604-gbp-2c-4g + Jenkins Labels
ubuntu1604-gbp-2c-2g + Minion Template names
ubuntu1604-gbp-2c-2g Packer Template
releng/builder/packer/templates/gbp.json - Spinup Script
releng/builder/jenkins-scripts/ubuntu-docker-ovs.sh + Spinup Script
releng/builder/jenkins-scripts/gpb.sh diff --git a/global-jjb b/global-jjb index 5dc3432ca..6b4eba383 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 5dc3432cae2f13d9e5151a00a76a78ce73d92d70 +Subproject commit 6b4eba38370203ded897068371a4e50255ef588b diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg index 74f75f97a..dda4381e7 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474 VOLUME_SIZE=100 HARDWARE_ID=odl-highcpu-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg deleted file mode 100644 index e7cc9da4e..000000000 --- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 -VOLUME_SIZE=150 -HARDWARE_ID=odl-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg deleted file mode 100644 index 179dad51d..000000000 --- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 -VOLUME_SIZE=150 -HARDWARE_ID=odl-highcpu-8 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg index 29e1f9de0..e72391243 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474 HARDWARE_ID=v1-standard-1 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg index ae9459213..accee7db2 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474 HARDWARE_ID=odl-highcpu-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg index 0ce20babc..a391dc00e 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474 HARDWARE_ID=odl-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg index 485f9af52..56a4f8637 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474 HARDWARE_ID=odl-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg index f5cc893f3..dc2aaa756 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474 HARDWARE_ID=odl-highcpu-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg index 7c70aba49..cebc67cad 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474 HARDWARE_ID=odl-highcpu-8 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg index 5ab3289f9..413e724e0 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200801-220136.401 HARDWARE_ID=odl-standard-1 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg index e75e5302a..0d7c50b0b 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200801-220136.401 HARDWARE_ID=odl-highcpu-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg index 4f052ef41..7d7aa5c98 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200801-220136.401 HARDWARE_ID=odl-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg index ff144c6ff..46a768ca3 100644 --- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg +++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg @@ -1,11 +1,11 @@ # Cloud Configuration CLOUD_CREDENTIAL_ID=os-cloud -CLOUD_URL=https://auth.vexxhost.net/v3/ +CLOUD_URL=https://auth.vexxhost.net/v3 CLOUD_IGNORE_SSL=false CLOUD_ZONE=ca-ymq-1 # Default Template Configuration -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474 HARDWARE_ID=v1-standard-1 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229 USER_DATA_ID=jenkins-init-script diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg index 184dbc9a9..69960b694 100644 --- a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - x86_64 - 20200501-040138.328 HARDWARE_ID=odl-standard-1 diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg new file mode 100644 index 000000000..59abc8d4b --- /dev/null +++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg @@ -0,0 +1,2 @@ +IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013 +HARDWARE_ID=odl-standard-1 diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg index 1eff3f1c8..0b8d86520 100644 --- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200121-232651.765 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200521-041758.169 HARDWARE_ID=odl-standard-1 diff --git a/jenkins-config/global-vars-releng.sh b/jenkins-config/global-vars-releng.sh index cd754e49c..924341c78 100644 --- a/jenkins-config/global-vars-releng.sh +++ b/jenkins-config/global-vars-releng.sh @@ -11,3 +11,4 @@ SIGUL_BRIDGE_IP=10.30.168.3 SIGUL_KEY=odl-release-2018 SILO=releng SONAR_URL=https://sonar.opendaylight.org +S3_BUCKET= diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh index e34e0fb48..7d43a6d3c 100644 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@ -9,3 +9,4 @@ SIGUL_BRIDGE_IP=10.30.168.3 SIGUL_KEY=odl-sandbox SILO=sandbox SONAR_URL=https://sonar.opendaylight.org +S3_BUCKET= diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index ad1b3edc6..e13c590b9 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -87,6 +87,19 @@ java-version: 'openjdk11' mvn-settings: 'aaa-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: aaa-info + jobs: + - gerrit-info-yaml-verify + project: aaa + project-name: aaa + branch: 'master' + build-node: centos7-builder-2c-1g - project: name: aaa-view diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml index cf2e9954a..53a7bcf90 100644 --- a/jjb/alt-datastores/alt-datastores.yaml +++ b/jjb/alt-datastores/alt-datastores.yaml @@ -86,6 +86,15 @@ mvn-settings: 'alt-datastores-settings' mvn-opts: '-Xmx1024m' +- project: + name: alt-datastores-info + jobs: + - gerrit-info-yaml-verify + project: alt-datastores + project-name: alt-datastores + branch: master + build-node: centos7-builder-2c-1g + - project: name: alt-datastores-view views: diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml deleted file mode 100644 index 265dd0bb7..000000000 --- a/jjb/alto/alto-csit-setup.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -- project: - name: alto-csit-setup - jobs: - - inttest-csit-1node - - # The project name - project: 'alto' - - # The functionality under test - functionality: 'setup' - - disable-job: true - - # Project branches - stream: - - aluminium: - branch: 'master' - jre: 'openjdk11' - - magnesium: - branch: 'stable/magnesium' - jre: 'openjdk11' - - sodium: - branch: 'stable/sodium' - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-alto-resourcepool,odl-restconf-all,odl-alto-basic' - - # Robot custom options - robot-options: '' - - # Don't spin up mininet vms as alto-csit-setup jobs don't need them - tools_system_count: 0 diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml deleted file mode 100644 index dd766f10c..000000000 --- a/jjb/alto/alto.yaml +++ /dev/null @@ -1,80 +0,0 @@ ---- -- project: - name: alto-aluminium - jobs: - - gerrit-release-merge - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: aluminium - project: 'alto' - project-name: 'alto' - branch: 'master' - build-node: centos7-builder-2c-8g - mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'l2switch-merge-{stream}' - email-upstream: '[alto] [l2switch]' - disable-job: true - - # Used by the release job - staging-profile-id: 931eabae9693c - -- project: - name: alto-magnesium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: magnesium - project: 'alto' - project-name: 'alto' - branch: 'stable/magnesium' - build-node: centos7-builder-2c-8g - mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'l2switch-merge-{stream}' - email-upstream: '[alto] [l2switch]' - disable-job: true - - # Used by the release job - staging-profile-id: 931eabae9693c - -- project: - name: alto-sodium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: 'alto' - project-name: 'alto' - branch: 'stable/sodium' - build-node: centos7-builder-2c-8g - mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'l2switch-merge-{stream}' - email-upstream: '[alto] [l2switch]' - disable-job: true - - # Used by the release job - staging-profile-id: 931eabae9693c - -- project: - name: alto-sonar - jobs: - - gerrit-maven-sonar - - project: 'alto' - project-name: 'alto' - branch: 'master' - build-node: centos7-builder-2c-8g - mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m' - disable-job: true - -- project: - name: alto-view - views: - - project-view - project-name: alto diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml index 780d2064e..701f76ec3 100644 --- a/jjb/ansible/ansible.yaml +++ b/jjb/ansible/ansible.yaml @@ -24,6 +24,15 @@ build-timeout: 60 staging-profile-id: 'da5a90345bd62' +- project: + name: ansible-info + jobs: + - gerrit-info-yaml-verify + project: ansible + project-name: ansible + branch: master + build-node: centos7-builder-2c-1g + - project: name: ansible-view views: diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index 508ff6f75..5480703c1 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -62,6 +62,19 @@ branch: 'master' java-version: 'openjdk11' mvn-settings: 'archetypes-settings' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: archetypes-info + jobs: + - gerrit-info-yaml-verify + project: archetypes + project-name: archetypes + branch: master + build-node: centos7-builder-2c-1g - project: name: archetypes-view diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 217bdddcc..a1ab67240 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -44,7 +44,8 @@ builders: - shell: | #!/bin/bash -l - virtualenv --system-site-packages $WORKSPACE/venv + set -xe -o pipefail + virtualenv -p python3 --system-site-packages $WORKSPACE/venv source $WORKSPACE/venv/bin/activate PYTHON="$WORKSPACE/venv/bin/python" $PYTHON -m pip install --upgrade networkx diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index f15d67080..f842d22bf 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -5,18 +5,14 @@ - autorelease-branch-cut - 'autorelease-generate-release-notes-{stream}' - 'autorelease-release-{stream}-{mvn-version}-{java-version}': - build-node: centos7-autorelease-4c-16g - - 'autorelease-update-submodules-{stream}' - - 'autorelease-update-validate-jobs-{stream}' - - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}': - build-node: centos7-autorelease-4c-16g - - '{project-name}-validate-autorelease-{stream}' - - gerrit-tox-verify + build-node: centos7-builder-4c-16g + - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}' stream: - sodium: branch: 'stable/sodium' integration-test: sodium + cron: '@weekly' project: releng/autorelease project-name: autorelease @@ -32,7 +28,7 @@ staging-profile-id: 425e43800fea70 # TODO: **/*.hprof is too large, compress with xz first mvn-params: > - -Pintegrationtests,repoBuild + -PrepoBuild -P!karaf -Pignore-lispflowmapping-integrationtest -Dcheckstyle.skip=true @@ -40,13 +36,17 @@ -Dsft.heap.max=4g java-version: openjdk8 - - project: name: autorelease-projects-openjdk11 jobs: + - 'autorelease-generate-release-notes-{stream}' - 'autorelease-release-{stream}-{mvn-version}-{java-version}': - build-node: centos7-autorelease-4c-16g - - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}': + build-node: centos7-builder-4c-16g + - 'autorelease-update-submodules-{stream}' + - 'autorelease-update-validate-jobs-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}' + - gerrit-tox-verify stream: - aluminium: @@ -55,9 +55,6 @@ - magnesium: branch: 'stable/magnesium' integration-test: magnesium - - sodium: - branch: 'stable/sodium' - integration-test: sodium-dev-null project: releng/autorelease project-name: autorelease @@ -73,7 +70,7 @@ staging-profile-id: 425e43800fea70 # TODO: **/*.hprof is too large, compress with xz first mvn-params: > - -Pintegrationtests,repoBuild + -PrepoBuild -P!karaf -Pignore-lispflowmapping-integrationtest -Dcheckstyle.skip=true @@ -81,6 +78,15 @@ -Dsft.heap.max=4g java-version: 'openjdk11' +- project: + name: autorelease-info + jobs: + - gerrit-info-yaml-verify + project: releng/autorelease + project-name: autorelease + branch: master + build-node: centos7-builder-2c-1g + - project: name: autorelease-view views: diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 5d46c1a8b..d607c9f05 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -341,8 +341,7 @@ gerrit-user: 'jenkins-$SILO' gerrit-host: 'git.opendaylight.org' gerrit-topic: 'autorelease-update-validate-jobs-{stream}' - gerrit-commit-message: | - 'Update validate autorelease projects for {stream}' + gerrit-commit-message: 'Update validate-ar jobs for {stream}' reviewers-email: 'jenkins-releng@opendaylight.org' publishers: @@ -571,8 +570,9 @@ builders: - lf-infra-pre-build + - lf-update-java-alternatives: + java-version: "{java-version}" - autorelease-checkout-gerrit-patch - - autorelease-compare-projects - lf-jacoco-nojava-workaround - shell: "./scripts/list-project-dependencies.sh" - autorelease-determine-merge-order diff --git a/jjb/autorelease/generate-release-notes.sh b/jjb/autorelease/generate-release-notes.sh index c741d75aa..46efa078f 100644 --- a/jjb/autorelease/generate-release-notes.sh +++ b/jjb/autorelease/generate-release-notes.sh @@ -15,7 +15,7 @@ set -x pip install --user --quiet --upgrade git-review -RELEASE=${RELEASE:-$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep generate-release-notes | awk '{print $2}')} +RELEASE=${RELEASE:-$(echo "$GERRIT_EVENT_COMMENT_TEXT" | base64 -d | grep generate-release-notes | awk '{print $2}')} if [ -z "$RELEASE" ]; then echo "ERROR: The RELEASE variable is not set." exit 1 @@ -36,7 +36,7 @@ cd "$DOCS_DIR" || exit 1 cp "$WORKSPACE/release-notes.rst" "docs/release-notes/release-notes-${RELEASE,,}.rst" git add docs/release-notes/ -GERRIT_COMMIT_MESSAGE="Update release notes" +GERRIT_COMMIT_MESSAGE="Update release notes for $RELEASE" GERRIT_TOPIC="autogenerate-release-notes" CHANGE_ID=$(ssh -p 29418 "jenkins-$SILO@git.opendaylight.org" gerrit query \ limit:1 owner:self is:open project:docs \ diff --git a/jjb/autorelease/validate-autorelease-aluminium.yaml b/jjb/autorelease/validate-autorelease-aluminium.yaml new file mode 100644 index 000000000..c58822c8c --- /dev/null +++ b/jjb/autorelease/validate-autorelease-aluminium.yaml @@ -0,0 +1,35 @@ +--- +# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job +- project: + name: autorelease-validate-aluminium + jobs: + - '{project-name}-validate-autorelease-{stream}' + stream: aluminium + branch: master + project-name: + - aaa: + project: aaa + - bgpcep: + project: bgpcep + - daexim: + project: daexim + - genius: + project: genius + - integration-distribution: + project: integration/distribution + - jsonrpc: + project: jsonrpc + - lispflowmapping: + project: lispflowmapping + - netconf: + project: netconf + - netvirt: + project: netvirt + - neutron: + project: neutron + - openflowplugin: + project: openflowplugin + - ovsdb: + project: ovsdb + - serviceutils: + project: serviceutils diff --git a/jjb/autorelease/validate-autorelease-magnesium.yaml b/jjb/autorelease/validate-autorelease-magnesium.yaml new file mode 100644 index 000000000..cfed3ae59 --- /dev/null +++ b/jjb/autorelease/validate-autorelease-magnesium.yaml @@ -0,0 +1,39 @@ +--- +# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job +- project: + name: autorelease-validate-magnesium + jobs: + - '{project-name}-validate-autorelease-{stream}' + stream: magnesium + branch: stable/magnesium + project-name: + - aaa: + project: aaa + - bgpcep: + project: bgpcep + - controller: + project: controller + - daexim: + project: daexim + - genius: + project: genius + - infrautils: + project: infrautils + - integration-distribution: + project: integration/distribution + - jsonrpc: + project: jsonrpc + - lispflowmapping: + project: lispflowmapping + - netconf: + project: netconf + - netvirt: + project: netvirt + - neutron: + project: neutron + - openflowplugin: + project: openflowplugin + - ovsdb: + project: ovsdb + - serviceutils: + project: serviceutils diff --git a/jjb/autorelease/view-autorelease-aluminium.yaml b/jjb/autorelease/view-autorelease-aluminium.yaml new file mode 100644 index 000000000..56fb98243 --- /dev/null +++ b/jjb/autorelease/view-autorelease-aluminium.yaml @@ -0,0 +1,38 @@ +--- +# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job +- releng_view: &releng_autorelease_view_common_aluminium + name: releng-view-autorelease-aluminium + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + - jacoco + - find-bugs + - robot-list + recurse: false + +- view: + name: Merge-Aluminium + description: 'List of Aluminium Merge jobs for Autorelease' + job-name: + - 'aaa-merge-aluminium' + - 'bgpcep-merge-aluminium' + - 'daexim-merge-aluminium' + - 'genius-merge-aluminium' + - 'integration/distribution-merge-aluminium' + - 'jsonrpc-merge-aluminium' + - 'lispflowmapping-merge-aluminium' + - 'netconf-merge-aluminium' + - 'netvirt-merge-aluminium' + - 'neutron-merge-aluminium' + - 'openflowplugin-merge-aluminium' + - 'ovsdb-merge-aluminium' + - 'serviceutils-merge-aluminium' + <<: *releng_autorelease_view_common_aluminium diff --git a/jjb/autorelease/view-autorelease-magnesium.yaml b/jjb/autorelease/view-autorelease-magnesium.yaml new file mode 100644 index 000000000..9fa0634cf --- /dev/null +++ b/jjb/autorelease/view-autorelease-magnesium.yaml @@ -0,0 +1,40 @@ +--- +# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job +- releng_view: &releng_autorelease_view_common_magnesium + name: releng-view-autorelease-magnesium + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + - jacoco + - find-bugs + - robot-list + recurse: false + +- view: + name: Merge-Magnesium + description: 'List of Magnesium Merge jobs for Autorelease' + job-name: + - 'aaa-merge-magnesium' + - 'bgpcep-merge-magnesium' + - 'controller-merge-magnesium' + - 'daexim-merge-magnesium' + - 'genius-merge-magnesium' + - 'infrautils-merge-magnesium' + - 'integration/distribution-merge-magnesium' + - 'jsonrpc-merge-magnesium' + - 'lispflowmapping-merge-magnesium' + - 'netconf-merge-magnesium' + - 'netvirt-merge-magnesium' + - 'neutron-merge-magnesium' + - 'openflowplugin-merge-magnesium' + - 'ovsdb-merge-magnesium' + - 'serviceutils-merge-magnesium' + <<: *releng_autorelease_view_common_magnesium diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index aaead5681..0362e3d8a 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -112,6 +112,15 @@ mvn-settings: 'bgpcep-settings' mvn-opts: '-Xmx1024m' +- project: + name: bgpcep-info + jobs: + - gerrit-info-yaml-verify + project: bgpcep + project-name: bgpcep + branch: master + build-node: centos7-builder-2c-1g + - project: name: bgpcep-view views: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index e8d9f2ae7..9a4f47ecc 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -75,6 +75,19 @@ mvn-settings: 'bier-settings' mvn-opts: '-Xmx1024m' disable-job: true + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: bier-info + jobs: + - gerrit-info-yaml-verify + project: bier + project-name: bier + branch: master + build-node: centos7-builder-2c-1g - project: name: bier-view diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index ff1208e9a..25a1cf611 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -85,6 +85,19 @@ java-version: 'openjdk11' mvn-settings: 'coe-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: coe-info + jobs: + - gerrit-info-yaml-verify + project: coe + project-name: coe + branch: master + build-node: centos7-builder-2c-1g - project: name: coe-view diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 2819e2cb1..b03b92c9d 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -94,24 +94,6 @@ project: 'controller' project-name: 'controller' branch: master - build-node: centos7-builder-8c-8g - java-version: 'openjdk11' - mvn-settings: 'controller-settings' - mvn-goals: 'clean deploy -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true' - -- project: - name: controller-sonarcloud - jobs: - - gerrit-maven-sonar: - mvn-params: > - -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec - -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec - - project: 'controller' - project-name: 'controller-sonarcloud' - branch: master - build-node: centos7-builder-8c-8g java-version: 'openjdk11' mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' @@ -121,6 +103,15 @@ sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' +- project: + name: controller-info + jobs: + - gerrit-info-yaml-verify + project: controller + project-name: controller + branch: master + build-node: centos7-builder-2c-1g + - project: name: controller-view views: diff --git a/jjb/copy-sandbox-logs.sh b/jjb/copy-sandbox-logs.sh index 2cc2c82c6..e3885e589 100644 --- a/jjb/copy-sandbox-logs.sh +++ b/jjb/copy-sandbox-logs.sh @@ -18,7 +18,7 @@ # Usage: copy-logs: JOB_NAME/BUILD_NUMBER echo "---> copy-sandbox-logs.sh" -build_path="$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'copy-logs:' | awk -F: '{print $2}' | tr -d '[:space:]')" +build_path="$(echo "$GERRIT_EVENT_COMMENT_TEXT" | base64 -d | grep 'copy-logs:' | awk -F: '{print $2}' | tr -d '[:space:]')" fetch_url="https://logs.opendaylight.org/sandbox/vex-yul-odl-jenkins-2/$build_path" COPY_DIR="$WORKSPACE/archives" diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 4a7bafd25..77abd1a75 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -84,6 +84,19 @@ java-version: 'openjdk11' mvn-settings: 'daexim-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: daexim-info + jobs: + - gerrit-info-yaml-verify + project: daexim + project-name: daexim + branch: master + build-node: centos7-builder-2c-1g - project: name: daexim-view diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 2edafdf1b..0f8758bee 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -61,6 +61,7 @@ tenant-network-type: 'vxlan' odl-sfc-driver: 'odl' odl-snat-mode: 'controller' + group-add-mod-enabled: 'false' enable-itm-direct-tunnels: 'false' openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc' os-cmb-cnt: 1 @@ -86,9 +87,9 @@ elasticsearch-attribute: 'disabled' # CSIT images configuration - openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851 - openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559 - openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756 + openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200801-010144.168 + openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200801-000156.903 + openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200801-190141.781 # Default Robot framework options robot-options: '' @@ -188,6 +189,14 @@ # Manual CSIT job lists used by sanity or periodic in nature. csit-mri-list-aluminium: > + controller-csit-1node-akka1-all-aluminium, + controller-csit-1node-benchmark-all-aluminium, + controller-csit-1node-rest-cars-perf-all-aluminium, + controller-csit-3node-benchmark-all-aluminium, + controller-csit-3node-clustering-ask-all-aluminium, + controller-csit-3node-clustering-tell-all-aluminium, + controller-csit-3node-rest-clust-cars-perf-ask-only-aluminium, + controller-csit-3node-rest-clust-cars-perf-tell-only-aluminium, yangtools-csit-1node-system-only-aluminium csit-mri-list-magnesium: > yangtools-csit-1node-system-only-magnesium diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml index 2cade9698..68d68e788 100644 --- a/jjb/detnet/detnet.yaml +++ b/jjb/detnet/detnet.yaml @@ -63,6 +63,19 @@ branch: 'master' mvn-settings: 'detnet-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: detnet-info + jobs: + - gerrit-info-yaml-verify + project: detnet + project-name: detnet + branch: master + build-node: centos7-builder-2c-1g - project: name: detnet-view diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index cbe800370..c05f46807 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -44,6 +44,19 @@ branch: 'master' mvn-settings: 'dlux-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: dlux-info + jobs: + - gerrit-info-yaml-verify + project: dlux + project-name: dlux + branch: master + build-node: centos7-builder-2c-1g - project: name: dlux-view diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 3f93d2cdf..5fe9eee19 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -71,6 +71,19 @@ build-node: centos7-builder-2c-8g mvn-settings: 'dluxapps-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: dluxapps-info + jobs: + - gerrit-info-yaml-verify + project: dluxapps + project-name: dluxapps + branch: master + build-node: centos7-builder-2c-1g - project: name: dluxapps-view diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 857850373..fd9faf1b0 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -22,6 +22,15 @@ rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight/32322/ rtd-token: 86e54dd38c651e2164ea63c183ae601d19cd1f3c +- project: + name: docs-info + jobs: + - gerrit-info-yaml-verify + project: docs + project-name: docs + branch: master + build-node: centos7-builder-2c-1g + - project: name: docs-view views: diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 55cb30624..0a5084ddd 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -117,6 +117,19 @@ java-version: 'openjdk11' mvn-settings: 'genius-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: genius-info + jobs: + - gerrit-info-yaml-verify + project: genius + project-name: genius + branch: master + build-node: centos7-builder-2c-1g - project: name: genius-view diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index d44e686f9..c33f97ebf 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -93,6 +93,19 @@ mvn-goals: '-U clean deploy findbugs:findbugs' mvn-opts: '-Xmx1024m' disable-job: true + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: groupbasedpolicy-info + jobs: + - gerrit-info-yaml-verify + project: groupbasedpolicy + project-name: groupbasedpolicy + branch: master + build-node: centos7-builder-2c-1g - project: name: groupbasedpolicy-view diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index 28d3a5912..2db27664e 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -26,6 +26,19 @@ branch: 'master' mvn-settings: 'honeycomb-vbd-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: vbd-info + jobs: + - gerrit-info-yaml-verify + project: honeycomb/vbd + project-name: vbd + branch: master + build-node: centos7-builder-2c-1g - project: name: vbd-view diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 6c1079c39..4ebffb447 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -1,9 +1,9 @@ --- - project: - name: infrautils-aluminium + name: infrautils-master jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' + - 'gerrit-release-merge': + build-node: centos7-builder-2c-2g - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g doc-dir: .tox/docs/tmp/html @@ -13,7 +13,7 @@ - odl-maven-jobs-jdk11 - odl-maven-verify-jobs - stream: aluminium + stream: master project: 'infrautils' project-name: 'infrautils' branch: 'master' @@ -89,6 +89,19 @@ java-version: 'openjdk11' mvn-settings: 'infrautils-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: infrautils-info + jobs: + - gerrit-info-yaml-verify + project: infrautils + project-name: infrautils + branch: master + build-node: centos7-builder-2c-1g - project: name: infrautils-view diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh index 01409f2c5..f16a93a0e 100644 --- a/jjb/integration/common-functions.sh +++ b/jjb/integration/common-functions.sh @@ -495,6 +495,7 @@ CREATE_INITIAL_NETWORKS: ${CREATE_INITIAL_NETWORKS} LBAAS_SERVICE_PROVIDER: ${LBAAS_SERVICE_PROVIDER} ODL_SFC_DRIVER: ${ODL_SFC_DRIVER} ODL_SNAT_MODE: ${ODL_SNAT_MODE} +GROUP_ADD_MOD_ENABLED: ${GROUP_ADD_MOD_ENABLED} EOF } @@ -670,7 +671,7 @@ EOF echo "collect_logs: for opendaylight controller ip: ${!CONTROLLERIP}" NODE_FOLDER="odl_${i}" mkdir -p "${NODE_FOLDER}" - echo "Lets's take the karaf thread dump again..." + echo "Let's take the karaf thread dump again..." ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}"/ps_after.log pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}"/ps_after.log | grep -v grep | tr -s ' ' | cut -f2 -d' ') echo "karaf main: org.apache.karaf.main.Main, pid:${pid}" @@ -1086,7 +1087,7 @@ function copy_and_run_post_startup_script() { function dump_controller_threads() { for i in $(seq 1 "${NUM_ODL_SYSTEM}"); do CONTROLLERIP="ODL_SYSTEM_${i}_IP" - echo "Lets's take the karaf thread dump" + echo "Let's take the karaf thread dump" ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}"/ps_before.log pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}"/ps_before.log | grep -v grep | tr -s ' ' | cut -f2 -d' ') echo "karaf main: org.apache.karaf.main.Main, pid:${pid}" diff --git a/jjb/integration/csit-jobs-aluminium.lst b/jjb/integration/csit-jobs-aluminium.lst index 6c70d5d79..840795b5e 100644 --- a/jjb/integration/csit-jobs-aluminium.lst +++ b/jjb/integration/csit-jobs-aluminium.lst @@ -3,16 +3,6 @@ bgpcep-csit-1node-bgp-ingest-all-aluminium, bgpcep-csit-1node-bgp-ingest-mixed-all-aluminium, bgpcep-csit-1node-throughpcep-all-aluminium, bgpcep-csit-1node-userfeatures-all-aluminium, -bgpcep-csit-3node-bgpclustering-all-aluminium, -bgpcep-csit-3node-bgpclustering-ha-only-aluminium, -controller-csit-1node-akka1-all-aluminium, -controller-csit-1node-benchmark-all-aluminium, -controller-csit-1node-rest-cars-perf-all-aluminium, -controller-csit-3node-benchmark-all-aluminium, -controller-csit-3node-clustering-ask-all-aluminium, -controller-csit-3node-clustering-tell-all-aluminium, -controller-csit-3node-rest-clust-cars-perf-ask-only-aluminium, -controller-csit-3node-rest-clust-cars-perf-tell-only-aluminium, daexim-csit-1node-basic-only-aluminium, daexim-csit-3node-clustering-basic-only-aluminium, distribution-csit-1node-userfeatures-all-aluminium, @@ -21,7 +11,6 @@ genius-csit-1node-upstream-only-aluminium, genius-csit-3node-upstream-only-aluminium, jsonrpc-csit-1node-basic-only-aluminium, lispflowmapping-csit-1node-msmr-all-aluminium, -lispflowmapping-csit-1node-performance-only-aluminium, lispflowmapping-csit-3node-msmr-all-aluminium, netconf-csit-1node-callhome-only-aluminium, netconf-csit-1node-scale-max-devices-only-aluminium, @@ -31,36 +20,35 @@ netconf-csit-1node-userfeatures-rfc8040-all-aluminium, netconf-csit-3node-clustering-only-aluminium, netconf-csit-3node-clustering-scale-only-aluminium, netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-aluminium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-aluminium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-aluminium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-aluminium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-aluminium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-aluminium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-aluminium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-aluminium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-aluminium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-snat-conntrack-aluminium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-aluminium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-aluminium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-aluminium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-aluminium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-aluminium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-aluminium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-aluminium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-dcgw-aluminium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-aluminium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-aluminium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium, +netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-dcgw-aluminium, netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-aluminium, netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium, netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-dcgw-aluminium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-aluminium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-aluminium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-aluminium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-aluminium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-aluminium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-aluminium, -netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-aluminium, -netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-aluminium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-dcgw-aluminium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium, +netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium, +netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium, +netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium, +netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium, odltools-csit-1node-upstream-all-aluminium, -openflowplugin-csit-1node-bundle-based-reconciliation-all-aluminium, openflowplugin-csit-1node-cbench-only-aluminium, openflowplugin-csit-1node-flow-services-all-aluminium, openflowplugin-csit-1node-perf-bulkomatic-only-aluminium, diff --git a/jjb/integration/csit-jobs-magnesium.lst b/jjb/integration/csit-jobs-magnesium.lst index a16bb28f2..b54dab6a1 100644 --- a/jjb/integration/csit-jobs-magnesium.lst +++ b/jjb/integration/csit-jobs-magnesium.lst @@ -3,8 +3,6 @@ bgpcep-csit-1node-bgp-ingest-all-magnesium, bgpcep-csit-1node-bgp-ingest-mixed-all-magnesium, bgpcep-csit-1node-throughpcep-all-magnesium, bgpcep-csit-1node-userfeatures-all-magnesium, -bgpcep-csit-3node-bgpclustering-all-magnesium, -bgpcep-csit-3node-bgpclustering-ha-only-magnesium, controller-csit-1node-akka1-all-magnesium, controller-csit-1node-benchmark-all-magnesium, controller-csit-1node-rest-cars-perf-all-magnesium, @@ -21,7 +19,6 @@ genius-csit-1node-upstream-only-magnesium, genius-csit-3node-upstream-only-magnesium, jsonrpc-csit-1node-basic-only-magnesium, lispflowmapping-csit-1node-msmr-all-magnesium, -lispflowmapping-csit-1node-performance-only-magnesium, lispflowmapping-csit-3node-msmr-all-magnesium, netconf-csit-1node-callhome-only-magnesium, netconf-csit-1node-scale-max-devices-only-magnesium, @@ -31,36 +28,37 @@ netconf-csit-1node-userfeatures-rfc8040-all-magnesium, netconf-csit-3node-clustering-only-magnesium, netconf-csit-3node-clustering-scale-only-magnesium, netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-magnesium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-magnesium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-magnesium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-magnesium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-magnesium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-magnesium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-snat-conntrack-magnesium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-magnesium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-dcgw-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-magnesium, netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium, netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-magnesium, netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium, netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-magnesium, netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-magnesium, netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-magnesium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-dcgw-magnesium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-magnesium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-magnesium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-magnesium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium, -netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium, -netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-dcgw-magnesium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-magnesium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium, +netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-magnesium, +netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium, +netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium, +netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium, +netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium, odltools-csit-1node-upstream-all-magnesium, -openflowplugin-csit-1node-bundle-based-reconciliation-all-magnesium, openflowplugin-csit-1node-cbench-only-magnesium, openflowplugin-csit-1node-flow-services-all-magnesium, openflowplugin-csit-1node-perf-bulkomatic-only-magnesium, diff --git a/jjb/integration/csit-jobs-sodium.lst b/jjb/integration/csit-jobs-sodium.lst index 902f71430..7b44c748b 100644 --- a/jjb/integration/csit-jobs-sodium.lst +++ b/jjb/integration/csit-jobs-sodium.lst @@ -3,8 +3,6 @@ bgpcep-csit-1node-bgp-ingest-all-sodium, bgpcep-csit-1node-bgp-ingest-mixed-all-sodium, bgpcep-csit-1node-throughpcep-all-sodium, bgpcep-csit-1node-userfeatures-all-sodium, -bgpcep-csit-3node-bgpclustering-all-sodium, -bgpcep-csit-3node-bgpclustering-ha-only-sodium, controller-csit-1node-akka1-all-sodium, controller-csit-1node-benchmark-all-sodium, controller-csit-1node-rest-cars-perf-all-sodium, @@ -20,7 +18,6 @@ distribution-csit-managed-sodium, genius-csit-1node-upstream-only-sodium, genius-csit-3node-upstream-only-sodium, lispflowmapping-csit-1node-msmr-all-sodium, -lispflowmapping-csit-1node-performance-only-sodium, lispflowmapping-csit-3node-msmr-all-sodium, netconf-csit-1node-callhome-only-sodium, netconf-csit-1node-scale-max-devices-only-sodium, @@ -31,12 +28,12 @@ netconf-csit-3node-clustering-only-sodium, netconf-csit-3node-clustering-scale-only-sodium, netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-sodium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-sodium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-sodium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-snat-conntrack-sodium, +netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-sodium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium, netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium, @@ -45,9 +42,6 @@ netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-sodium, netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium, netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium, netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-sodium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-sodium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-sodium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-sodium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium, @@ -56,10 +50,9 @@ netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-sodium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium, netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium, -netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium, -netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium, +netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium, +netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium, odltools-csit-1node-upstream-all-sodium, -openflowplugin-csit-1node-bundle-based-reconciliation-all-sodium, openflowplugin-csit-1node-cbench-only-sodium, openflowplugin-csit-1node-flow-services-all-sodium, openflowplugin-csit-1node-perf-bulkomatic-only-sodium, diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index ed0ef380c..36dd6ba9b 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -23,10 +23,12 @@ stream: - aluminium: branch: 'master' + java-version: openjdk11 jre: 'openjdk11' karaf-version: odl - magnesium: branch: 'stable/magnesium' + java-version: openjdk11 jre: 'openjdk11' karaf-version: odl - sodium: @@ -69,10 +71,8 @@ dependencies: > aaa-maven-merge-{stream}, bgpcep-maven-merge-{stream}, - controller-maven-merge-{stream}, daexim-maven-merge-{stream}, genius-maven-merge-{stream}, - infrautils-maven-merge-{stream}, jsonrpc-maven-merge-{stream}, lispflowmapping-maven-merge-{stream}, netconf-maven-merge-{stream}, @@ -198,6 +198,10 @@ mvn-settings: integration-distribution-settings mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - project: name: distribution-view diff --git a/jjb/integration/integration-apex-run-tests.sh b/jjb/integration/integration-apex-run-tests.sh index 49c7aa6d8..6ce6d5c01 100644 --- a/jjb/integration/integration-apex-run-tests.sh +++ b/jjb/integration/integration-apex-run-tests.sh @@ -126,7 +126,7 @@ for suite in ${SUITES}; do # prepend an incremental counter to the suite name so that the full robot log combining all the suites as is done # in the rebot step below will list all the suites in chronological order as rebot seems to alphabetize them ((suite_num = suite_num + 1)) - suite_index="$(printf %02d ${suite_num})" + suite_index="$(printf %02d "${suite_num}")" suite_name="$(basename "${suite}" | cut -d. -f1)" log_name="${suite_index}_${suite_name}" robot -N "${log_name}" \ diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh index e04cfd7bd..baae769d8 100755 --- a/jjb/integration/integration-deploy-controller-run-test.sh +++ b/jjb/integration/integration-deploy-controller-run-test.sh @@ -95,7 +95,7 @@ ssh "${ODL_SYSTEM_IP}" "du -hs /tmp/${BUNDLEFOLDER}/data/log/*" for i in $(seq 1 "${NUM_ODL_SYSTEM}") do CONTROLLERIP="ODL_SYSTEM_${i}_IP" - echo "Lets's take the karaf thread dump again..." + echo "Let's take the karaf thread dump again..." ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}"/ps_after.log pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}/ps_after.log" | grep -v grep | tr -s ' ' | cut -f2 -d' ') echo "karaf main: org.apache.karaf.main.Main, pid:${pid}" diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh index 81afad6b1..464072b7f 100644 --- a/jjb/integration/integration-deploy-openstack-run-test.sh +++ b/jjb/integration/integration-deploy-openstack-run-test.sh @@ -97,6 +97,10 @@ function install_openstack_clients_in_robot_vm() { wget "https://raw.githubusercontent.com/openstack/requirements/stable/${openstack_version}/upper-constraints.txt" -O /tmp/constraints.txt 2>/dev/null #python openstackclient version in rocky contradicts with version in global-jjb and stops openstackclient installation in rocky. Will be removed based on version change in global-jjb. sed -i s/python-openstackclient===3.16.2/python-openstackclient===3.14.0/ /tmp/constraints.txt + #Python uwsgi 2.0.19 is having errors, forcing it to pick 2.0.18 + sed -i '1 auwsgi===2.0.18' /tmp/constraints.txt + #Python3 paramiko 2.7.1 has requirement cryptography>=2.5, Updating it to the latest + sed -i s/cryptography===2.3/cryptography===2.9.2/ /tmp/constraints.txt echo "$PYTHON -m pip install --upgrade --no-deps ${package} --no-cache-dir -c /tmp/constraints.txt" $PYTHON -m pip install --upgrade --no-deps "${package}" --no-cache-dir -c /tmp/constraints.txt echo "$PYTHON -m pip install ${package} --no-cache-dir -c /tmp/constraints.txt" @@ -104,6 +108,8 @@ function install_openstack_clients_in_robot_vm() { done if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then + #alembic 1.4.2 is having issues. Updating the package with 1.4.0 + $PYTHON -m pip install alembic===1.4.0 #networking-l2gw is not officially available in any release yet. Getting the latest stable version. $PYTHON -m pip install networking-l2gw==11.0.0 more-itertools==5.0.0 fi @@ -145,11 +151,14 @@ EOF ssh "${control_ip}" "bash /tmp/setup_live_migration_control.sh" } +#Fix for broken requirements versions while bringing up the stack. #Fix Problem caused due to new libvirt version in CentOS repo. #The libvirt-python 3.10 does not support all the new API exposed #This fix will force devstack to use latest libvirt-python #from pypi.org (latest version as of 06-Dec-2018) -function fix_libvirt_python_build() { +#Python uwsgi 2.0.19 is having errors, forcing it to pick 2.0.18 +#more info: https://lists.opendaylight.org/g/app-dev/topic/netvirt_jobs_are_failing_with/74897077 +function fix_broken_requirements_versions() { local ip=$1 ${SSH} "${ip}" " cd /opt/stack; @@ -157,6 +166,7 @@ function fix_libvirt_python_build() { cd requirements; git checkout ${ODL_ML2_BRANCH}; sed -i s/libvirt-python===3.10.0/libvirt-python===4.10.0/ upper-constraints.txt + sed -i '1 auwsgi===2.0.18' upper-constraints.txt " } @@ -856,7 +866,7 @@ for i in $(seq 1 "${NUM_OPENSTACK_CONTROL_NODES}"); do # but in the meantime do it ourselves ssh "${!CONTROLIP}" "sudo ovs-vsctl set Open_vSwitch . external_ids:of-tunnel=true" fi - fix_libvirt_python_build "${!CONTROLIP}" + fix_broken_requirements_versions "${!CONTROLIP}" echo "Stack the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}" # Workaround: fixing boneheaded polkit issue, to be removed later ssh "${!CONTROLIP}" "sudo bash -c 'echo deltarpm=0 >> /etc/yum.conf && yum -y update polkit'" @@ -915,7 +925,7 @@ for i in $(seq 1 "${NUM_OPENSTACK_COMPUTE_NODES}"); do # but in the meantime do it ourselves ssh "${!COMPUTEIP}" "sudo ovs-vsctl set Open_vSwitch . external_ids:of-tunnel=true" fi - fix_libvirt_python_build "${!COMPUTEIP}" + fix_broken_requirements_versions "${!COMPUTEIP}" echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${!COMPUTEIP}" ssh "${!COMPUTEIP}" "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &" ssh "${!COMPUTEIP}" "ps -ef | grep stack.sh" @@ -1178,6 +1188,7 @@ for suite in ${SUITES}; do -v NUM_OS_SYSTEM:"${NUM_OPENSTACK_SYSTEM}" \ -v NUM_TOOLS_SYSTEM:"${NUM_TOOLS_SYSTEM}" \ -v ODL_SNAT_MODE:"${ODL_SNAT_MODE}" \ + -v GROUP_ADD_MOD_ENABLED:"${GROUP_ADD_MOD_ENABLED}" \ -v ODL_STREAM:"${DISTROSTREAM}" \ -v ODL_SYSTEM_IP:"${ODL_SYSTEM_IP}" \ -v ODL_SYSTEM_1_IP:"${ODL_SYSTEM_1_IP}" \ diff --git a/jjb/integration/integration-install-robotframework.sh b/jjb/integration/integration-install-robotframework.sh index de6fb254a..e91454dcb 100644 --- a/jjb/integration/integration-install-robotframework.sh +++ b/jjb/integration/integration-install-robotframework.sh @@ -8,6 +8,7 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html ############################################################################## +# vim: sw=4 ts=4 sts=4 et ft=sh : ROBOT_VENV="/tmp/v/robot" echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties" @@ -15,54 +16,52 @@ echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties" # The --system-site-packages parameter allows us to pick up system level # installed packages. This allows us to bake matplotlib which takes very long # to install into the image. -virtualenv --system-site-packages "${ROBOT_VENV}" +virtualenv -p python3 --system-site-packages "${ROBOT_VENV}" # shellcheck disable=SC1090 source "${ROBOT_VENV}/bin/activate" set -exu # Make sure pip itself us up-to-date. -pip install --upgrade pip -python3 -m pip install --user --upgrade pip +python -m pip install --upgrade pip -pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr pyhocon -pip install --upgrade robotframework-httplibrary \ - requests==2.15.1 \ - robotframework-requests \ - robotframework-sshlibrary==3.1.1 \ - robotframework-selenium2library \ - robotframework-pycurllibrary +echo "Installing Python Requirements" +cat << 'EOF' > "requirements.txt" +docker-py +importlib +ipaddr +netaddr +netifaces +pyhocon +requests +robotframework-httplibrary +robotframework-requests +robotframework-selenium2library +robotframework-sshlibrary==3.1.1 +scapy # Module jsonpath is needed by current AAA idmlite suite. -pip install --upgrade jsonpath-rw +jsonpath-rw # Modules for longevity framework robot library -pip install --upgrade elasticsearch==1.7.0 elasticsearch-dsl==0.0.11 +elasticsearch +elasticsearch-dsl # Module for pyangbind used by lispflowmapping project -pip install --upgrade pyangbind +pyangbind # Module for iso8601 datetime format -pip install --upgrade isodate +isodate # Module for TemplatedRequests.robot library -pip install --upgrade jmespath +jmespath # Module for backup-restore support library -pip install --upgrade jsonpatch - -#Module for elasticsearch python client -#Module for elasticsearch python client -python3 -m pip install --user urllib3==1.22 -python3 -m pip install --user requests==2.9.1 -python3 -m pip install --user elasticsearch==6.2.0 -python3 -m pip install --user PyYAML==3.11 +jsonpatch # odltools for extra debugging -pip install odltools +odltools +EOF +python -m pip install -r requirements.txt odltools -V - -# Print installed versions. pip freeze - -# vim: sw=4 ts=4 sts=4 et ft=sh : diff --git a/jjb/integration/integration-start-cluster-run-test.sh b/jjb/integration/integration-start-cluster-run-test.sh index 368e151bf..f9849976d 100644 --- a/jjb/integration/integration-start-cluster-run-test.sh +++ b/jjb/integration/integration-start-cluster-run-test.sh @@ -90,7 +90,7 @@ set +e # We do not want to create red dot just because something went wrong whi for i in $(seq 1 "${NUM_ODL_SYSTEM}") do CONTROLLERIP="ODL_SYSTEM_${i}_IP" - echo "Lets's take the karaf thread dump again" + echo "Let's take the karaf thread dump again" ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}/ps_after.log" pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}/ps_after.log" | grep -v grep | tr -s ' ' | cut -f2 -d' ') echo "karaf main: org.apache.karaf.main.Main, pid:${pid}" diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index e077c34ae..e6f512f75 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -78,11 +78,11 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474' controller-max-mem: '2048m' tools_system_count: '1' tools_system_flavor: 'odl-highcpu-2' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' ##################### # Job configuration # @@ -187,11 +187,11 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474' controller-max-mem: '2048m' tools_system_count: '1' tools_system_flavor: 'odl-highcpu-2' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' ##################### @@ -208,7 +208,7 @@ repo-url: '{repo-url}' robot-options: '{robot-options}' # Controller - controller-scope: '{scope}' + controller-scope: '{install}' controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: '{install-features}' @@ -447,7 +447,7 @@ repo-url: '{repo-url}' robot-options: '{robot-options}' # Controller - controller-scope: '{scope}' + controller-scope: '{install}' controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: '{install-features}' @@ -496,11 +496,11 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474' controller-max-mem: '2048m' tools_system_count: '1' tools_system_flavor: 'odl-highcpu-2' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' ##################### # Job Configuration # @@ -608,11 +608,11 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474' controller-max-mem: '2048m' tools_system_count: '1' tools_system_flavor: 'odl-highcpu-2' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' ##################### # Job configuration # @@ -628,7 +628,7 @@ repo-url: '{repo-url}' robot-options: '{robot-options}' # Controller - controller-scope: '{scope}' + controller-scope: '{install}' controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: 'odl-jolokia,{install-features}' @@ -868,7 +868,7 @@ repo-url: '{repo-url}' robot-options: '{robot-options}' # Controller - controller-scope: '{scope}' + controller-scope: '{install}' controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: 'odl-jolokia,{install-features}' @@ -918,11 +918,11 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474' controller-max-mem: '2048m' docker_system_count: '1' docker_system_flavor: 'odl-standard-1' - docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840' + docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20200801-220136.401' ##################### # Job Configuration # @@ -938,7 +938,7 @@ repo-url: '{repo-url}' robot-options: '{robot-options}' # Controller - controller-scope: '{scope}' + controller-scope: '{install}' controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: 'odl-jolokia,{install-features}' @@ -1053,17 +1053,17 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474' controller-max-mem: '2048m' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' - openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' + openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896' openstack_system2_count: 0 openstack_system2_flavor: 'odl-standard-1' - openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' + openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' ##################### # Job configuration # @@ -1139,8 +1139,9 @@ - string: name: ODL_ML2_PORT_BINDING default: '{odl-ml2-port-binding}' - description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or - network-topology)' + description: > + Method of networking-odl port-binding (pseudo-agentdb-binding or + legacy-port-binding or network-topology) - string: name: DEVSTACK_KUBERNETES_PLUGIN_REPO default: '{devstack-kubernetes-plugin-repo}' @@ -1216,8 +1217,9 @@ - string: name: LBAAS_SERVICE_PROVIDER default: '{lbaas-service-provider}' - description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using - neutron-lbaas' + description: > + The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in + local.conf - only relevant when using neutron-lbaas - string: name: ODL_SFC_DRIVER default: '{odl-sfc-driver}' @@ -1226,11 +1228,16 @@ name: ODL_SNAT_MODE default: '{odl-snat-mode}' description: 'The SNAT mode to be configured - options are conntrack/controller.' + - string: + name: GROUP_ADD_MOD_ENABLED + default: '{group-add-mod-enabled}' + description: 'The Group add mod enabled mode to be configured - options are true/false.' - string: name: OVS_INSTALL default: '{ovs-install}' - description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum - repo url to pull from.' + description: > + Install a custom OVS. It can be an OVS version to build + (like v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from. scm: - integration-gerrit-scm: @@ -1446,6 +1453,10 @@ name: ODL_SNAT_MODE default: '{odl-snat-mode}' description: 'The SNAT mode to be configured - options are conntrack/controller.' + - string: + name: GROUP_ADD_MOD_ENABLED + default: '{group-add-mod-enabled}' + description: 'The Group add mod enabled mode to be configured - options are true/false.' - string: name: OVS_INSTALL default: '{ovs-install}' @@ -1470,17 +1481,17 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474' controller-max-mem: '2048m' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' - openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' + openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896' openstack_system2_count: 0 openstack_system2_flavor: 'odl-standard-1' - openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' + openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' ##################### # Job configuration # @@ -1647,6 +1658,10 @@ name: ODL_SNAT_MODE default: '{odl-snat-mode}' description: 'The SNAT mode to be configured - options are conntrack/controller.' + - string: + name: GROUP_ADD_MOD_ENABLED + default: '{group-add-mod-enabled}' + description: 'The Group add mod enabled mode to be configured - options are true/false.' - string: name: OVS_INSTALL default: '{ovs-install}' @@ -1871,6 +1886,10 @@ name: ODL_SNAT_MODE default: '{odl-snat-mode}' description: 'The SNAT mode to be configured - options are conntrack/controller.' + - string: + name: GROUP_ADD_MOD_ENABLED + default: '{group-add-mod-enabled}' + description: 'The Group add mod enabled mode to be configured - options are true/false.' - string: name: OVS_INSTALL default: '{ovs-install}' @@ -2082,6 +2101,10 @@ name: ODL_SNAT_MODE default: '{odl-snat-mode}' description: 'The SNAT mode to be configured - options are conntrack/controller.' + - string: + name: GROUP_ADD_MOD_ENABLED + default: '{group-add-mod-enabled}' + description: 'The Group add mod enabled mode to be configured - options are true/false.' scm: - integration-gerrit-scm: @@ -2206,3 +2229,7 @@ name: ODL_SNAT_MODE default: '{odl-snat-mode}' description: 'The SNAT mode to be configured - options are conntrack/controller.' + - string: + name: GROUP_ADD_MOD_ENABLED + default: '{group-add-mod-enabled}' + description: 'The Group add mod enabled mode to be configured - options are true/false.' diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 037f11cd8..d5fca6feb 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -15,6 +15,7 @@ - gerrit-tox-verify: branch: master stream: master + build-node: centos7-builder-2c-2g # CSIT Lists in defaults.yaml stream: @@ -24,7 +25,7 @@ java-version: 'openjdk11' csit-list: !include: csit-jobs-aluminium.lst build-order: > - odlparent yangtools mdsal infrautils controller serviceutils aaa netconf + odlparent yangtools mdsal controller infrautils serviceutils aaa netconf daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt bgpcep integration/distribution @@ -61,39 +62,48 @@ stream: - aluminium: branch: 'master' - csit-blacklist: > - alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo - p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools + csit-blocklist: > + alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal + nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools gate longevity sanity tdd tempest wip + bgpcep-csit-3node-bgpclustering-all + bgpcep-csit-3node-bgpclustering-ha-only netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct netvirt-csit-3node-1cmb + openflowplugin-csit-1node-bundle-based-reconciliation last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used csit-list: !include: csit-jobs-aluminium.lst csit-mri-list: '{csit-mri-list-aluminium}' csit-weekly-list: '{csit-weekly-list-aluminium}' - magnesium: branch: 'stable/magnesium' - csit-blacklist: > + csit-blocklist: > alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools gate longevity sanity tdd tempest wip + bgpcep-csit-3node-bgpclustering-all + bgpcep-csit-3node-bgpclustering-ha-only netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct netvirt-csit-3node-1cmb + openflowplugin-csit-1node-bundle-based-reconciliation last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used csit-list: !include: csit-jobs-magnesium.lst csit-mri-list: '{csit-mri-list-magnesium}' csit-weekly-list: '{csit-weekly-list-magnesium}' - sodium: branch: 'stable/sodium' - csit-blacklist: > + csit-blocklist: > alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo p4plugin packetcable sxp telemetry tsdr unimgr usc yangtools gate longevity sanity tdd tempest wip + bgpcep-csit-3node-bgpclustering-all + bgpcep-csit-3node-bgpclustering-ha-only netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct netvirt-csit-3node-1cmb + openflowplugin-csit-1node-bundle-based-reconciliation last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used csit-list: !include: csit-jobs-sodium.lst csit-mri-list: '{csit-mri-list-sodium}' @@ -563,9 +573,9 @@ branch: master # Hardcode as releng/builder only has master lftools-version: '{lftools-version}' - string: - name: CSIT_BLACKLIST - default: '{csit-blacklist}' - description: Space separated list of jobs strings to blacklist. + name: CSIT_BLOCKLIST + default: '{csit-blocklist}' + description: Space separated list of jobs strings to blocklist. scm: - lf-infra-gerrit-scm: @@ -604,6 +614,15 @@ publishers: - lf-infra-publish +- project: + name: integration-info + jobs: + - gerrit-info-yaml-verify + project: integration + project-name: integration + branch: master + build-node: centos7-builder-2c-1g + - project: name: integration-view views: diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh index a0399a09c..a054e1fa0 100755 --- a/jjb/integration/multipatch-distribution.sh +++ b/jjb/integration/multipatch-distribution.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -ex # create a fresh empty place to build this custom distribution BUILD_DIR=${WORKSPACE}/patch_tester @@ -18,16 +18,19 @@ mkdir -p "$BUILD_DIR" cd "$BUILD_DIR" # Download distribution pom.xml -wget "http://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=blob_plain;f=artifacts/upstream/properties/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml" +wget "https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=blob_plain;f=artifacts/upstream/properties/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml" cat pom.xml # Set up git committer name and email, needed for commit creation when cherry-picking. -export EMAIL="sandbox@jenkins.opendaylight.org" +export EMAIL="jenkins-$SILO@opendaylight.org" export GIT_COMMITTER_NAME="Multipatch Job" # Extract a list of patches per project from an comment trigger. An example is: # multipatch-build:openflowplugin:45/69445/1,genius:46/69446/1,netvirt:47/69447/1 if [ -n "$GERRIT_EVENT_COMMENT_TEXT" ]; then + # Decode Base64 before parsing text. + GERRIT_EVENT_COMMENT_TEXT=$(echo "$GERRIT_EVENT_COMMENT_TEXT" | base64 -d) + if [[ "$GERRIT_EVENT_COMMENT_TEXT" == *fast* ]]; then BUILD_FAST="true" PATCHES_TO_BUILD=$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'multipatch-build-fast:') @@ -145,29 +148,36 @@ do git checkout FETCH_HEAD # If the patch is for MRI project, adjust the MRI versions # shellcheck disable=SC2235 - if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || ([ "${PROJECT}" == "mdsal" ] && [ "${DISTROSTREAM}" != "fluorine" ]); then + if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]); then ODLPARENT_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:odlparent.version ../pom.xml)" echo "change odlparent version to ${ODLPARENT_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:parent/x:groupId=\"org.opendaylight.odlparent\"\] -v "${ODLPARENT_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:groupId=\"org.opendaylight.odlparent\"\] -v "${ODLPARENT_VERSION}" fi # shellcheck disable=SC2235 - if [ "${PROJECT}" == "yangtools" ] || ([ "${PROJECT}" == "mdsal" ] && [ "${DISTROSTREAM}" != "fluorine" ]); then + if [ "${PROJECT}" == "yangtools" ] || [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]); then YANGTOOLS_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:yangtools.version ../pom.xml)" echo "change yangtools version to ${YANGTOOLS_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:parent/x:groupId=\"org.opendaylight.yangtools\"\] -v "${YANGTOOLS_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:groupId=\"org.opendaylight.yangtools\"\] -v "${YANGTOOLS_VERSION}" fi - if [ "${PROJECT}" == "mdsal" ] && [ "${DISTROSTREAM}" != "fluorine" ]; then + # shellcheck disable=SC2235 + if [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]); then MDSAL_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:mdsal.version ../pom.xml)" echo "change mdsal version to ${MDSAL_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:parent/x:groupId=\"org.opendaylight.mdsal\"\] -v "${MDSAL_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:groupId=\"org.opendaylight.mdsal\"\] -v "${MDSAL_VERSION}" fi + if [ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]; then + CONTROLLER_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:controller.version ../pom.xml)" + echo "change controller version to ${CONTROLLER_VERSION}" + find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:parent/x:groupId=\"org.opendaylight.controller\"\] -v "${CONTROLLER_VERSION}" + find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:groupId=\"org.opendaylight.controller\"\] -v "${CONTROLLER_VERSION}" + fi else # If project with no patch is MRI, download release tag: # shellcheck disable=SC2235 - if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || ([ "${PROJECT}" == "mdsal" ] && [ "${DISTROSTREAM}" != "fluorine" ]); then + if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]); then # shellcheck disable=SC2086 PROJECT_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:${PROJECT_SHORTNAME}.version ../pom.xml)" echo "2. checking out tag v${PROJECT_VERSION}" diff --git a/jjb/integration/update-csit-tests.sh b/jjb/integration/update-csit-tests.sh index 92bfe1e45..8d2c46a6d 100644 --- a/jjb/integration/update-csit-tests.sh +++ b/jjb/integration/update-csit-tests.sh @@ -22,8 +22,8 @@ jobs=($(xmlstarlet sel -t -m '//hudson/job' \ job_list="${WORKSPACE}/jjb/integration/csit-jobs-${STREAM}.lst" rm "$job_list" for job in "${jobs[@]}"; do - echo "Checking if $job is blacklisted." - if [[ ! $job =~ update-csit-tests|${CSIT_BLACKLIST// /\|} ]]; then + echo "Checking if $job is blocklisted." + if [[ ! $job =~ update-csit-tests|${CSIT_BLOCKLIST// /\|} ]]; then echo "${job}," >> "$job_list" echo " Added $job to job list." fi diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 354db8a4b..6bdd54d83 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -83,6 +83,19 @@ branch: 'master' mvn-settings: 'jsonrpc-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: jsonrpc-info + jobs: + - gerrit-info-yaml-verify + project: jsonrpc + project-name: jsonrpc + branch: master + build-node: centos7-builder-2c-1g - project: name: jsonrpc-view diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index ca8c2fd8b..16be7f055 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -82,6 +82,19 @@ mvn-settings: 'l2switch-settings' mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true' disable-job: true + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: l2switch-info + jobs: + - gerrit-info-yaml-verify + project: l2switch + project-name: l2switch + branch: master + build-node: centos7-builder-2c-1g - project: name: l2switch-view diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml index 20d4d6299..d27c3f5ef 100644 --- a/jjb/lf-infra/lf-infra-jobs.yaml +++ b/jjb/lf-infra/lf-infra-jobs.yaml @@ -154,6 +154,7 @@ project: releng/lftools project-pattern: releng/lftools build-node: centos7-builder-2c-2g + build-timeout: 30 rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-tools/32933/ rtd-token: 47a135ceba9053c6f88394a7171ebf5602a9fc95 stream: any diff --git a/jjb/lfn/lfn.yaml b/jjb/lfn/lfn.yaml deleted file mode 100644 index 68d539616..000000000 --- a/jjb/lfn/lfn.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- project: - name: lfn-process - jobs: - - '{project-name}-rtd-jobs' - - gerrit-tox-verify - - project-name: lfn-process - project: lfn/process - project-pattern: lfn/process - build-node: centos7-builder-2c-1g - rtd-build-url: https://readthedocs.org/api/v2/webhook/lfn-process/33719/ - rtd-token: e505b4ae2bf222dcd2b6b08d7b04384ac0459b19 - stream: any - branch: '*' - - git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT - gerrit-server-name: lf-releng - -- project: - name: lfn-view - views: - - project-view - project-name: lfn-process diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml deleted file mode 100644 index 4a8c17c05..000000000 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- project: - name: lispflowmapping-csit-performance - jobs: - - inttest-csit-1node - - # The project name - project: 'lispflowmapping' - - # The functionality under test - functionality: 'performance' - - # Project branches - stream: - - aluminium: - branch: 'master' - jre: 'openjdk11' - - magnesium: - branch: 'stable/magnesium' - jre: 'openjdk11' - - sodium: - branch: 'stable/sodium' - - install: - - only: - scope: 'only' - - # Job instance type - odl_system_flavor: 'odl-highcpu-8' - - # Features to install - install-features: 'odl-lispflowmapping-msmr' - - # Robot custom options - robot-options: '' - - # Plot Info - 01-plot-title: 'Southbound Map-Reply Rate' - 01-plot-yaxis: 'req/sec' - 01-plot-group: 'Performance' - 01-plot-data-file: 'pps.csv' - - 02-plot-title: 'RPC mapping setup rate (for 10k IPv4-to-IPv4 mappings)' - 02-plot-yaxis: 'req/sec' - 02-plot-group: 'Performance' - 02-plot-data-file: 'rpcs.csv' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index bf8b6d3ff..82ae84fdb 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -107,6 +107,19 @@ mvn-settings: 'lispflowmapping-settings' mvn-goals: 'clean deploy -DrepoBuild' mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: lispflowmapping-info + jobs: + - gerrit-info-yaml-verify + project: lispflowmapping + project-name: lispflowmapping + branch: master + build-node: centos7-builder-2c-1g - project: name: lispflowmapping-view diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index af6eb8c0e..244360c83 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -33,6 +33,38 @@ # Used by the release job staging-profile-id: a674173c7b29d +- project: + name: mdsal-6.0.x + jobs: + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: mdsal + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/ + rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002 + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + project: mdsal + project-name: mdsal + branch: 6.0.x + stream: 6.0.x + + java-version: 'openjdk11' + mvn-settings: 'mdsal-settings' + mvn-version: mvn36 + build-timeout: 90 + + archive-artifacts: > + **/*.prop + **/*.log + **/target/surefire-reports/*-output.txt + **/target/failsafe-reports/failsafe-summary.xml + **/hs_err_*.log + **/target/feature/feature.xml + + # Used by the release job + staging-profile-id: a674173c7b29d + - project: name: mdsal-5.0.x jobs: @@ -112,11 +144,23 @@ project: 'mdsal' project-name: 'mdsal' branch: 'master' - build-node: centos7-builder-8c-8g java-version: 'openjdk11' mvn-settings: 'mdsal-settings' mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' mvn-opts: '-Xmx2048m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: mdsal-info + jobs: + - gerrit-info-yaml-verify + project: mdsal + project-name: mdsal + branch: master + build-node: centos7-builder-2c-1g - project: name: mdsal-view diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index bb532eb00..6e19ad099 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -67,6 +67,19 @@ mvn-settings: 'nemo-settings' mvn-opts: '-Xmx1024m' disable-job: true + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: nemo-info + jobs: + - gerrit-info-yaml-verify + project: nemo + project-name: nemo + branch: master + build-node: centos7-builder-2c-1g - project: name: nemo-view diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 8b83aebe9..0e0352f2e 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -28,7 +28,7 @@ scope: 'only' # no mininet required - tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610 + tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200701-170158.227 # Features to install install-features: 'odl-netconf-callhome-ssh,odl-restconf' diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index 47b6c614d..14cff7d78 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -22,6 +22,7 @@ - core: csit-list: > netconf-csit-1node-gate-userfeatures-all-{stream}, + netconf-csit-1node-gate-userfeatures-rfc8040-all-{stream}, netconf-csit-1node-gate-callhome-only-{stream} - netvirt: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 02f2ffbdc..bc82b8213 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -13,6 +13,8 @@ - userfeatures-rfc8040: robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True' - gate-userfeatures + - gate-userfeatures-rfc8040: + robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True' # Project branches stream: @@ -29,7 +31,7 @@ - all: scope: 'all' - tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610 + tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200701-170158.227 # Features to install install-features: > diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 89da37c72..5a79625e2 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -99,6 +99,19 @@ mvn-goals: 'clean deploy -Pintegrationtests' mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' build-timeout: 90 + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: netconf-info + jobs: + - gerrit-info-yaml-verify + project: netconf + project-name: netconf + branch: master + build-node: centos7-builder-2c-1g - project: name: netconf-view diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 80d00fb7a..cd5bbd9c5 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -1,6 +1,6 @@ --- - project: - name: netvirt-csit-hwvtep-openstack-integration-aluminium + name: netvirt-csit-hwvtep-openstack-integration-aluminium-rocky jobs: - inttest-csit-hwvtep-openstack-custom @@ -13,11 +13,11 @@ enable-openstack-services: 'placement-api,l2gw-plugin' enable-openstack-compute-services: 'placement-client' security-group-mode: 'stateful' - odl_system_flavor: odl-highcpu-8 + odl_system_flavor: odl-highcpu-2 openstack_system_flavor: odl-highcpu-8 openstack_system2_flavor: odl-highcpu-4 tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200801-180146.111 os-cmb-cnt: 0 os-ctl-cnt: 1 os-cmp-cnt: 2 @@ -38,19 +38,72 @@ install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - - upstream-stateful + - upstream-stateful: + schedule: '{schedule-daily}' - gate-stateful openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' + - rocky: + openstack-branch: 'stable/rocky' + odl-ml2-branch: 'stable/rocky' odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' + openstack_system_image: '{openstack_rocky_system_image}' + openstack_system2_image: '{openstack_rocky_system_image}' - project: - name: netvirt-csit-hwvtep-openstack-integration-magnesium + name: netvirt-csit-hwvtep-openstack-integration-aluminium-stein + jobs: + - inttest-csit-hwvtep-openstack-custom + + project: 'netvirt' + stream: 'aluminium' + branch: 'master' + jre: 'openjdk11' + testplan: '{project}-{topology}-l2gw-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,l2gw-plugin' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + odl_system_flavor: odl-highcpu-2 + openstack_system_flavor: odl-highcpu-8 + openstack_system2_flavor: odl-highcpu-4 + tools_system_count: 2 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200801-180146.111 + os-cmb-cnt: 0 + os-ctl-cnt: 1 + os-cmp-cnt: 2 + + # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled + enable-networking-l2gw: 'yes' + + topology: + - 1node: + openstack_system2_count: 2 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + - 3node: + openstack_system2_count: 3 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack' + + functionality: + - upstream-stateful: + schedule: '{schedule-daily}' + - gate-stateful + + openstack: + - stein: + openstack-branch: 'stable/stein' + odl-ml2-branch: 'stable/stein' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_stein_system_image}' + openstack_system2_image: '{openstack_stein_system_image}' + + +- project: + name: netvirt-csit-hwvtep-openstack-integration-magnesium-rocky jobs: - inttest-csit-hwvtep-openstack-custom @@ -63,11 +116,11 @@ enable-openstack-services: 'placement-api,l2gw-plugin' enable-openstack-compute-services: 'placement-client' security-group-mode: 'stateful' - odl_system_flavor: odl-highcpu-8 + odl_system_flavor: odl-highcpu-2 openstack_system_flavor: odl-highcpu-8 openstack_system2_flavor: odl-highcpu-4 tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200801-180146.111 os-cmb-cnt: 0 os-ctl-cnt: 1 os-cmp-cnt: 2 @@ -88,19 +141,74 @@ install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - - upstream-stateful + - upstream-stateful: + schedule: '{schedule-weekly}' - gate-stateful openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' + - rocky: + openstack-branch: 'stable/rocky' + odl-ml2-branch: 'stable/rocky' odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' + openstack_system_image: '{openstack_rocky_system_image}' + openstack_system2_image: '{openstack_rocky_system_image}' + schedule: '{schedule-daily}' - project: - name: netvirt-csit-hwvtep-openstack-integration-sodium + name: netvirt-csit-hwvtep-openstack-integration-magnesium-stein + jobs: + - inttest-csit-hwvtep-openstack-custom + + project: 'netvirt' + stream: 'magnesium' + branch: 'stable/magnesium' + jre: 'openjdk11' + testplan: '{project}-{topology}-l2gw-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,l2gw-plugin' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + odl_system_flavor: odl-highcpu-2 + openstack_system_flavor: odl-highcpu-8 + openstack_system2_flavor: odl-highcpu-4 + tools_system_count: 2 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200801-180146.111 + os-cmb-cnt: 0 + os-ctl-cnt: 1 + os-cmp-cnt: 2 + + # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled + enable-networking-l2gw: 'yes' + + topology: + - 1node: + openstack_system2_count: 2 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + - 3node: + openstack_system2_count: 3 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack' + + functionality: + - upstream-stateful: + schedule: '{schedule-weekly}' + - gate-stateful + + openstack: + - stein: + openstack-branch: 'stable/stein' + odl-ml2-branch: 'stable/stein' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_stein_system_image}' + openstack_system2_image: '{openstack_stein_system_image}' + schedule: '{schedule-weekly}' + + +- project: + name: netvirt-csit-hwvtep-openstack-integration-sodium-rocky jobs: - inttest-csit-hwvtep-openstack-custom @@ -112,11 +220,11 @@ enable-openstack-services: 'placement-api,l2gw-plugin' enable-openstack-compute-services: 'placement-client' security-group-mode: 'stateful' - odl_system_flavor: odl-highcpu-8 + odl_system_flavor: odl-highcpu-2 openstack_system_flavor: odl-highcpu-8 openstack_system2_flavor: odl-highcpu-4 tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200801-180146.111 os-cmb-cnt: 0 os-ctl-cnt: 1 os-cmp-cnt: 2 @@ -137,13 +245,16 @@ install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - - upstream-stateful + - upstream-stateful: + schedule: '{schedule-weekly}' - gate-stateful openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' + - rocky: + openstack-branch: 'stable/rocky' + odl-ml2-branch: 'stable/rocky' odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' + openstack_system_image: '{openstack_rocky_system_image}' + openstack_system2_image: '{openstack_rocky_system_image}' + schedule: '{schedule-weekly}' + diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index 9dbe3bbcc..524c4d544 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -1,6 +1,56 @@ --- - project: - name: netvirt-csit-upgrade-openstack-integration + name: netvirt-csit-upgrade-openstack-integration-rocky + jobs: + - inttest-csit-openstack-custom + + project: 'netvirt' + + stream: + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' + - sodium: + branch: 'stable/sodium' + + testplan: '{project}-{topology}-openstack-upgrade.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,l2gw-plugin' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + group-add-mod-enabled: 'true' + odl_system_flavor: odl-highcpu-2 + openstack_system_flavor: odl-highcpu-8 + openstack_system2_flavor: odl-highcpu-4 + os-cmb-cnt: 0 + os-ctl-cnt: 1 + os-cmp-cnt: 2 + + topology: + - 1node: + openstack_system2_count: 2 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + + functionality: + - upgrade: + schedule: '{schedule-weekly}' + - upgrade-snat-conntrack: + odl-snat-mode: 'conntrack' + schedule: '{schedule-weekly}' + + openstack: + - rocky: + openstack-branch: 'stable/rocky' + odl-ml2-branch: 'stable/rocky' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_rocky_system_image}' + openstack_system2_image: '{openstack_rocky_system_image}' + + +- project: + name: netvirt-csit-upgrade-openstack-integration-rocky-aluminium jobs: - inttest-csit-openstack-custom @@ -10,18 +60,108 @@ - aluminium: branch: 'master' jre: 'openjdk11' + + testplan: '{project}-{topology}-openstack-upgrade.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,l2gw-plugin' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + group-add-mod-enabled: 'true' + odl_system_flavor: odl-highcpu-2 + openstack_system_flavor: odl-highcpu-8 + openstack_system2_flavor: odl-highcpu-4 + os-cmb-cnt: 0 + os-ctl-cnt: 1 + os-cmp-cnt: 2 + + topology: + - 1node: + openstack_system2_count: 2 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + + functionality: + - upgrade: + schedule: '{schedule-daily}' + - upgrade-snat-conntrack: + odl-snat-mode: 'conntrack' + schedule: '{schedule-daily}' + + openstack: + - rocky: + openstack-branch: 'stable/rocky' + odl-ml2-branch: 'stable/rocky' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_rocky_system_image}' + openstack_system2_image: '{openstack_rocky_system_image}' + +- project: + name: netvirt-csit-upgrade-openstack-integration-stein + jobs: + - inttest-csit-openstack-custom + + project: 'netvirt' + + stream: - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' - - sodium: - branch: 'stable/sodium' testplan: '{project}-{topology}-openstack-upgrade.txt' odl-ml2-driver-version: 'v2' enable-openstack-services: 'placement-api,l2gw-plugin' enable-openstack-compute-services: 'placement-client' security-group-mode: 'stateful' - odl_system_flavor: odl-highcpu-8 + group-add-mod-enabled: 'true' + odl_system_flavor: odl-highcpu-2 + openstack_system_flavor: odl-highcpu-8 + openstack_system2_flavor: odl-highcpu-4 + os-cmb-cnt: 0 + os-ctl-cnt: 1 + os-cmp-cnt: 2 + + topology: + - 1node: + openstack_system2_count: 2 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + + functionality: + - upgrade: + schedule: '{schedule-weekly}' + - upgrade-snat-conntrack: + odl-snat-mode: 'conntrack' + schedule: '{schedule-weekly}' + + openstack: + - stein: + openstack-branch: 'stable/stein' + odl-ml2-branch: 'stable/stein' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_stein_system_image}' + openstack_system2_image: '{openstack_stein_system_image}' + +- project: + name: netvirt-csit-upgrade-openstack-integration-stein-aluminium + jobs: + - inttest-csit-openstack-custom + + project: 'netvirt' + + stream: + - aluminium: + branch: 'master' + jre: 'openjdk11' + + testplan: '{project}-{topology}-openstack-upgrade.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,l2gw-plugin' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + group-add-mod-enabled: 'true' + odl_system_flavor: odl-highcpu-2 openstack_system_flavor: odl-highcpu-8 openstack_system2_flavor: odl-highcpu-4 os-cmb-cnt: 0 @@ -36,14 +176,16 @@ install-features: 'odl-netvirt-openstack' functionality: - - upgrade + - upgrade: + schedule: '{schedule-daily}' - upgrade-snat-conntrack: odl-snat-mode: 'conntrack' + schedule: '{schedule-daily}' openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' + - stein: + openstack-branch: 'stable/stein' + odl-ml2-branch: 'stable/stein' odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' + openstack_system_image: '{openstack_stein_system_image}' + openstack_system2_image: '{openstack_stein_system_image}' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 3a3913756..180364085 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -1,6 +1,6 @@ --- - project: - name: netvirt-csit-openstack-integration-aluminium + name: netvirt-csit-openstack-integration-aluminium-rocky jobs: - inttest-csit-openstack-custom @@ -13,7 +13,7 @@ enable-openstack-services: 'placement-api,tempest' enable-openstack-compute-services: 'placement-client' security-group-mode: 'stateful' - odl_system_flavor: odl-highcpu-8 + odl_system_flavor: odl-highcpu-2 openstack_system_flavor: odl-highcpu-8 openstack_system2_flavor: odl-highcpu-4 tools_system_count: 0 @@ -75,12 +75,6 @@ odl-snat-mode: 'conntrack' openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' - rocky: openstack-branch: 'stable/rocky' odl-ml2-branch: 'stable/rocky' @@ -89,7 +83,91 @@ openstack_system2_image: '{openstack_rocky_system_image}' - project: - name: netvirt-csit-openstack-integration-magnesium + name: netvirt-csit-openstack-integration-aluminium-stein + jobs: + - inttest-csit-openstack-custom + + project: 'netvirt' + stream: 'aluminium' + branch: 'master' + jre: 'openjdk11' + testplan: '{project}-{topology}-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,tempest' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + odl_system_flavor: odl-highcpu-2 + openstack_system_flavor: odl-highcpu-8 + openstack_system2_flavor: odl-highcpu-4 + tools_system_count: 0 + os-cmb-cnt: 0 + os-ctl-cnt: 1 + os-cmp-cnt: 2 + + topology: + - 1node: + openstack_system2_count: 2 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + robot-options: '-v FAIL_ON_EXCEPTIONS:True' + - 3node: + openstack_system2_count: 3 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack' + + functionality: + - upstream-stateful + - upstream-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + - upstream-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + - gate-stateful + - gate-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + - gate-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + - gate-minimal-cluster: + testplan: '{project}-{topology}-minimal-openstack.txt' + - dcgw: + testplan: '{project}-{topology}-dcgw-openstack.txt' + tools_system_count: 3 + enable-gre-type-driver: 'yes' + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + - gate-tdd-wip: + testplan: '{project}-{topology}-tdd-wip-openstack.txt' + schedule: '{schedule-weekly}' + tools_system_count: 3 + enable-gre-type-driver: 'yes' + - tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + schedule: '{schedule-daily}' + - tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + schedule: '{schedule-daily}' + - gate-tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + - gate-tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + + openstack: + - stein: + openstack-branch: 'stable/stein' + odl-ml2-branch: 'stable/stein' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_stein_system_image}' + openstack_system2_image: '{openstack_stein_system_image}' + + +- project: + name: netvirt-csit-openstack-integration-magnesium-rocky jobs: - inttest-csit-openstack-custom @@ -102,7 +180,7 @@ enable-openstack-services: 'placement-api,tempest' enable-openstack-compute-services: 'placement-client' security-group-mode: 'stateful' - odl_system_flavor: odl-highcpu-8 + odl_system_flavor: odl-highcpu-2 openstack_system_flavor: odl-highcpu-8 openstack_system2_flavor: odl-highcpu-4 tools_system_count: 0 @@ -164,12 +242,6 @@ odl-snat-mode: 'conntrack' openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' - rocky: openstack-branch: 'stable/rocky' odl-ml2-branch: 'stable/rocky' @@ -178,7 +250,94 @@ openstack_system2_image: '{openstack_rocky_system_image}' - project: - name: netvirt-csit-openstack-integration-sodium + name: netvirt-csit-openstack-integration-magnesium-stein + jobs: + - inttest-csit-openstack-custom + + project: 'netvirt' + stream: 'magnesium' + branch: 'stable/magnesium' + jre: 'openjdk11' + testplan: '{project}-{topology}-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,tempest' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + odl_system_flavor: odl-highcpu-2 + openstack_system_flavor: odl-highcpu-8 + openstack_system2_flavor: odl-highcpu-4 + tools_system_count: 0 + os-cmb-cnt: 0 + os-ctl-cnt: 1 + os-cmp-cnt: 2 + + topology: + - 1node: + openstack_system2_count: 2 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + robot-options: '-v FAIL_ON_EXCEPTIONS:True' + - 3node: + openstack_system2_count: 3 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack' + + functionality: + - upstream-stateful: + schedule: '{schedule-weekly}' + - upstream-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + schedule: '{schedule-weekly}' + - upstream-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + schedule: '{schedule-weekly}' + - gate-stateful + - gate-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + - gate-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + - gate-minimal-cluster: + testplan: '{project}-{topology}-minimal-openstack.txt' + - dcgw: + testplan: '{project}-{topology}-dcgw-openstack.txt' + tools_system_count: 3 + schedule: '{schedule-weekly}' + enable-gre-type-driver: 'yes' + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + - gate-tdd-wip: + testplan: '{project}-{topology}-tdd-wip-openstack.txt' + schedule: '{schedule-weekly}' + tools_system_count: 3 + enable-gre-type-driver: 'yes' + - tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + schedule: '{schedule-daily}' + - tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + schedule: '{schedule-daily}' + - gate-tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + - gate-tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + + openstack: + - stein: + openstack-branch: 'stable/stein' + odl-ml2-branch: 'stable/stein' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_stein_system_image}' + openstack_system2_image: '{openstack_stein_system_image}' + +- project: + name: netvirt-csit-openstack-integration-sodium-queens jobs: - inttest-csit-openstack-custom @@ -190,7 +349,7 @@ enable-openstack-services: 'placement-api,tempest' enable-openstack-compute-services: 'placement-client' security-group-mode: 'stateful' - odl_system_flavor: odl-highcpu-8 + odl_system_flavor: odl-highcpu-2 openstack_system_flavor: odl-highcpu-8 openstack_system2_flavor: odl-highcpu-4 tools_system_count: 0 @@ -212,20 +371,25 @@ install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - - upstream-stateful + - upstream-stateful: + schedule: '{schedule-weekly}' - upstream-stateful-itm-direct-tunnels: enable-itm-direct-tunnels: 'true' + schedule: '{schedule-weekly}' - upstream-stateful-snat-conntrack: odl-snat-mode: 'conntrack' + schedule: '{schedule-weekly}' - gate-stateful - gate-stateful-itm-direct-tunnels: enable-itm-direct-tunnels: 'true' + schedule: '{schedule-weekly}' - gate-stateful-snat-conntrack: odl-snat-mode: 'conntrack' - gate-minimal-cluster: testplan: '{project}-{topology}-minimal-openstack.txt' - dcgw: testplan: '{project}-{topology}-dcgw-openstack.txt' + schedule: '{schedule-weekly}' tools_system_count: 3 enable-gre-type-driver: 'yes' # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. @@ -258,6 +422,87 @@ odl-ml2-port-binding: 'pseudo-agentdb-binding' openstack_system_image: '{openstack_queens_system_image}' openstack_system2_image: '{openstack_queens_system_image}' + schedule: '{schedule-weekly}' + +- project: + name: netvirt-csit-openstack-integration-sodium-rocky + jobs: + - inttest-csit-openstack-custom + + project: 'netvirt' + stream: 'sodium' + branch: 'stable/sodium' + testplan: '{project}-{topology}-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,tempest' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + odl_system_flavor: odl-highcpu-2 + openstack_system_flavor: odl-highcpu-8 + openstack_system2_flavor: odl-highcpu-4 + tools_system_count: 0 + os-cmb-cnt: 0 + os-ctl-cnt: 1 + os-cmp-cnt: 2 + + topology: + - 1node: + openstack_system2_count: 2 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + robot-options: '-v FAIL_ON_EXCEPTIONS:True' + - 3node: + openstack_system2_count: 3 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack' + + functionality: + - upstream-stateful: + schedule: '{schedule-weekly}' + - upstream-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + schedule: '{schedule-weekly}' + - upstream-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + schedule: '{schedule-weekly}' + - gate-stateful + - gate-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + - gate-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + - gate-minimal-cluster: + testplan: '{project}-{topology}-minimal-openstack.txt' + - dcgw: + testplan: '{project}-{topology}-dcgw-openstack.txt' + schedule: '{schedule-weekly}' + tools_system_count: 3 + enable-gre-type-driver: 'yes' + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + - gate-tdd-wip: + testplan: '{project}-{topology}-tdd-wip-openstack.txt' + schedule: '{schedule-weekly}' + tools_system_count: 3 + enable-gre-type-driver: 'yes' + - tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + schedule: '{schedule-daily}' + - tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + schedule: '{schedule-daily}' + - gate-tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + - gate-tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + + openstack: - rocky: openstack-branch: 'stable/rocky' odl-ml2-branch: 'stable/rocky' @@ -266,7 +511,7 @@ openstack_system2_image: '{openstack_rocky_system_image}' - project: - name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration + name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-queens jobs: - inttest-csit-openstack-custom @@ -275,19 +520,13 @@ odl-ml2-driver-version: 'v2' enable-openstack-services: 'n-cpu,placement-api,tempest' security-group-mode: 'stateful' - odl_system_flavor: odl-highcpu-8 + odl_system_flavor: odl-highcpu-2 openstack_system_flavor: odl-highcpu-8 os-cmb-cnt: 1 os-ctl-cnt: 0 os-cmp-cnt: 0 stream: - - aluminium: - branch: 'master' - jre: 'openjdk11' - - magnesium: - branch: 'stable/magnesium' - jre: 'openjdk11' - sodium: branch: 'stable/sodium' @@ -305,11 +544,14 @@ install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - - upstream-stateful + - upstream-stateful: + schedule: '{schedule-weekly}' - upstream-stateful-itm-direct-tunnels: enable-itm-direct-tunnels: 'true' + schedule: '{schedule-weekly}' - upstream-stateful-snat-conntrack: odl-snat-mode: 'conntrack' + schedule: '{schedule-weekly}' - gate-stateful - gate-stateful-itm-direct-tunnels: enable-itm-direct-tunnels: 'true' @@ -345,12 +587,246 @@ odl-ml2-port-binding: 'pseudo-agentdb-binding' openstack_system_image: '{openstack_queens_system_image}' openstack_system2_image: '{openstack_queens_system_image}' + schedule: '{schedule-weekly}' + +- project: + name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-rocky + jobs: + - inttest-csit-openstack-custom + + project: 'netvirt' + testplan: '{project}-{topology}-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'n-cpu,placement-api,tempest' + security-group-mode: 'stateful' + odl_system_flavor: odl-highcpu-2 + openstack_system_flavor: odl-highcpu-8 + os-cmb-cnt: 1 + os-ctl-cnt: 0 + os-cmp-cnt: 0 + + stream: + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' + - sodium: + branch: 'stable/sodium' + + topology: + - 1node: + openstack_system2_count: 0 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + robot-options: '-v FAIL_ON_EXCEPTIONS:True' + - 3node: + openstack_system2_count: 1 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack' + + functionality: + - upstream-stateful: + schedule: '{schedule-weekly}' + - upstream-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + schedule: '{schedule-weekly}' + - upstream-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + schedule: '{schedule-weekly}' + - gate-stateful + - gate-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + - gate-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + - gate-minimal-cluster: + testplan: '{project}-{topology}-minimal-openstack.txt' + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + - gate-tdd-wip: + testplan: '{project}-{topology}-tdd-wip-openstack.txt' + schedule: '' + - tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + schedule: '{schedule-daily}' + - tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + schedule: '{schedule-daily}' + - gate-tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + - gate-tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + + openstack: - rocky: openstack-branch: 'stable/rocky' odl-ml2-branch: 'stable/rocky' odl-ml2-port-binding: 'pseudo-agentdb-binding' openstack_system_image: '{openstack_rocky_system_image}' openstack_system2_image: '{openstack_rocky_system_image}' + +- project: + name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein + jobs: + - inttest-csit-openstack-custom + + project: 'netvirt' + testplan: '{project}-{topology}-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'n-cpu,placement-api,tempest' + security-group-mode: 'stateful' + odl_system_flavor: odl-highcpu-2 + openstack_system_flavor: odl-highcpu-8 + os-cmb-cnt: 1 + os-ctl-cnt: 0 + os-cmp-cnt: 0 + + stream: + - magnesium: + branch: 'stable/magnesium' + jre: 'openjdk11' + + topology: + - 1node: + openstack_system2_count: 0 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + robot-options: '-v FAIL_ON_EXCEPTIONS:True' + - 3node: + openstack_system2_count: 1 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack' + + functionality: + - upstream-stateful: + schedule: '{schedule-weekly}' + - upstream-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + schedule: '{schedule-weekly}' + - upstream-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + schedule: '{schedule-weekly}' + - gate-stateful + - gate-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + - gate-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + - gate-minimal-cluster: + testplan: '{project}-{topology}-minimal-openstack.txt' + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + - gate-tdd-wip: + testplan: '{project}-{topology}-tdd-wip-openstack.txt' + schedule: '' + - tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + schedule: '{schedule-daily}' + - tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + schedule: '{schedule-daily}' + - gate-tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + - gate-tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + + openstack: + - stein: + openstack-branch: 'stable/stein' + odl-ml2-branch: 'stable/stein' + odl-ml2-port-binding: 'pseudo-agentdb-binding' + openstack_system_image: '{openstack_stein_system_image}' + openstack_system2_image: '{openstack_stein_system_image}' + + +- project: + name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-aluminium + jobs: + - inttest-csit-openstack-custom + + project: 'netvirt' + testplan: '{project}-{topology}-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'n-cpu,placement-api,tempest' + security-group-mode: 'stateful' + odl_system_flavor: odl-highcpu-2 + openstack_system_flavor: odl-highcpu-8 + os-cmb-cnt: 1 + os-ctl-cnt: 0 + os-cmp-cnt: 0 + + stream: + - aluminium: + branch: 'master' + jre: 'openjdk11' + + topology: + - 1node: + openstack_system2_count: 0 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + robot-options: '-v FAIL_ON_EXCEPTIONS:True' + - 3node: + openstack_system2_count: 1 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack' + + functionality: + - upstream-stateful: + schedule: '{schedule-daily}' + - upstream-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + schedule: '{schedule-daily}' + - upstream-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + schedule: '{schedule-daily}' + - gate-stateful + - gate-stateful-itm-direct-tunnels: + enable-itm-direct-tunnels: 'true' + - gate-stateful-snat-conntrack: + odl-snat-mode: 'conntrack' + - gate-minimal-cluster: + testplan: '{project}-{topology}-minimal-openstack.txt' + - dcgw: + testplan: '{project}-{topology}-dcgw-openstack.txt' + tools_system_count: 3 + enable-gre-type-driver: 'yes' + schedule: '{schedule-daily}' + # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. + - gate-tdd-wip: + testplan: '{project}-{topology}-tdd-wip-openstack.txt' + schedule: '' + - tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + schedule: '{schedule-daily}' + - tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + schedule: '{schedule-daily}' + - gate-tempest-stateful: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + - gate-tempest-stateful-snat-conntrack: + test-suites: 'openstack/tempest/tempest.robot' + testplan: '{project}-{topology}-openstack-tempest.txt' + odl-snat-mode: 'conntrack' + + openstack: - stein: openstack-branch: 'stable/stein' odl-ml2-branch: 'stable/stein' diff --git a/jjb/netvirt/netvirt-dependencies.yaml b/jjb/netvirt/netvirt-dependencies.yaml index db1b70c2c..be7f09c5f 100644 --- a/jjb/netvirt/netvirt-dependencies.yaml +++ b/jjb/netvirt/netvirt-dependencies.yaml @@ -24,6 +24,8 @@ build-node: centos7-builder-2c-8g - ubuntu1604: build-node: ubuntu1604-mininet-ovs-25-1c-4g + - ubuntu1804: + build-node: ubuntu1804-mininet-ovs-25-1c-4g - job-template: name: 'netvirt-thirdparty-quagga-{platform}' diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index b745f5f9f..50499ed92 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -16,7 +16,7 @@ - sodium: branch: 'stable/sodium' - os-branch: 'queens' + os-branch: 'rocky' jdk: 'openjdk8' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index f3932e81b..c13209470 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -128,6 +128,10 @@ java-version: 'openjdk11' mvn-settings: 'netvirt-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - project: name: netvirt-csit-view @@ -137,6 +141,14 @@ view-description: 'List of netvirt-csit jobs' view-regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*' +- project: + name: netvirt + jobs: + - gerrit-info-yaml-verify + project: netvirt + project-name: netvirt-info + build-node: centos7-builder-2c-1g + - project: name: netvirt-view views: diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index dab038e5f..e64a81554 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -74,6 +74,19 @@ java-version: 'openjdk11' mvn-settings: 'neutron-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: neutron-info + jobs: + - gerrit-info-yaml-verify + project: neutron + project-name: neutron + branch: master + build-node: centos7-builder-2c-1g - project: name: neutron-view diff --git a/jjb/odlguice/odlguice.yaml b/jjb/odlguice/odlguice.yaml new file mode 100644 index 000000000..795a2ee10 --- /dev/null +++ b/jjb/odlguice/odlguice.yaml @@ -0,0 +1,36 @@ +--- +- project: + name: odlguice-aluminium + jobs: + - gerrit-release-merge + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: 'odlguice' + project-name: 'odlguice' + build-node: centos7-builder-2c-2g + build-timeout: 120 + branch: 'master' + java-version: 'openjdk11' + mvn-settings: 'odlguice-settings' + mvn-opts: '-Xmx2048m' + email-upstream: '[app-dev]' + + # Used by the release job + staging-profile-id: 44ce7d1aad49e + +- project: + name: odlguice-info + jobs: + - gerrit-info-yaml-verify + project: odlguice + project-name: odlguice + branch: master + build-node: centos7-builder-2c-1g + +- project: + name: odlguice-view + views: + - project-view + project-name: odlguice diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml index 46cd584d4..cd3d3f8c6 100644 --- a/jjb/odlmicro/odlmicro.yaml +++ b/jjb/odlmicro/odlmicro.yaml @@ -1,25 +1,33 @@ --- - project: - name: odlmicro + name: odlmicro-aluminium jobs: - gerrit-release-merge - - gerrit-tox-verify - - stream: - - aluminium: - branch: 'master' - - magnesium: - branch: 'stable/magnesium' + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + stream: aluminium project: odlmicro - project-name: odlmicro + project-name: 'odlmicro' + branch: 'master' + java-version: 'openjdk11' build-node: centos7-builder-2c-2g build-timeout: 60 mvn-settings: 'odlmicro-settings' + mvn-opts: '-Xmx2048m' # Used by the release job staging-profile-id: 44ce67428fd0d +- project: + name: odlmicro-info + jobs: + - gerrit-info-yaml-verify + project: odlmicro + project-name: odlmicro + branch: master + build-node: centos7-builder-2c-1g + - project: name: odlmicro-view views: diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 65d658bbc..b2ecd102e 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -116,6 +116,19 @@ java-version: 'openjdk11' mvn-settings: 'odlparent-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: odlparent-info + jobs: + - gerrit-info-yaml-verify + project: odlparent + project-name: odlparent + branch: master + build-node: centos7-builder-2c-1g - project: name: odlparent-view diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml new file mode 100644 index 000000000..eea06da07 --- /dev/null +++ b/jjb/odlsaf/odlsaf.yaml @@ -0,0 +1,36 @@ +--- +- project: + name: odlsaf-aluminium + jobs: + - gerrit-release-merge + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + + stream: aluminium + project: 'odlsaf' + project-name: 'odlsaf' + build-node: centos7-builder-2c-2g + build-timeout: 120 + branch: 'master' + java-version: 'openjdk11' + mvn-settings: 'odlsaf-settings' + mvn-opts: '-Xmx2048m' + email-upstream: '[app-dev]' + + # Used by the release job + staging-profile-id: 2802f0e38ee665 + +- project: + name: odlsaf-info + jobs: + - gerrit-info-yaml-verify + project: odlsaf + project-name: odlsaf + branch: master + build-node: centos7-builder-2c-1g + +- project: + name: odlsaf-view + views: + - project-view + project-name: odlsaf diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml index ca1c3f774..2a9b7e9e6 100644 --- a/jjb/odltools/odltools.yaml +++ b/jjb/odltools/odltools.yaml @@ -25,6 +25,15 @@ build-timeout: 60 mvn-settings: 'odltools-settings' +- project: + name: odltools-info + jobs: + - gerrit-info-yaml-verify + project: odltools + project-name: odltools + branch: master + build-node: centos7-builder-2c-1g + - project: name: odltools-view views: diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index a4abe3060..33d38c7ea 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -67,6 +67,19 @@ mvn-settings: 'of-config-settings' mvn-opts: '-Xmx1024m' disable-job: true + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: of-config-info + jobs: + - gerrit-info-yaml-verify + project: of-config + project-name: of-config + branch: master + build-node: centos7-builder-2c-1g - project: name: of-config-view diff --git a/jjb/openci/create-ape.sh b/jjb/openci/create-ape.sh deleted file mode 100755 index eb3c3437b..000000000 --- a/jjb/openci/create-ape.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2018 Ericsson AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -set -o errexit -set -o nounset -set -o pipefail - -# workaround for https://github.com/pypa/virtualenv/issues/1029 -export PS1=${PS1:-} - -# This script creates ArtifactPublishedEvent (APE) - -git clone https://gitlab.openci.io/openci/prototypes.git -cd prototypes/federated-cicd -virtualenv openci_publish -cd openci_publish -# shellcheck disable=SC1091 -source bin/activate -python setup.py install - -# generate event body -cat < ./json_body.txt -{ - "type": "$PUBLISH_EVENT_TYPE", - "id": "$(uuidgen)", - "time": "$(date -u +%Y-%m-%d_%H:%M:%SUTC)", - "buildUrl": "$BUILD_URL", - "branch": "master", - "origin": "$PUBLISH_EVENT_ORIGIN", - "artifactLocation": "$ARTIFACT_LOCATION", - "confidenceLevel": "$CONFIDENCE_LEVEL" -} -EOF - -echo "Constructed $PUBLISH_EVENT_TYPE" -echo "--------------------------------------------" -cat ./json_body.txt -echo "--------------------------------------------" - -python openci_publish -H 129.192.69.55 -U "${ACTIVEMQ_USER}" -p "${ACTIVEMQ_PASSWORD}" -n openci.prototype -B ./json_body.txt - -deactivate diff --git a/jjb/openci/openci-odl-daily-jobs.yaml b/jjb/openci/openci-odl-daily-jobs.yaml deleted file mode 100644 index 8cb06fe70..000000000 --- a/jjb/openci/openci-odl-daily-jobs.yaml +++ /dev/null @@ -1,99 +0,0 @@ ---- -- project: - name: openci-odl - - project: '{name}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - jobs: - - 'openci-odl-autorelease-daily-{stream}' - - 'openci-odl-promote-daily-{stream}' - -# This job gets triggered manually for the demo purposes. -# -# In prototype, either what this job does needs to be integrated to -# ODL autorelease job or triggered by the upstream autorelease job. -- job-template: - name: 'openci-odl-autorelease-daily-{stream}' - - disabled: '{obj:disabled}' - - concurrent: false - - build-node: centos7-builder-2c-2g - - parameters: - - string: - name: PUBLISH_EVENT_TYPE - default: ArtifactPublishedEvent - description: 'The type of the event this job publishes' - - string: - name: PUBLISH_EVENT_ORIGIN - default: ODL - description: 'Originating community' - - string: - name: ARTIFACT_LOCATION - default: https://url/to/artifact/on/odl/nexus/$BUILD_NUMBER - description: 'The location of the artifact on ODL Nexus' - - string: - name: CONFIDENCE_LEVEL - default: "'autorelease': 'SUCCESS'" - description: 'The confidence level the published artifact gained' - - wrappers: - - credentials-binding: - - username-password-separated: - credential-id: openci-connect-activemq - username: ACTIVEMQ_USER - password: ACTIVEMQ_PASSWORD - - workspace-cleanup - - builders: - # this build step in the job executes create-ape.sh to construct the - # ArtifactPublishedEvent (ape) and publishes it using the python utility - - shell: - !include-raw-escape: ./create-ape.sh - -# This job gets triggered by a ConfidenceLevelModifiedEvent published -# by OPNFV jobs so ODL can promote the autorelease artifact even further. -# -# This job is created for the demo purposes and might not be there for -# the prototype. -- job-template: - name: 'openci-odl-promote-daily-{stream}' - - disabled: '{obj:disabled}' - - concurrent: false - - build-node: centos7-builder-2c-2g - - triggers: - - jms-messaging: - provider-name: openci.activemq - selector: > - JMSType = 'ConfidenceLevelModifiedEvent' and - JMSOrigin = 'OPNFV' and - JMSScenario = 'os-odl-nofeature-ha' - - builders: - - shell: | - #!/bin/bash - - echo - echo "Triggered by $type" - echo "----------------------------------" - echo $CI_MESSAGE - echo "----------------------------------" - echo " Promoted ODL Autorelease artifact as release candidate!" - -- project: - name: openci-odl-view - views: - - project-view - project-name: openci-odl diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml index 3fca0825a..78ea0e484 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml @@ -25,7 +25,7 @@ # Job images tools_system_count: 2 - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: 'odl-openflowplugin-flow-services-rest' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index be28da8d5..8b561ce74 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -26,7 +26,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 27007e3d0..0402ba372 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -28,7 +28,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-bulk-o-matic' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index ff8f0e119..25dec7c05 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -28,7 +28,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 2e25311f6..77c162568 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -28,7 +28,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index b595352b1..e30af69f4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -17,18 +17,17 @@ - aluminium: branch: 'master' jre: 'openjdk11' + install: 'all' - magnesium: branch: 'stable/magnesium' jre: 'openjdk11' + install: 'all' - sodium: branch: 'stable/sodium' - - install: - - all: - scope: 'all' + install: 'all' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 6fe25d0fd..5b2cb7e5d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -30,7 +30,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index c690cc11c..7c344d5fe 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -28,7 +28,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index da81f9e39..84262cb00 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -28,7 +28,8 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + odl_system_flavor: 'odl-standard-4' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: 'odl-openflowplugin-flow-services-rest' diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 4c3fdfdb2..d814d36c3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -27,7 +27,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 2f15c4062..ad11f1526 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -26,7 +26,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 54a71fbf3..ef5e744ff 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -26,7 +26,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 74a5ef9fc..066510af2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -28,7 +28,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index d6e473db8..afd677a1c 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -123,6 +123,19 @@ mvn-settings: 'openflowplugin-settings' mvn-goals: 'clean deploy javadoc:aggregate' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: openflowplugin-info + jobs: + - gerrit-info-yaml-verify + project: openflowplugin + project-name: openflowplugin + branch: master + build-node: centos7-builder-2c-1g - project: name: openflowplugin-view diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index b5cc790e3..d273f3953 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -129,6 +129,15 @@ email-prefix: '[opflex]' - lf-infra-publish +- project: + name: opflex-info + jobs: + - gerrit-info-yaml-verify + project: opflex + project-name: opflex + branch: master + build-node: centos7-builder-2c-1g + - project: name: opflex-view views: diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 139dcc56e..af2ec28f0 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -88,6 +88,15 @@ # Used by the release job staging-profile-id: a68b188166958 +- project: + name: ovsdb-info + jobs: + - gerrit-info-yaml-verify + project: ovsdb + project-name: ovsdb + branch: master + build-node: centos7-builder-2c-1g + - project: name: ovsdb-view views: diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 1d5d28b65..ae8f46da7 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -67,6 +67,19 @@ branch: 'master' mvn-settings: 'p4plugin-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: p4plugin-info + jobs: + - gerrit-info-yaml-verify + project: p4plugin + project-name: p4plugin + branch: master + build-node: centos7-builder-2c-1g - project: name: p4plugin-view diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 17b19f6ca..72b2d6a91 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -562,6 +562,15 @@ publishers: - lf-infra-publish +- project: + name: packaging-info + jobs: + - gerrit-info-yaml-verify + project: packaging + project-name: packaging + branch: master + build-node: centos7-builder-2c-1g + - project: name: packaging-view views: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 4508aec63..5d9f5fabc 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -67,6 +67,19 @@ mvn-settings: 'packetcable-settings' mvn-opts: '-Xmx1024m' disable-job: true + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: packetcable-info + jobs: + - gerrit-info-yaml-verify + project: packetcable + project-name: packetcable + branch: master + build-node: centos7-builder-2c-1g - project: name: packetcable-view diff --git a/jjb/plastic/plastic.yaml b/jjb/plastic/plastic.yaml index 7b4ebc16e..f77719b9b 100644 --- a/jjb/plastic/plastic.yaml +++ b/jjb/plastic/plastic.yaml @@ -35,6 +35,19 @@ java-version: openjdk8 mvn-settings: plastic-settings mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: plastic-info + jobs: + - gerrit-info-yaml-verify + project: plastic + project-name: plastic + branch: master + build-node: centos7-builder-2c-1g - project: name: plastic-view diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 69d329963..b2a332e61 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -22,6 +22,7 @@ - gerrit-tox-verify # Automation for docs and jobs - 'builder-update-image-list' + - gerrit-info-yaml-verify # The following values are only specified here # so that code blocks look similar to other projects. @@ -32,7 +33,7 @@ build-node: centos7-builder-2c-2g archive-artifacts: '**/*.log' build-timeout: 30 - jjb-version: 2.9.1 + jjb-version: 3.5.0 - project: name: builder-openstack diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml index a2c44a170..eaee6cf0a 100644 --- a/jjb/releng-packer-jobs.yaml +++ b/jjb/releng-packer-jobs.yaml @@ -22,7 +22,9 @@ build-timeout: 90 cron: '00 H 1 * *' - platforms: centos-7 + platforms: + - centos-7 + - centos-8 templates: builder update-cloud-image: true @@ -156,8 +158,7 @@ platforms: - ubuntu-16.04 - - ubuntu-18.04: - disable-job: true + - ubuntu-18.04 templates: mininet-ovs-2.5 update-cloud-image: true @@ -177,8 +178,7 @@ platforms: - ubuntu-16.04 - - ubuntu-18.04: - disable-job: true + - ubuntu-18.04 templates: mininet-ovs-2.6 update-cloud-image: true @@ -198,8 +198,7 @@ platforms: - ubuntu-16.04 - - ubuntu-18.04: - disable-job: true + - ubuntu-18.04 templates: mininet-ovs-2.8 update-cloud-image: true diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 2a87a1f76..0a9cbf91d 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -109,6 +109,19 @@ java-version: 'openjdk11' mvn-settings: 'serviceutils-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: serviceutils-info + jobs: + - gerrit-info-yaml-verify + project: serviceutils + project-name: serviceutils + branch: master + build-node: centos7-builder-2c-1g - project: name: serviceutils-view diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index ed7f35ede..2e46db2a4 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -87,6 +87,19 @@ java-version: 'openjdk11' mvn-settings: 'sfc-settings' mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: sfc-info + jobs: + - gerrit-info-yaml-verify + project: sfc + project-name: sfc + branch: master + build-node: centos7-builder-2c-1g - project: name: sfc-view diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index cbca6396b..7193d27c3 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -63,6 +63,19 @@ branch: 'master' mvn-settings: 'snmp-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: snmp-info + jobs: + - gerrit-info-yaml-verify + project: snmp + project-name: snmp + branch: master + build-node: centos7-builder-2c-1g - project: name: snmp-view diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 358f7ead7..9ad5b64de 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -79,6 +79,19 @@ branch: 'master' mvn-settings: 'snmp4sdn-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: snmp4sdn-info + jobs: + - gerrit-info-yaml-verify + project: snmp4sdn + project-name: snmp4sdn + branch: master + build-node: centos7-builder-2c-1g - project: name: snmp4sdn-view diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index a19648c52..ba2b58e15 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -92,6 +92,19 @@ java-version: 'openjdk11' mvn-settings: 'sxp-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: sxp-info + jobs: + - gerrit-info-yaml-verify + project: sxp + project-name: sxp + branch: master + build-node: centos7-builder-2c-1g - project: name: sxp-view diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index e52de623f..00533d7f8 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -86,6 +86,19 @@ mvn-settings: 'telemetry-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: telemetry-info + jobs: + - gerrit-info-yaml-verify + project: telemetry + project-name: telemetry + branch: master + build-node: centos7-builder-2c-1g - project: name: telemetry-view diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 762559292..ec52b9faf 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -9,7 +9,7 @@ rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd - gerrit-tox-verify: build-timeout: 120 - build-node: centos7-builder-8c-8g + build-node: centos7-builder-4c-16g - gerrit-release-merge - odl-maven-jobs-jdk11 - odl-maven-verify-jobs @@ -37,7 +37,7 @@ rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd - gerrit-tox-verify: build-timeout: 120 - build-node: centos7-builder-8c-8g + build-node: centos7-builder-4c-16g - odl-maven-jobs-jdk11 - odl-maven-verify-jobs @@ -64,7 +64,7 @@ rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd - gerrit-tox-verify: build-timeout: 120 - build-node: centos7-builder-8c-8g + build-node: centos7-builder-4c-16g - odl-maven-jobs - odl-maven-verify-jobs @@ -91,6 +91,19 @@ java-version: 'openjdk11' mvn-settings: 'transportpce-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: transportpce-info + jobs: + - gerrit-info-yaml-verify + project: transportpce + project-name: transportpce + branch: master + build-node: centos7-builder-2c-1g - project: name: transportpce-view diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index d822df341..7d44c4ea5 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -78,6 +78,19 @@ branch: 'master' mvn-settings: 'tsdr-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: tsdr-info + jobs: + - gerrit-info-yaml-verify + project: tsdr + project-name: tsdr + branch: master + build-node: centos7-builder-2c-1g - project: name: tsdr-view diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 8c59a989a..1c3d35077 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -15,10 +15,15 @@ project: 'unimgr' project-name: 'unimgr' branch: 'master' + java-version: 'openjdk11' mvn-settings: 'unimgr-settings' mvn-opts: '-Xmx1024m' - dependencies: 'ovsdb-merge-{stream}' - email-upstream: '[unimgr] [ovsdb]' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + mdsal-merge-{stream} + email-upstream: '[unimgr] [odlparent] [yangtools] [controller] [mdsal]' build-node: centos7-builder-4c-16g # Used by the release job @@ -39,6 +44,7 @@ project: 'unimgr' project-name: 'unimgr' branch: 'stable/magnesium' + java-version: 'openjdk11' mvn-settings: 'unimgr-settings' mvn-opts: '-Xmx1024m' dependencies: 'ovsdb-merge-{stream}' @@ -80,6 +86,7 @@ project: 'unimgr' project-name: 'unimgr' branch: 'master' + java-version: 'openjdk11' mvn-settings: 'unimgr-settings' mvn-opts: '-Xmx1024m' sonarcloud: true @@ -87,6 +94,15 @@ sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' +- project: + name: unimgr-info + jobs: + - gerrit-info-yaml-verify + project: unimgr + project-name: unimgr + branch: master + build-node: centos7-builder-2c-1g + - project: name: unimgr-view views: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 0f12b8a2e..9a93d7571 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -67,6 +67,19 @@ branch: 'master' mvn-settings: 'usc-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: usc-info + jobs: + - gerrit-info-yaml-verify + project: usc + project-name: usc + branch: master + build-node: centos7-builder-2c-1g - project: name: usc-view diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 422729ebb..d02900bba 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -98,6 +98,19 @@ java-version: 'openjdk11' mvn-settings: 'yangtools-settings' mvn-opts: '-Xmx1024m' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + +- project: + name: yangtools-info + jobs: + - gerrit-info-yaml-verify + project: yangtools + project-name: yangtools + branch: master + build-node: centos7-builder-2c-1g - project: name: yangtools-view diff --git a/packer/common-packer b/packer/common-packer index da5d5cf92..a34a25187 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit da5d5cf92fafcdc0f31a76d2955e8ac9c327c100 +Subproject commit a34a25187d428d6f5c9c6a19bb2b63b6c2688320 diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index 149060c53..9bae2959a 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -15,9 +15,6 @@ pre_tasks: - include_role: name=lfit.system-update - roles: - - lfit.mono-install - tasks: - name: Install Cassandra Server block: diff --git a/packer/provision/mininet-ovs-2.8.yaml b/packer/provision/mininet-ovs-2.8.yaml index dbd778465..06dc8c011 100644 --- a/packer/provision/mininet-ovs-2.8.yaml +++ b/packer/provision/mininet-ovs-2.8.yaml @@ -134,6 +134,17 @@ apt: name=vlan state=present become: true + - name: Install CSIT dependencies + apt: + name: + - git-review + - python-chardet + - python-ndg-httpsclient + - python-requests + - python-urllib3 + state: present + become: true + post_tasks: - name: System Reseal script: ../common-packer/provision/system-reseal.sh diff --git a/scripts/.gitignore b/scripts/.gitignore deleted file mode 100644 index c5ec4a4cb..000000000 --- a/scripts/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# Python -__pycache__/ -*.pyc - -# ODL Signer -.sign-artifacts -gpg-signatures diff --git a/tox.ini b/tox.ini index 87e40692f..bf47e3e0e 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs [testenv:jenkins-jobs] deps = - jenkins-job-builder=={env:JJB_VERSION:2.9.1} + jenkins-job-builder=={env:JJB_VERSION:3.5.0} commands = jenkins-jobs {posargs:--help} @@ -32,7 +32,8 @@ basepython = python3 deps = pre-commit commands = pre-commit install --hook-type commit-msg - pre-commit run --all-files + pre-commit run --all-files --show-diff-on-failure + pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_EDITMSG [testenv:prefix] commands = python {toxinidir}/check_prefix.py