diff --git a/tox.ini b/tox.ini index c11a9e66..3f59d1c9 100644 --- a/tox.ini +++ b/tox.ini @@ -18,18 +18,9 @@ commands = commands = pytest magnum_cluster_api/tests/functional/ -[testenv:sync-charts] -skipsdist = True -deps = - chart-vendor -commands = - chart-vendor --charts-root magnum_cluster_api/charts - [testenv:linters] skipsdist = True deps = - {[testenv:sync-charts]deps} pre-commit commands = pre-commit run --all-files --show-diff-on-failure - chart-vendor --check --charts-root magnum_cluster_api/charts diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index ceac5e2e..edb5b0bb 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1,9 +1,12 @@ +- job: + name: magnum-cluster-api-chart-vendor + parent: chart-vendor + vars: + chart_vendor_charts_root: "magnum_cluster_api/charts" + - job: name: magnum-cluster-api-linters parent: tox-linters - pre-run: zuul.d/playbooks/linters/pre.yml - required-projects: - - name: vexxhost/chart-vendor - job: name: magnum-cluster-api-unit diff --git a/zuul.d/playbooks/linters/pre.yml b/zuul.d/playbooks/linters/pre.yml deleted file mode 100644 index bb407944..00000000 --- a/zuul.d/playbooks/linters/pre.yml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2024 VEXXHOST, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -- hosts: all - roles: - - role: ensure-helm - helm_version: 3.13.3 - tasks: - - name: Install patchutils - become: true - ansible.builtin.package: - name: patchutils - state: present diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index e538d871..c05ba3ac 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -1,6 +1,7 @@ - project: check: jobs: + - magnum-cluster-api-chart-vendor - magnum-cluster-api-linters - magnum-cluster-api-unit - magnum-cluster-api-functional