From c15e3e1a3af2c797caa1bc408315beb0101ae623 Mon Sep 17 00:00:00 2001 From: Manoel Benedito Neto Date: Tue, 14 Mar 2023 18:38:44 -0300 Subject: [PATCH] Fix lint errors identified by Zuul pylint job This commit fixes lint errors identified by Zuul after stx-integ-pylint job is executed. Test Plan: PASS: stx-integ-pylint job is executed successfully. PASS: Run "yamllint ." command on integ repo base directory. Observe that no lint errors of line-length, truthy, indentation, new-line-at-end-of-file and document-start are listed. PASS: build-pkgs -a -c Closes-Bug: 2011632 Change-Id: I4d8229b5de8c9d88ff2aab6169521ab377b5866c Signed-off-by: Manoel Benedito Neto --- .zuul.yaml | 4 +-- base/libfdt/debian/meta_data.yaml | 1 + base/lighttpd/debian/meta_data.yaml | 1 + .../puppet-etcd-1.12.3/debian/meta_data.yaml | 2 +- .../debian/meta_data.yaml | 2 +- .../debian/meta_data.yaml | 2 +- filesystem/parted/debian/meta_data.yaml | 1 + .../debian/meta_data.yaml | 2 +- grub/grubby/debian/meta_data.yaml | 2 +- kubernetes/cni/plugins/debian/meta_data.yaml | 2 +- .../containerd/centos/files/crictl.yaml | 1 + kubernetes/crictl/debian/files/crictl.yaml | 1 + .../kubernetes-1.21.8/debian/meta_data.yaml | 1 + .../kubernetes-1.22.5/debian/meta_data.yaml | 1 + .../kubernetes-1.23.1/debian/meta_data.yaml | 1 + .../kubernetes-1.24.4/debian/meta_data.yaml | 1 + .../kubernetes-1.25.3/debian/meta_data.yaml | 1 + .../debian/meta_data.yaml | 1 + .../github.com/fsnotify/fsnotify/.travis.yml | 1 + .../vendor/github.com/pkg/errors/.travis.yml | 1 + .../vendor/github.com/pkg/errors/appveyor.yml | 3 +- .../vendor/google.golang.org/grpc/.travis.yml | 29 ++++++++++--------- .../files/vendor/k8s.io/klog/.travis.yml | 1 + networking/lldpd/debian/meta_data.yaml | 1 + networking/net-tools/debian/meta_data.yaml | 1 + python/python-nss/debian/meta_data.yaml | 1 + security/keyrings.alt/debian/meta_data.yaml | 3 +- security/openscap/debian/meta_data.yaml | 2 +- 28 files changed, 45 insertions(+), 25 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index c857b8635..4e34da80c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -52,7 +52,7 @@ postgresql: true devstack_localrc: # LIBS_FROM_GIT: keystone - FORCE: yes + FORCE: yes # yamllint disable-line rule:truthy # A minimal base job that eliminates most OpenStack services # Leave Celiometer, Horizon and Swift in the base since none @@ -125,7 +125,7 @@ postgresql: true devstack_localrc: # LIBS_FROM_GIT: keystone - FORCE: yes + FORCE: yes # yamllint disable-line rule:truthy # And the tox version of the base-min job - job: diff --git a/base/libfdt/debian/meta_data.yaml b/base/libfdt/debian/meta_data.yaml index d6166fbc8..cb2950c55 100644 --- a/base/libfdt/debian/meta_data.yaml +++ b/base/libfdt/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debver: 1.4.4-1 debname: libfdt dl_path: diff --git a/base/lighttpd/debian/meta_data.yaml b/base/lighttpd/debian/meta_data.yaml index 2f7c4f0b8..2162ed374 100644 --- a/base/lighttpd/debian/meta_data.yaml +++ b/base/lighttpd/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debver: 1.4.55-1~bpo10+1 debname: lighttpd dl_path: diff --git a/config/puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml b/config/puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml index 1fd240b78..31d0cb411 100644 --- a/config/puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml +++ b/config/puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml @@ -3,7 +3,7 @@ debname: puppet-module-cristifalcas-etcd debver: 1.12.3-3 dl_path: name: puppet-module-cristifalcas-etcd-1.12.3-3.tar.gz - url: https://salsa.debian.org/openstack-team/puppet/puppet-module-cristifalcas-etcd/-/archive/debian/1.12.3-3/puppet-module-cristifalcas-etcd-debian-1.12.3-3.tar.gz + url: https://salsa.debian.org/openstack-team/puppet/puppet-module-cristifalcas-etcd/-/archive/debian/1.12.3-3/puppet-module-cristifalcas-etcd-debian-1.12.3-3.tar.gz # yamllint disable-line rule:line-length md5sum: 9ca374f32dad83478801a6eb4c1c52dd sha256sum: ce3d08c990c390b3927e9f62a8eb1beff4d49b60da7e997f3a886fc49cf3d911 revision: diff --git a/config/puppet-modules/puppet-rabbitmq-8.5.0/debian/meta_data.yaml b/config/puppet-modules/puppet-rabbitmq-8.5.0/debian/meta_data.yaml index 691465af3..cf3907663 100644 --- a/config/puppet-modules/puppet-rabbitmq-8.5.0/debian/meta_data.yaml +++ b/config/puppet-modules/puppet-rabbitmq-8.5.0/debian/meta_data.yaml @@ -3,7 +3,7 @@ debname: puppet-module-puppetlabs-rabbitmq debver: 8.5.0-6 dl_path: name: puppet-module-puppetlabs-rabbitmq-8.5.0-6.tar.gz - url: https://salsa.debian.org/openstack-team/puppet/puppet-module-puppetlabs-rabbitmq/-/archive/debian/8.5.0-6/puppet-module-puppetlabs-rabbitmq-debian-8.5.0-6.tar.gz + url: https://salsa.debian.org/openstack-team/puppet/puppet-module-puppetlabs-rabbitmq/-/archive/debian/8.5.0-6/puppet-module-puppetlabs-rabbitmq-debian-8.5.0-6.tar.gz # yamllint disable-line rule:line-length md5sum: 0590fe35398a5fd0f1cb96566833228e sha256sum: 5b75fc9c53d44f56637211a0ef160664a0da9a04106722a4e3cfc3b842c65fba revision: diff --git a/config/puppet-modules/puppetlabs-haproxy-2.1.0/debian/meta_data.yaml b/config/puppet-modules/puppetlabs-haproxy-2.1.0/debian/meta_data.yaml index a3573f024..23fa45ee7 100644 --- a/config/puppet-modules/puppetlabs-haproxy-2.1.0/debian/meta_data.yaml +++ b/config/puppet-modules/puppetlabs-haproxy-2.1.0/debian/meta_data.yaml @@ -3,7 +3,7 @@ debname: puppet-module-puppetlabs-haproxy debver: 2.1.0-3 dl_path: name: puppet-module-puppetlabs-haproxy-2.1.0-3.tar.gz - url: https://salsa.debian.org/openstack-team/puppet/puppet-module-puppetlabs-haproxy/-/archive/debian/2.1.0-3/puppet-module-puppetlabs-haproxy-debian-2.1.0-3.tar.gz + url: https://salsa.debian.org/openstack-team/puppet/puppet-module-puppetlabs-haproxy/-/archive/debian/2.1.0-3/puppet-module-puppetlabs-haproxy-debian-2.1.0-3.tar.gz # yamllint disable-line rule:line-length md5sum: 0e523b59292206194b3bacc28bd483e2 sha256sum: 80a7bbe94fbc6ffcdf922232ae0ed43f80aec4815a49370bc96439c56f7f616a revision: diff --git a/filesystem/parted/debian/meta_data.yaml b/filesystem/parted/debian/meta_data.yaml index 6ecd20f84..6ddece222 100644 --- a/filesystem/parted/debian/meta_data.yaml +++ b/filesystem/parted/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debname: parted debver: 3.4-1 dl_path: diff --git a/golang-github-dev/golang-github-vishvananda-netlink/debian/meta_data.yaml b/golang-github-dev/golang-github-vishvananda-netlink/debian/meta_data.yaml index 18d78f726..6d32ce3b3 100644 --- a/golang-github-dev/golang-github-vishvananda-netlink/debian/meta_data.yaml +++ b/golang-github-dev/golang-github-vishvananda-netlink/debian/meta_data.yaml @@ -3,7 +3,7 @@ debname: golang-github-vishvananda-netlink debver: 1.1.0.125.gf243826-4 dl_path: name: golang-github-vishvananda-debian-1.1.0.125.gf243826-4.tar.gz - url: https://salsa.debian.org/go-team/packages/golang-github-vishvananda-netlink/-/archive/debian/1.1.0.125.gf243826-4/golang-github-vishvananda-netlink-debian-1.1.0.125.gf243826-4.tar.gz + url: https://salsa.debian.org/go-team/packages/golang-github-vishvananda-netlink/-/archive/debian/1.1.0.125.gf243826-4/golang-github-vishvananda-netlink-debian-1.1.0.125.gf243826-4.tar.gz # yamllint disable-line rule:line-length md5sum: f6446c199670cdd89690f3366cf18916 sha256sum: 8db9eaf59ab220c5205c97ff1bb38ca76ad7760afdf8778746db318b76515c95 revision: diff --git a/grub/grubby/debian/meta_data.yaml b/grub/grubby/debian/meta_data.yaml index 4342c838b..069a77fac 100644 --- a/grub/grubby/debian/meta_data.yaml +++ b/grub/grubby/debian/meta_data.yaml @@ -8,4 +8,4 @@ dl_path: sha256sum: 1369940637b27f47fb6225168c76e3798f1d9c1ba7f8859b8754324e17415c77 revision: dist: $STX_DIST - PKG_GITREVCOUNT: True + PKG_GITREVCOUNT: true diff --git a/kubernetes/cni/plugins/debian/meta_data.yaml b/kubernetes/cni/plugins/debian/meta_data.yaml index 654dc6cd4..5e27e562d 100644 --- a/kubernetes/cni/plugins/debian/meta_data.yaml +++ b/kubernetes/cni/plugins/debian/meta_data.yaml @@ -3,7 +3,7 @@ debname: golang-github-containernetworking-plugins debver: 1.1.1+ds1-1 dl_path: name: golang-github-containernetworking-plugins-debian-1.1.1+ds1-1.tar.gz - url: https://salsa.debian.org/go-team/packages/golang-github-containernetworking-plugins/-/archive/debian/1.1.1+ds1-1/golang-github-containernetworking-plugins-debian-1.1.1+ds1-1.tar.gz + url: https://salsa.debian.org/go-team/packages/golang-github-containernetworking-plugins/-/archive/debian/1.1.1+ds1-1/golang-github-containernetworking-plugins-debian-1.1.1+ds1-1.tar.gz # yamllint disable-line rule:line-length md5sum: 64cae07a4337f3eae6cc1e1a13ce1af7 sha256sum: cb08260f6b1136de00d62724911d427870ab2473d030e0909f963a36891fd98d revision: diff --git a/kubernetes/containerd/centos/files/crictl.yaml b/kubernetes/containerd/centos/files/crictl.yaml index 4f05c0b27..908ee5325 100644 --- a/kubernetes/containerd/centos/files/crictl.yaml +++ b/kubernetes/containerd/centos/files/crictl.yaml @@ -1,3 +1,4 @@ +--- runtime-endpoint: unix:///var/run/containerd/containerd.sock image-endpoint: unix:///var/run/containerd/containerd.sock debug: false diff --git a/kubernetes/crictl/debian/files/crictl.yaml b/kubernetes/crictl/debian/files/crictl.yaml index 4f05c0b27..908ee5325 100644 --- a/kubernetes/crictl/debian/files/crictl.yaml +++ b/kubernetes/crictl/debian/files/crictl.yaml @@ -1,3 +1,4 @@ +--- runtime-endpoint: unix:///var/run/containerd/containerd.sock image-endpoint: unix:///var/run/containerd/containerd.sock debug: false diff --git a/kubernetes/kubernetes-1.21.8/debian/meta_data.yaml b/kubernetes/kubernetes-1.21.8/debian/meta_data.yaml index 6f8686c39..c319fed5b 100644 --- a/kubernetes/kubernetes-1.21.8/debian/meta_data.yaml +++ b/kubernetes/kubernetes-1.21.8/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debver: 1.21.8 dl_path: name: kubernetes-1.21.8.tar.gz diff --git a/kubernetes/kubernetes-1.22.5/debian/meta_data.yaml b/kubernetes/kubernetes-1.22.5/debian/meta_data.yaml index 425481f89..b16e8e8b3 100644 --- a/kubernetes/kubernetes-1.22.5/debian/meta_data.yaml +++ b/kubernetes/kubernetes-1.22.5/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debver: 1.22.5 dl_path: name: kubernetes-1.22.5.tar.gz diff --git a/kubernetes/kubernetes-1.23.1/debian/meta_data.yaml b/kubernetes/kubernetes-1.23.1/debian/meta_data.yaml index 0ff83f6ea..e1aaf6891 100644 --- a/kubernetes/kubernetes-1.23.1/debian/meta_data.yaml +++ b/kubernetes/kubernetes-1.23.1/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debver: 1.23.1 dl_path: name: kubernetes-1.23.1.tar.gz diff --git a/kubernetes/kubernetes-1.24.4/debian/meta_data.yaml b/kubernetes/kubernetes-1.24.4/debian/meta_data.yaml index e79537a88..62b32b9a2 100644 --- a/kubernetes/kubernetes-1.24.4/debian/meta_data.yaml +++ b/kubernetes/kubernetes-1.24.4/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debver: 1.24.4 dl_path: name: kubernetes-1.24.4.tar.gz diff --git a/kubernetes/kubernetes-1.25.3/debian/meta_data.yaml b/kubernetes/kubernetes-1.25.3/debian/meta_data.yaml index fed0a550a..d6d2f6448 100644 --- a/kubernetes/kubernetes-1.25.3/debian/meta_data.yaml +++ b/kubernetes/kubernetes-1.25.3/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debver: 1.25.3 dl_path: name: kubernetes-1.25.3.tar.gz diff --git a/kubernetes/kubernetes-unversioned/debian/meta_data.yaml b/kubernetes/kubernetes-unversioned/debian/meta_data.yaml index 5ae068bc9..196b0ab8c 100644 --- a/kubernetes/kubernetes-unversioned/debian/meta_data.yaml +++ b/kubernetes/kubernetes-unversioned/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debname: kubernetes-unversioned debver: 1.0-1 dl_path: diff --git a/kubernetes/plugins/isolcpus-device-plugin/files/vendor/github.com/fsnotify/fsnotify/.travis.yml b/kubernetes/plugins/isolcpus-device-plugin/files/vendor/github.com/fsnotify/fsnotify/.travis.yml index 981d1bb81..589936d53 100644 --- a/kubernetes/plugins/isolcpus-device-plugin/files/vendor/github.com/fsnotify/fsnotify/.travis.yml +++ b/kubernetes/plugins/isolcpus-device-plugin/files/vendor/github.com/fsnotify/fsnotify/.travis.yml @@ -1,3 +1,4 @@ +--- sudo: false language: go diff --git a/kubernetes/plugins/isolcpus-device-plugin/files/vendor/github.com/pkg/errors/.travis.yml b/kubernetes/plugins/isolcpus-device-plugin/files/vendor/github.com/pkg/errors/.travis.yml index d4b92663b..0dbf0bedf 100644 --- a/kubernetes/plugins/isolcpus-device-plugin/files/vendor/github.com/pkg/errors/.travis.yml +++ b/kubernetes/plugins/isolcpus-device-plugin/files/vendor/github.com/pkg/errors/.travis.yml @@ -1,3 +1,4 @@ +--- language: go go_import_path: github.com/pkg/errors go: diff --git a/kubernetes/plugins/isolcpus-device-plugin/files/vendor/github.com/pkg/errors/appveyor.yml b/kubernetes/plugins/isolcpus-device-plugin/files/vendor/github.com/pkg/errors/appveyor.yml index a932eade0..06568d3fc 100644 --- a/kubernetes/plugins/isolcpus-device-plugin/files/vendor/github.com/pkg/errors/appveyor.yml +++ b/kubernetes/plugins/isolcpus-device-plugin/files/vendor/github.com/pkg/errors/appveyor.yml @@ -1,3 +1,4 @@ +--- version: build-{build}.{branch} clone_folder: C:\gopath\src\github.com\pkg\errors @@ -29,4 +30,4 @@ test_script: #artifacts: # - path: '%GOPATH%\bin\*.exe' -deploy: off +deploy: off # yamllint disable-line rule:truthy diff --git a/kubernetes/plugins/isolcpus-device-plugin/files/vendor/google.golang.org/grpc/.travis.yml b/kubernetes/plugins/isolcpus-device-plugin/files/vendor/google.golang.org/grpc/.travis.yml index 024408e64..b43c39e57 100644 --- a/kubernetes/plugins/isolcpus-device-plugin/files/vendor/google.golang.org/grpc/.travis.yml +++ b/kubernetes/plugins/isolcpus-device-plugin/files/vendor/google.golang.org/grpc/.travis.yml @@ -1,21 +1,22 @@ +--- language: go matrix: include: - - go: 1.12.x - env: VET=1 GO111MODULE=on - - go: 1.12.x - env: RACE=1 GO111MODULE=on - - go: 1.12.x - env: RUN386=1 - - go: 1.12.x - env: GRPC_GO_RETRY=on - - go: 1.11.x - env: GO111MODULE=on - - go: 1.10.x - - go: 1.9.x - - go: 1.9.x - env: GAE=1 + - go: 1.12.x + env: VET=1 GO111MODULE=on + - go: 1.12.x + env: RACE=1 GO111MODULE=on + - go: 1.12.x + env: RUN386=1 + - go: 1.12.x + env: GRPC_GO_RETRY=on + - go: 1.11.x + env: GO111MODULE=on + - go: 1.10.x + - go: 1.9.x + - go: 1.9.x + env: GAE=1 go_import_path: google.golang.org/grpc diff --git a/kubernetes/plugins/isolcpus-device-plugin/files/vendor/k8s.io/klog/.travis.yml b/kubernetes/plugins/isolcpus-device-plugin/files/vendor/k8s.io/klog/.travis.yml index 5677664c2..b0f4a19fc 100644 --- a/kubernetes/plugins/isolcpus-device-plugin/files/vendor/k8s.io/klog/.travis.yml +++ b/kubernetes/plugins/isolcpus-device-plugin/files/vendor/k8s.io/klog/.travis.yml @@ -1,3 +1,4 @@ +--- language: go go_import_path: k8s.io/klog dist: xenial diff --git a/networking/lldpd/debian/meta_data.yaml b/networking/lldpd/debian/meta_data.yaml index 18ef6932d..89321858c 100644 --- a/networking/lldpd/debian/meta_data.yaml +++ b/networking/lldpd/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debver: 1.0.11-1 dl_path: name: lldpd-debian-1.0.11-1.tar.gz diff --git a/networking/net-tools/debian/meta_data.yaml b/networking/net-tools/debian/meta_data.yaml index 3155c7a71..aee7ff5a2 100644 --- a/networking/net-tools/debian/meta_data.yaml +++ b/networking/net-tools/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debver: 1.60+git20181103.0eebece-1 archive: https://snapshot.debian.org/archive/debian/20210529T084123Z/pool/main/n/net-tools revision: diff --git a/python/python-nss/debian/meta_data.yaml b/python/python-nss/debian/meta_data.yaml index 680d23bb4..f3b116daf 100644 --- a/python/python-nss/debian/meta_data.yaml +++ b/python/python-nss/debian/meta_data.yaml @@ -1,3 +1,4 @@ +--- debver: 1.0.1-1 debname: python-nss dl_path: diff --git a/security/keyrings.alt/debian/meta_data.yaml b/security/keyrings.alt/debian/meta_data.yaml index 263b643cc..7d12bb307 100644 --- a/security/keyrings.alt/debian/meta_data.yaml +++ b/security/keyrings.alt/debian/meta_data.yaml @@ -1,4 +1,5 @@ -debver: 4.0.2-1 +--- +ver: 4.0.2-1 dl_path: name: keyrings.alt-debian-4.0.2-1.tar.gz url: https://salsa.debian.org/python-team/packages/keyrings.alt/-/archive/debian/4.0.2-1/keyrings.alt-debian-4.0.2-1.tar.gz diff --git a/security/openscap/debian/meta_data.yaml b/security/openscap/debian/meta_data.yaml index 08518dc51..d7c93bd1a 100644 --- a/security/openscap/debian/meta_data.yaml +++ b/security/openscap/debian/meta_data.yaml @@ -7,4 +7,4 @@ dl_path: sha256sum: 40634f2e27a542b112d2e3b374ebbef7e56af18a3d8ae78da2462ab0b1e4e6b7 revision: dist: $STX_DIST - PKG_GITREVCOUNT: True + PKG_GITREVCOUNT: true