diff --git a/noxfile.py b/noxfile.py index b1c9424..04fe980 100644 --- a/noxfile.py +++ b/noxfile.py @@ -5,8 +5,6 @@ nox.options.reuse_existing_virtualenvs = True YAML_PATHS = [ "./zuul.d/", - "./playbooks/", - "./roles/", ] PYTHON_PATHS = [ diff --git a/playbooks/hadolint/pre.yaml b/playbooks/hadolint/pre.yaml deleted file mode 100644 index 189ec87..0000000 --- a/playbooks/hadolint/pre.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- hosts: all - roles: - - ensure-hadolint diff --git a/playbooks/hadolint/run.yaml b/playbooks/hadolint/run.yaml deleted file mode 100644 index a5c3649..0000000 --- a/playbooks/hadolint/run.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- hosts: all - roles: - - hadolint diff --git a/roles/ensure-hadolint/defaults/main.yaml b/roles/ensure-hadolint/defaults/main.yaml deleted file mode 100644 index f0ff941..0000000 --- a/roles/ensure-hadolint/defaults/main.yaml +++ /dev/null @@ -1 +0,0 @@ -hadolint_version: "2.12.0" diff --git a/roles/ensure-hadolint/tasks/main.yaml b/roles/ensure-hadolint/tasks/main.yaml deleted file mode 100644 index abb5784..0000000 --- a/roles/ensure-hadolint/tasks/main.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- name: Download Hadolint - ansible.builtin.get_url: - url: "https://github.com/hadolint/hadolint/releases/download/v{{ hadolint_version }}/hadolint-Linux-x86_64" - dest: /tmp/hadolint - -- name: Install Hadolint - become: true - ansible.builtin.copy: - remote_src: true - src: /tmp/hadolint - dest: /usr/local/bin/hadolint - mode: "0755" diff --git a/roles/hadolint/defaults/main.yaml b/roles/hadolint/defaults/main.yaml deleted file mode 100644 index fee72f1..0000000 --- a/roles/hadolint/defaults/main.yaml +++ /dev/null @@ -1,3 +0,0 @@ -zuul_work_dir: "{{ zuul.project.src_dir }}" -dockerfiles: - - Dockerfile diff --git a/roles/hadolint/tasks/main.yaml b/roles/hadolint/tasks/main.yaml deleted file mode 100644 index 6fadf8c..0000000 --- a/roles/hadolint/tasks/main.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- name: Lint Dockerfile with Hadolint - ansible.builtin.command: >- - hadolint {{ item }} - args: - chdir: "{{ zuul_work_dir }}" - changed_when: false - loop: "{{ dockerfiles }}" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 9fd0977..2826742 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -21,23 +21,3 @@ - name: container_registry_credentials secret: nebulous-container-registry-credentials pass-to-parent: true - -- job: - name: nebulous-hadolint - description: Run Hadolint on Dockerfile(s). - pre-run: playbooks/hadolint/pre.yaml - run: playbooks/hadolint/run.yaml - -- job: - name: nebulous-helm-lint - parent: helm-lint - description: Run helm lint on Helm charts. - vars: - helm_version: &helm_version "3.12.0" - -- job: - name: nebulous-apply-helm-charts - parent: apply-helm-charts - description: Deploy a Kubernetes cluster and apply charts. - vars: - helm_version: *helm_version