From 426951af18515bac82b3632caf2949121ae8082e Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 1 Aug 2023 13:48:59 -0700 Subject: [PATCH] Fix linting error and temp stop running openshift job This fixes an error in the new release of pycodestyle. It also temporarily stops running the OpenShift test job since that job requires fedora 36 whose package archive has just been removed. Change-Id: I1eee3c26eb79bf866cd5775aa3ebf8d1d8d4ba33 --- .zuul.yaml | 4 ++-- nodepool/driver/openstack/adapter.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 154757d18..6bfea29f3 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -285,7 +285,7 @@ - nodepool-nox-py311 - nodepool-functional-container-openstack-release - nodepool-functional-k8s - - nodepool-functional-openshift + # - nodepool-functional-openshift - zuul-quick-start: requires: zuul-container-image dependencies: nodepool-build-image @@ -299,7 +299,7 @@ nodeset: ubuntu-focal - nodepool-nox-py311 - nodepool-functional-k8s - - nodepool-functional-openshift + # - nodepool-functional-openshift - zuul-quick-start: requires: zuul-container-image dependencies: nodepool-upload-image diff --git a/nodepool/driver/openstack/adapter.py b/nodepool/driver/openstack/adapter.py index dbb287744..29b01220b 100644 --- a/nodepool/driver/openstack/adapter.py +++ b/nodepool/driver/openstack/adapter.py @@ -995,7 +995,7 @@ class OpenStackAdapter(statemachine.Adapter): # some openstacksdk's return True if any port was # cleaned, rather than the count. Just set it to 1 to # indicate something happened. - if type(did_clean) == bool: + if type(did_clean) is bool: did_clean = 1 if self._statsd: key = ('nodepool.provider.%s.leaked.floatingips'