cloud-infra: Switch engine lint jenkins jobs to tox

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-macros.yaml

diff --git a/jjb/cloud-infra/cloud-infra-macros.yaml b/jjb/cloud-infra/cloud-infra-macros.yaml
index 17a2fb973e08c10695bc350877f1cd30f4915bae..34c6772c313e2919472a144d570c19ea685527c8 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-macros.yaml
+++ b/jjb/cloud-infra/cloud-infra-macros.yaml
@@ -108,21 +108,11 @@
           !include-raw: ./scenario-promote.sh
 
 - builder:
-    name: 'cloud-infra-ansible-lint-macro'
+    name: 'cloud-infra-lint-macro'
     builders:
       - shell:
-          !include-raw: ./scripts/cloud-infra-ansible-lint.sh
-
-- builder:
-    name: 'cloud-infra-yaml-lint-macro'
-    builders:
-      - shell:
-          !include-raw: ./scripts/cloud-infra-yaml-lint.sh
-
-- builder:
-    name: 'cloud-infra-shellcheck-macro'
-    builders:
+          !include-raw: ./wait-for-pkg-manager.sh
       - shell:
-          !include-raw: ./scripts/cloud-infra-shellcheck.sh
+          !include-raw: ./scripts/cloud-infra-lint.sh
 
 # vim: set ts=2 sw=2 expandtab: