Merge "Fix broken bandit gate"

tools/gate/playbooks/osh-bandit.yaml

@@ -6,8 +6,8 @@
       shell: |
         set -xe;
         ./tools/deployment/common/install-packages.sh
-        ./tools/deployment/common/deploy-k8s.sh
-        sudo -H pip3 install yq bandit
+        ./tools/gate/deploy-k8s.sh
+        sudo -H pip3 install --upgrade yq bandit setuptools
       environment:
         zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
       args:

zuul.d/jobs-openstack-helm.yaml

@@ -18,17 +18,6 @@
 # These will move with their playbooks inside the
 # openstack-helm-infra repository
 
-- job:
-    name: openstack-helm-bandit
-    timeout: 3600
-    run: tools/gate/playbooks/osh-bandit.yaml
-    required-projects:
-      - openstack/openstack-helm-infra
-    files:
-      - ^.*\.py\.tpl$
-      - ^.*\.py$
-    nodeset: openstack-helm-single-node
-
 - job:
     name: openstack-helm-chart-deploy
     parent: openstack-helm-infra-functional
@@ -47,6 +36,15 @@
       - openstack/openstack-helm
     nodeset: openstack-helm-single-node
 
+- job:
+    name: openstack-helm-bandit
+    parent: openstack-helm-chart-deploy
+    run: tools/gate/playbooks/osh-bandit.yaml
+    files:
+      - ^.*\.py\.tpl$
+      - ^.*\.py$
+      - ^tools/gate/playbooks/osh-bandit.yaml$
+
 - job:
     name: openstack-helm-keystone-ldap
     parent: openstack-helm-chart-deploy