Merge "CI: Update flake8 pre-commit to come from GitHub"
authorRobert Varga <nite@hq.sk>
Fri, 3 Mar 2023 15:51:46 +0000 (15:51 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 3 Mar 2023 15:51:46 +0000 (15:51 +0000)
39 files changed:
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-helm-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-helm-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg
jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos8-robot-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/cloud.cfg
jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-2c-1g.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg
jjb/autorelease/validate-autorelease-argon.yaml [new file with mode: 0644]
jjb/autorelease/validate-autorelease-chlorine.yaml
jjb/defaults.yaml
jjb/integration/integration-templates.yaml
jjb/lf-infra/lf-infra-jobs.yaml
jjb/mdsal/mdsal.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/yangtools/yangtools.yaml
scripts/bump_mri_versions/main.py
tox.ini

index 04e4ed659df54c0a8c42670d0931d2f6a0fdb11c..62af085c4c9f6d45354540a095ad20ea365b54c7 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-1g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230301-060101.869
 HARDWARE_ID=v3-standard-2
index 4f863eab5ab4788c3ad9020ed7e0fec418ae0136..3d342cd5496e0e94596d7dd3dca1d10c1f4d911d 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-2g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230301-060101.869
 HARDWARE_ID=v3-standard-2
index 06dc308ba0c13f7d90fd95ae95f652ce7febc205..da9e3db33eadc8da13caacfdd59f69d8045d844d 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230301-060101.869
 HARDWARE_ID=v3-standard-2
index 9fb822114b458bbba16c919990c4db5ff79ce33b..4ed8f46471bbbbe862946ecd0d6ed3cd5146af94 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-16g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230301-060101.869
 HARDWARE_ID=v3-standard-4
index 6f8f731815c597422cb2ba6c4cd43d72f824684f..fd6ecbd22afd830268fb145b06f617c71e7e265a 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230301-060101.869
 HARDWARE_ID=v3-standard-4
index 9870390286c50d289daede37866d0340325c8057..782bade473eafacfab2aef28d5c2d8b28f5caa59 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-8c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230301-060101.869
 HARDWARE_ID=v3-standard-8
index 19e24a889bf268aff32d17b5f446512708bb2ba0..a60f20a20fbaac4fe01c116845a34f4a825e6d28 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-1c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221201-220105.396
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230301-220107.956
 HARDWARE_ID=v3-standard-2
index a8cf5bfe2671ad8f2d35a1c1decd8fd08e25e49a..663740aef1d4f271f75fd273d114977787f3d327 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-2c-2g
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221201-220105.396
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230301-220107.956
 HARDWARE_ID=v3-standard-2
index 7dd93b5d59f50c78cd29bab592baab983b4ebdd0..b7145d6adb889de11d17ce08299e248b2553b6b7 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-2c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221201-220105.396
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230301-220107.956
 HARDWARE_ID=v3-standard-2
index 511b39405a884675cfb9630b11d523d18770a506..67baf3eed41d1fa5b1df2af9c8fd251b5ac676be 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-4c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221201-220105.396
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230301-220107.956
 HARDWARE_ID=v3-standard-4
index 45b3ae3ea5d6d1ff85e466f13a339feb0c1eeae5..a491de438444fa1480fa54fd038857a499a01454 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-helm-2c-2g
-IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20221101-000135.064
+IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20230301-000133.034
 HARDWARE_ID=v3-standard-2
index 1aa0fcf1c1a76b3d7cdd037fa412d1143d7f20d9..5acc5b7ccc45fdd14db018f07b9e4e4ec8496a6f 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-helm-4c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20221101-000135.064
+IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20230301-000133.034
 HARDWARE_ID=v3-standard-4
index fbee230d732287933b8c713e42457f364b1691e8..eaa6d6adbd249104ab26f83d72ce33e0691d828b 100644 (file)
@@ -1,4 +1,4 @@
 LABELS=centos7-robot-2c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221201-220143.533
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20230301-220131.480
 HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=16
index d414f0ea3e60c1954ea05c9bd1ba93f0bc15b6f1..45dc7ebbc3503fbbe8b579539884d8729015efe5 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-1g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230301-160121.204
 HARDWARE_ID=v3-standard-2
index 3967fcdd881b273136db8fd6db9fc8f481d40538..2a81d714758056754ab1783ac68107125cb2b08f 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-2g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230301-160121.204
 HARDWARE_ID=v3-standard-2
index ad4bad61b84d1506e10768b6ba8a1831adac025e..4badc51595960ad229f832cb05520f6c2b98b1a9 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-8g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230301-160121.204
 HARDWARE_ID=v3-standard-2
index 24fc32d71c5c2a7f6e1376737e7d8229caa512b5..18c04c4bbdfe1cb8fc8b319e71f78571d5b44b85 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-4c-16g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230301-160121.204
 HARDWARE_ID=v3-standard-4
index c2453bc454a4078f314f0e01fa1531dad023f506..f8ee30ec49278ec7998d9f8f3347e436efe12458 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-4c-4g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230301-160121.204
 HARDWARE_ID=v3-standard-4
index c0dc96faa452b4299c07bd91e3d012ab1c37c674..240b15a2d25666cd875ee618142303ff004cc4ce 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-8c-8g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230301-160121.204
 HARDWARE_ID=v3-standard-8
index 3c48990728cc89ae5a10355d488b5375efbb01ff..0ae47ce2e613d7bd2c2db916986f32dc2621f8d1 100644 (file)
@@ -1,4 +1,4 @@
 LABELS=centos8-robot-2c-8g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - robot - x86_64 - 20220811-231817.668
+IMAGE_NAME=ZZCI - CentOS Stream 8 - robot - x86_64 - 20230301-010147.625
 HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=16
index d3eca94995d2de457c3d8fc7abec4a494ed7125b..b87f80538f50f4852066b78b4d4685b3de315bd0 100644 (file)
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20221016-222911.194
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230301-060101.869
 AVAILABILITY_ZONE=nova
 HARDWARE_ID=v3-standard-2
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
index 1492316bb129214a29dd6a86c6a9ad5cab882679..ac1987a6dcdc660bb08ac7166987a2aef4205fc2 100644 (file)
@@ -1,4 +1,4 @@
 LABELS=queue-disttest-2c-1g
-IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221201-220143.533
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20230301-220131.480
 HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=1
index dd8a9de82a6bd230ff1b461efe680dbe767bfb55..4c7c42b97cd328d2e7a4abbffde2131ddca00219 100644 (file)
@@ -1,5 +1,5 @@
 LABELS=queue-intque-2c-1g
-IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221201-220143.533
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20230301-220131.480
 HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=1
 NUM_EXECUTORS=4
index 58e5ce7b87613b57f24c8377b19a03c816fa31d4..2e103ce86f9e552f4e1fe2e029e8f2291df72e72 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=ubuntu1804-docker-2c-2g
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230101-040125.332
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230301-040106.351
 HARDWARE_ID=v3-standard-2
index 410eb90d758b0ff3957406e1627f46b060830944..e9d81969b94aceb8395c0e70c249d69a267e19be 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=ubuntu1804-docker-4c-4g
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230101-040125.332
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230301-040106.351
 HARDWARE_ID=v3-standard-4
index b3e061387136d123c90045dad90fd2d96eb47330..28cb9d7193ca5010854fd0d48f2e6912aa696cd6 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20221201-140107.142
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20230301-140059.950
 LABELS=ubuntu1804-helm-2c-1g
 HARDWARE_ID=v3-standard-4
index 87d82e39277cfebec8396e50b856a248bfe65a53..5173cee7b9560178e2ff267263406aff176f9fa5 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20221201-140107.142
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20230301-140059.950
 LABELS=ubuntu1804-helm-4c-4g
 HARDWARE_ID=v3-standard-4
index 3335e3ec9eaa5345978513a677ab06bd9bf571fd..d5ec5e1adefa9680ec9fc4c86ad10026d6078905 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=ubuntu1804-mininet-ovs-28-1c-4g
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20221201-180114.186
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230301-180106.402
 HARDWARE_ID=v3-standard-2
diff --git a/jjb/autorelease/validate-autorelease-argon.yaml b/jjb/autorelease/validate-autorelease-argon.yaml
new file mode 100644 (file)
index 0000000..78a5622
--- /dev/null
@@ -0,0 +1,23 @@
+---
+# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
+- project:
+    name: autorelease-validate-argon
+    jobs:
+      - "{project-name}-validate-autorelease-{stream}"
+    stream: argon
+    branch: master
+    project-name:
+      - daexim:
+          project: daexim
+      - integration-distribution:
+          project: integration/distribution
+      - jsonrpc:
+          project: jsonrpc
+      - lispflowmapping:
+          project: lispflowmapping
+      - openflowplugin:
+          project: openflowplugin
+      - ovsdb:
+          project: ovsdb
+      - serviceutils:
+          project: serviceutils
index cd7acaf48e6622b2cf4fbfba48da9161e62f6d1d..b20f44d38e3f5e2c723988c67c1046acafa23b27 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - "{project-name}-validate-autorelease-{stream}"
     stream: chlorine
-    branch: master
+    branch: stable/chlorine
     project-name:
       - daexim:
           project: daexim
index 2f5b1d0f3dcc7d033a455b66e99f978839199a65..6bda0614e3214cc15a32595d73087a6922d4f4d6 100644 (file)
     # CSIT configuration
     odl_system_count: 1
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560"
+    odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20230301-160121.204"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"
-    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20221016-125752.520"
+    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20230301-230109.257"
     openstack_system2_count: 0
     openstack_system2_flavor: "v3-standard-2"
-    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20221016-125752.520"
+    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20230301-230109.257"
     tools_system_count: 1
     tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20221201-180114.186"
-    openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20221016-222956.928"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20230301-180106.402"
+    openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20221101-010107.368"
     openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20221101-000109.537"
 
     # Default Robot framework options
index a82f5f4ad2551b34be5e1d25f03b573ddffeef56..cd36f86eeb6d0851fbf6373d953fb925354111d1 100644 (file)
 
     docker_system_count: "1"
     docker_system_flavor: "v3-standard-2"
-    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20221201-220105.396"
+    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20230301-220107.956"
 
     #####################
     # Job Configuration #
index 3b7cb243351f75ce789967c4040b03351dabb94e..43e32cfea71fa4f7ad960aa059bb26e96f8a1aff 100644 (file)
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
+- project:
+    name: lf-infra-gerrit_to_platform
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-infra-gerrit_to_platform
+    project: releng/gerrit_to_platform
+    build-node: centos8-builder-2c-1g
+    stream: any
+    branch: "*"
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: lf-releng
+
 - project:
     name: lf-infra-global-jjb
     jobs:
     jobs:
       - lf-pipelines-verify
 
+- project:
+    name: lf-infra-python-one-password
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-infra-python-one-password
+    project: releng/python-one-password
+    build-node: centos8-builder-2c-2g
+    stream: any
+    branch: "*"
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: lf-releng
+
 - project:
     name: lf-infra-view
     views:
index 95d5c100e440e60dbcf4355f5d724b9b7bd51658..d4c8baac57ee6872bab76aff8c4fea401701f2a0 100644 (file)
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
+- project:
+    name: mdsal-11.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-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    project: mdsal
+    project-name: mdsal
+    branch: 11.0.x
+    stream: 11.0.x
+
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-settings: "mdsal-settings"
+    build-timeout: 60
+
+    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-10.0.x
     jobs:
index 9dd6e30f5dccd5f0bdae8e430b787d34380fbfe2..050810f235136f64554086dc16894bcbb636888a 100644 (file)
@@ -25,7 +25,7 @@
           scope: "only"
 
     # no mininet required
-    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230101-040125.332"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230301-040106.351"
 
     # Features to install
     install-features: "odl-netconf-callhome-ssh,odl-restconf"
index 7961141c6c1b810d1a50ebaffcd50d56e36126df..fa4e1c420f03a7e7ba3fd94fccb960ecede64bcd 100644 (file)
@@ -28,7 +28,7 @@
       - all:
           scope: "all"
 
-    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230101-040125.332"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230301-040106.351"
 
     # Features to install
     install-features: >
index 9427a2f7d850bef8f50792a7d111ab5c3ba7642a..45307fef587f219aef514eab9a4c8d37bd84f824 100644 (file)
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
+- project:
+    name: yangtools-10.0.x
+    jobs:
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    project: yangtools
+    project-name: yangtools
+    branch: 10.0.x
+    stream: 10.0.x
+
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-settings: "yangtools-settings"
+
+    dependencies: ""
+    email-upstream: "[yangtools]"
+    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: 1271cf710cc09d
+
 - project:
     name: yangtools-9.0.x
     jobs:
index b6ee7ee1f81d5384c44e4b1af43817d5a8d6870c..bc69c66cc52e1d3c0f684376f36580231b58b008 100644 (file)
@@ -13,9 +13,9 @@ from bs4 import BeautifulSoup
 from lxml import etree
 
 
-def get_version_for_artifact(group_id_elem, artifact_id_elem):
+def get_version_for_artifact(group_id, artifact_id):
     versions_list = []
-    url = f'https://repo1.maven.org/maven2/org/opendaylight/{group_id_elem}/{artifact_id_elem}/'
+    url = f'https://repo1.maven.org/maven2/org/opendaylight/{group_id}/{artifact_id}/'
     response = requests.get(url).content
     soup = BeautifulSoup(response, 'html.parser')
     try:
@@ -35,61 +35,60 @@ def get_version_for_artifact(group_id_elem, artifact_id_elem):
 
 # get all xml files
 for path in Path(python_lib.bumping_dir).rglob('*.xml'):
-    if ("pom.xml" or "feature.xml" in str(path)):
-        if "test/resources" not in str(path):
-            tree = etree.parse(path)
-            root = tree.getroot()
-            # update major and minor artifacts versions
-            if "pom.xml" in str(path):
-                prefix = "{" + root.nsmap[None] + "}"
-                all_elements = tree.findall(
-                    f'.//{prefix}parent') + tree.findall(f'.//{prefix}dependency')
-                for element in all_elements:
-                    group_id_elem = (element.find(f'{prefix}groupId'))
-                    artifact_id_elem = (element.find(f'{prefix}artifactId'))
-                    version = (element.find(f'{prefix}version'))
-                    try:
-                        if "org.opendaylight" in group_id_elem.text and version is not None:
-                            # skip artifacts containing items in skipped list
-                            skipped = ["${project.version}",
-                                    "SNAPSHOT", "@project.version@"]
-                            if not any(x in version.text for x in skipped):
-                                new_version = get_version_for_artifact(
-                                    group_id_elem.text.split(".")[2], artifact_id_elem.text)
-                                if python_lib.check_minor_version(version, new_version):
-                                    print(python_lib.log_artifact(
-                                        path, group_id_elem, artifact_id_elem, version.text, new_version))
-                                    version.text = new_version
-                                    tree.write(path, encoding="UTF-8", pretty_print=True,
-                                            doctype='<?xml version="1.0" encoding="UTF-8"?>')
-                    except AttributeError:
-                        pass
-
-        # update feature versions
-        if "feature.xml" in str(path):
-            prefix = "{" + root.nsmap[None] + "}"
-            all_featuress = tree.findall(f'.//{prefix}feature')
-
-            # feature versions add +1
-            for feature in all_featuress:
-                try:
-                    if feature.attrib["version"] and feature.attrib["version"] != "${project.version}":
-                        current_version = feature.attrib["version"]
-                        # workaround for float feature versions
-                        nums = current_version[1:-1].split(',')
-                        if "." in nums[0]:
-                            nums[0] = str(round((float(nums[0]) + 0.01), 2))
-                        else:
-                            nums[0], nums[1] = str(
-                                int(nums[0]) + 1), str(int(nums[1])+1)
-                        result = '[' + ','.join(nums) + ')'
-                        feature.attrib["version"] = result
-                        print(python_lib.log_artifact(
-                            path=path, version=current_version, new_version=result))
-                        standalone = ''
-                        if tree.docinfo.standalone:
-                            standalone = ' standalone="yes"'
-                        tree.write(path, encoding="UTF-8", pretty_print=True,
-                                   doctype=f'<?xml version="1.0" encoding="UTF-8"{standalone}?>')
-                except KeyError:
-                    pass
+    if "test/resources" in str(path):
+        continue
+    tree = etree.parse(path)
+    root = tree.getroot()
+    # update major and minor artifacts versions
+    if "pom.xml" in str(path):
+        prefix = "{" + root.nsmap[None] + "}"
+        # line above can trigger a 'KeyError: None' outside pom.xml and feature.xml files.
+        all_elements = tree.findall(
+            f'.//{prefix}parent') + tree.findall(f'.//{prefix}dependency')
+        for element in all_elements:
+            group_id_elem = (element.find(f'{prefix}groupId'))
+            artifact_id_elem = (element.find(f'{prefix}artifactId'))
+            version = (element.find(f'{prefix}version'))
+            try:
+                if "org.opendaylight" in group_id_elem.text and version is not None:
+                    # skip artifacts containing items in skipped list
+                    skipped = ["${project.version}", "SNAPSHOT", "@project.version@"]
+                    if not any(x in version.text for x in skipped):
+                        new_version = get_version_for_artifact(
+                            group_id_elem.text.split(".")[2], artifact_id_elem.text)
+                        if python_lib.check_minor_version(version, new_version):
+                            print(python_lib.log_artifact(
+                                path, group_id_elem, artifact_id_elem, version.text, new_version))
+                            version.text = new_version
+                            tree.write(path, encoding="UTF-8", pretty_print=True,
+                                    doctype='<?xml version="1.0" encoding="UTF-8"?>')
+            except AttributeError:
+                pass
+    # update feature versions
+    if "feature.xml" in str(path):
+        prefix = "{" + root.nsmap[None] + "}"
+        # line above can trigger a 'KeyError: None' outside pom.xml and feature.xml files.
+        all_features = tree.findall(f'.//{prefix}feature')
+        # feature versions add +1
+        for feature in all_features:
+            try:
+                if feature.attrib["version"] and feature.attrib["version"] != "${project.version}":
+                    current_version = feature.attrib["version"]
+                    # workaround for float feature versions
+                    nums = current_version[1:-1].split(',')
+                    if "." in nums[0]:
+                        nums[0] = str(round((float(nums[0]) + 0.01), 2))
+                    else:
+                        nums[0] = str(int(nums[0]) + 1)
+                        nums[1] = str(int(nums[1]) + 1)
+                    result = '[' + ','.join(nums) + ')'
+                    feature.attrib["version"] = result
+                    print(python_lib.log_artifact(
+                        path=path, version=current_version, new_version=result))
+                    standalone = ''
+                    if tree.docinfo.standalone:
+                        standalone = ' standalone="yes"'
+                    tree.write(path, encoding="UTF-8", pretty_print=True,
+                               doctype=f'<?xml version="1.0" encoding="UTF-8"{standalone}?>')
+            except KeyError:
+                pass
diff --git a/tox.ini b/tox.ini
index 6926c2677b4d46d9c9bf56da91829f13d26aaed8..d2b17739bc08e8780546926ddff0b61fb16c3a52 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = docs,docs-linkcheck,jjb-version,prefix,robot,
+envlist = docs,docs-linkcheck,jjb-version,prefix,robot,pylint
 #    pre-commit
 skipsdist = true
 
@@ -74,3 +74,13 @@ commands =
         || (echo "checkbashisms command not found - please install it (e.g. sudo apt-get install devscripts | \
         yum install devscripts-minimal )" >&2 && exit 1)'
     find . -not -path '*/\.*' -name *.sh -exec checkbashisms -f  \{\} +
+
+[testenv:pylint]
+basepython = python3
+deps = pylint>=2.6.0
+whitelist_externals = find
+commands =
+# .tox folder and submodules directories global-jjb/ & packer/common-packer/ must be excluded since they are not maintained here
+    find . -name *.py -not -path "./.tox/*" -not -path "./global-jjb/*" -not -path "./packer/common-packer/*" -exec \
+    pylint --fail-under=6.50 --max-line-length=120 --disable=missing-docstring --disable=fixme --disable=duplicate-code \{\} +
+