linter: fix ansible-lint warnings (#1586)

* linter: fix ansible-lint warnings * Update linter.yml
adoptium · Oct 2, 2020 · 91ca514 · 91ca514
1 parent 030b191
commit 91ca514
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -14,27 +14,19 @@ on:
 
 
 jobs:
-  yamlint:
-    name: Yamlint
+  yamllint:
+    name: Yamllint
     runs-on: ubuntu-latest
     steps:
 
     - uses: actions/checkout@v2
 
-    - name: Set up Python 3.x
-      uses: actions/setup-python@v2
+    - name: 'Yamllint'
+      uses: karancode/yamllint-github-action@master
       with:
-        python-version: '3.x'
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install yamllint==1.13.0
-
-    - name: yamlint
-      run: |
-        cd ansible
-        yamllint -c yamllint.yml .
+        yamllint_comment: true
+      env:
+        GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   ansible_lint:
     name: Ansible Lint
@@ -68,4 +60,4 @@ jobs:
         ansible-playbook playbooks/AdoptOpenJDK_ITW_Playbook/main.yml --syntax-check
         ansible-playbook playbooks/vagrant.yml --syntax-check
         ansible-playbook playbooks/aix.yml --syntax-check
-        ansible-playbook playbooks/ubuntu-jck.yml --syntax-check
+        ansible-playbook playbooks/ubuntu-jck.yml --syntax-check
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,13 @@
+---
 arch:
   - amd64
   - arm64-graviton2
   - ppc64le
 
-env: 
+env:
   - TARGET="adoptopenjdk/centos7_build_image"
 
-os: 
+os:
   - linux
 
 dist: bionic
@@ -32,4 +33,4 @@ jobs:
         docker manifest annotate $TARGET $ARM64 --arch arm64 --os linux &&
         docker manifest annotate $TARGET $PPC64LE --arch ppc64le --os linux
       after_success:
-        - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; docker manifest push $TARGET; fi
+        - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; docker manifest push $TARGET; fi
diff --git a/ansible/yamllint.yml → .yamllint.yml b/ansible/yamllint.yml → .yamllint.yml
@@ -1,8 +1,12 @@
 ---
 extends: default
+
+ignore: |
+  .github/
+
 rules:
-  line-length:
-    max: 120
-    level: warning
+  line-length: disable
+  comments-indentation: disable
+  comments: disable
   # mixed style truthy values are OK for Ansible code
   truthy: disable
diff --git a/ansible/playbooks/AdoptOpenJDK_Services_Playbooks/ubuntu-jckservices.yml b/ansible/playbooks/AdoptOpenJDK_Services_Playbooks/ubuntu-jckservices.yml
@@ -75,8 +75,8 @@
           args:
             creates: krb5.jckusers.txt
           tags:
-            #false positive for 'use shell only when shell is required'
-            #this whole piece should be rewritten to avoid 'bashsible' code style
+            # false positive for 'use shell only when shell is required'
+            # this whole piece should be rewritten to avoid 'bashsible' code style
             - skip_ansible_lint
 
         - name: Start krb5-kdc service

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/linux_installer_setup.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/linux_installer_setup.yml
@@ -1,3 +1,4 @@
+---
 - hosts: all
   gather_facts: yes
   tasks:

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/IPv6/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/IPv6/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 ##############################
 # Enable IPv6 in sysctl.conf #
 ##############################

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Plugins/tasks/nagios_CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Plugins/tasks/nagios_CentOS.yml
@@ -1,3 +1,4 @@
+---
 #########################################################################################
 # AdoptOpenJDK - Ansible Playbook to install Nagios plugins on CentOS 7 on x86 hardware #
 #########################################################################################

diff --git a/ansible/playbooks/aix.yml b/ansible/playbooks/aix.yml
@@ -159,7 +159,7 @@
           when: yum.stat.islnk is not defined
           tags:
             - yum
-            #TODO: Package installs should not use latest
+            # TODO: Package installs should not use latest
             - skip_ansible_lint
 
         - name: Yum update
@@ -169,7 +169,7 @@
             state: latest
           tags:
             - yum
-            #TODO: Package installs should not use latest
+            # TODO: Package installs should not use latest
             - skip_ansible_lint
 
         - name: Install yum package support