From 37124b20cb5b9d94a70510b73db7188b2f94d191 Mon Sep 17 00:00:00 2001 From: Solal Nathan Date: Tue, 16 Feb 2021 03:27:27 +0100 Subject: [PATCH 1/8] Gitlab CI is not needed anymore --- .gitlab-ci.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index c62f35b..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -image: python:3.9-alpine - -stages: - - lint - -yamllint: - stage: lint - script: - - pip install yamllint==1.25.0 - - yamllint -c .yamllint.yml . - -ansible-lint: - stage: lint - script: - - apk add gcc libc-dev libffi-dev openssl-dev - - pip install ansible-lint==4.3.7 - - ansible-lint *.yml -... -- 2.45.2 From abcdf59824e34b746c3c8edf75d9625a41a0d47a Mon Sep 17 00:00:00 2001 From: Solal Nathan Date: Tue, 16 Feb 2021 03:31:26 +0100 Subject: [PATCH 2/8] :construction_worker: yaml-lint 1.25.0 -> 1.26.0 --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 58679a2..3f34393 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ steps: - name: yamllint image: python:3.9-alpine commands: - - pip install yamllint==1.25.0 + - pip install yamllint==1.26.0 - yamllint -c .yamllint.yml . - name: ansible-lint -- 2.45.2 From 5503a54be432fae928e7ba4383d21b37c167ed86 Mon Sep 17 00:00:00 2001 From: Solal Nathan Date: Tue, 16 Feb 2021 03:32:33 +0100 Subject: [PATCH 3/8] :construction_worker: ansible-lint 4.7.3 -> 5.0.0 and fix dependencies --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3f34393..24cbaa7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ steps: - name: ansible-lint image: python:3.9-alpine commands: - - apk add --no-cache gcc libc-dev libffi-dev openssl-dev - - pip install ansible-lint==4.3.7 + - apk add --no-cache gcc musl-dev python3-dev libffi-dev openssl-dev cargo + - pip install ansible-lint==5.0.0 ansible - ansible-lint ... -- 2.45.2 From f4fc3567ee3042ccda6aac8effd7654b2cd49a45 Mon Sep 17 00:00:00 2001 From: Solal Nathan Date: Tue, 16 Feb 2021 03:43:38 +0100 Subject: [PATCH 4/8] :construction_worker: fix ansible and yaml version according to ansible-lint 5.0 upgrade guidelines. Use ansible-base for slim version. See #1150 on ansible-lint for more info. --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 24cbaa7..dbc0b53 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,13 +7,13 @@ steps: - name: yamllint image: python:3.9-alpine commands: - - pip install yamllint==1.26.0 + - pip install yamllint>=1.26.0,<2.0 - yamllint -c .yamllint.yml . - name: ansible-lint image: python:3.9-alpine commands: - apk add --no-cache gcc musl-dev python3-dev libffi-dev openssl-dev cargo - - pip install ansible-lint==5.0.0 ansible + - pip install ansible-lint==5.0.0 ansible-base>=2.10,<2.11 - ansible-lint ... -- 2.45.2 From bd541691d9354b353e0b0e16038166c9283d98fc Mon Sep 17 00:00:00 2001 From: Solal Nathan Date: Tue, 16 Feb 2021 03:47:39 +0100 Subject: [PATCH 5/8] :construction_worker: fix syntax --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index dbc0b53..e9d60bb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,13 +7,14 @@ steps: - name: yamllint image: python:3.9-alpine commands: - - pip install yamllint>=1.26.0,<2.0 + - pip install "yamllint>=1.26.0,<2.0" - yamllint -c .yamllint.yml . - name: ansible-lint image: python:3.9-alpine commands: - apk add --no-cache gcc musl-dev python3-dev libffi-dev openssl-dev cargo - - pip install ansible-lint==5.0.0 ansible-base>=2.10,<2.11 + - pip install "ansible-lint==5.0.0" + - pip install "ansible-base>=2.10,<2.11" - ansible-lint ... -- 2.45.2 From 6f80cf0fd937cf25124fcf47e1a42ebd603ebff1 Mon Sep 17 00:00:00 2001 From: Solal Nathan Date: Tue, 16 Feb 2021 03:50:14 +0100 Subject: [PATCH 6/8] :green_heart: fix yamllint CI on CI itself, CIception --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e9d60bb..8c23c77 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,7 @@ steps: image: python:3.9-alpine commands: - apk add --no-cache gcc musl-dev python3-dev libffi-dev openssl-dev cargo - - pip install "ansible-lint==5.0.0" + - pip install "ansible-lint==5.0.0" - pip install "ansible-base>=2.10,<2.11" - ansible-lint ... -- 2.45.2 From e9f0b884ec43e0565226c2866568256c83631de3 Mon Sep 17 00:00:00 2001 From: Solal Nathan Date: Tue, 16 Feb 2021 03:57:30 +0100 Subject: [PATCH 7/8] :construction_worker: update ansible-lint notation that were depreciated --- .ansible-lint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ansible-lint b/.ansible-lint index 3f851df..3ec97ed 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,5 +1,5 @@ skip_list: - - '301' + - 'no-changed-when' warn_list: - experimental # all rules tagged as experimental -- 2.45.2 From ab69d1540450ef24f03dddd867c568fd49e0ef78 Mon Sep 17 00:00:00 2001 From: Solal Nathan Date: Tue, 16 Feb 2021 03:59:03 +0100 Subject: [PATCH 8/8] :construction_worker: we need full ansible, slim version wont work for our use case --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8c23c77..ab5b271 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,6 +15,6 @@ steps: commands: - apk add --no-cache gcc musl-dev python3-dev libffi-dev openssl-dev cargo - pip install "ansible-lint==5.0.0" - - pip install "ansible-base>=2.10,<2.11" + - pip install "ansible>=2.10,<2.11" - ansible-lint ... -- 2.45.2