From 16676b5b63b3b1d8674a4027abd45b6fb7f830ed Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Mon, 22 Jun 2020 12:31:25 -0500
Subject: [PATCH] Remove duplicate lint job entry and script

osh-infra currently has a duplicate linter playbook that is not
being used, since the other is used for both osh and osh-infra.
This change removes the duplicate entry and playbook.

Change-Id: If7040243a45f2166973dc5f0c8cd793431916942
---
 {zuul.d/playbooks => playbooks}/lint.yml |  0
 playbooks/zuul-linter.yaml               | 36 ------------------------
 zuul.d/jobs.yaml                         |  7 +----
 3 files changed, 1 insertion(+), 42 deletions(-)
 rename {zuul.d/playbooks => playbooks}/lint.yml (100%)
 delete mode 100644 playbooks/zuul-linter.yaml

diff --git a/zuul.d/playbooks/lint.yml b/playbooks/lint.yml
similarity index 100%
rename from zuul.d/playbooks/lint.yml
rename to playbooks/lint.yml
diff --git a/playbooks/zuul-linter.yaml b/playbooks/zuul-linter.yaml
deleted file mode 100644
index 8c6bee088..000000000
--- a/playbooks/zuul-linter.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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: primary
-  tasks:
-    - name: Execute a Whitespace Linter check
-      command: find . -not -path "*/\.*" -not -path "*/doc/build/*" -not -name "*.tgz" -type f -exec egrep -l " +$" {} \;
-      register: result
-      failed_when: result.stdout != ""
-
-    - name: Check if yamllint.conf exists
-      stat:
-        path: yamllint.conf
-      register: yamllintconf
-
-    - name: Install jq
-      apt:
-        pkg:
-          - jq
-      become: yes
-      when: yamllintconf.stat.exists == True
-
-    - name: Execute yamllint check for values* yaml files
-      command: tox -e lint
-      when: yamllintconf.stat.exists == True
-...
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index b9355f523..7940efdac 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -15,7 +15,7 @@
 
 - job:
     name: openstack-helm-lint
-    run: zuul.d/playbooks/lint.yml
+    run: playbooks/lint.yml
     nodeset: ubuntu-bionic
     irrelevant-files:
       - ^.*\.rst$
@@ -29,11 +29,6 @@
       - ^doc/.*$
       - ^releasenotes/.*$
 
-- job:
-    name: openstack-helm-infra-linter
-    run: playbooks/zuul-linter.yaml
-    nodeset: openstack-helm-single-node
-
 - job:
     name: openstack-helm-infra-bandit
     run: playbooks/osh-infra-bandit.yaml