fix(ci): add ansible collections

krestomatio · Mar 29, 2024 · 6a1e50e · 6a1e50e
1 parent d380742
commit 6a1e50e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/.ansible-ci/files/templated_contexts/ansible-docker-ci/Dockerfile.j2 b/.ansible-ci/files/templated_contexts/ansible-docker-ci/Dockerfile.j2
@@ -26,6 +26,8 @@ RUN echo "Build tools..."  && \
     $CTR_PIP molecule==$MOLECULE_VERSION && \
     echo "Installing aditional python tools..."  && \
     $CTR_PIP yamllint ansible-lint cryptography pywinrm docker git-semver commitizen jmespath && \
+    echo "Installing ansible collections..."  && \
+    ansible-galaxy collection install {{ ansible_collections | join(' ') }} && \
     echo "Cleaning..."  && \
     apk del build-dependencies && \
     rm -rf /var/cache/apk/* && \

diff --git a/.ansible-ci/files/templated_contexts/ansible/Dockerfile.j2 b/.ansible-ci/files/templated_contexts/ansible/Dockerfile.j2
@@ -23,6 +23,8 @@ RUN echo "Build tools..."  && \
     $CTR_PIP molecule==$MOLECULE_VERSION && \
     echo "Installing other pip tools..."  && \
     $CTR_PIP $CTR_PIP_EXTRA && \
+    echo "Installing ansible collections..."  && \
+    ansible-galaxy collection install {{ ansible_collections | join(' ') }} && \
     echo "Cleaning..."  && \
     $CTR_PKG_MGM remove -y python3-devel gcc libffi-devel && \
     $CTR_PKG_MGM clean all && \

diff --git a/.ansible-ci/inventory/group_vars/ci_grp/dockerfile_builder.yml b/.ansible-ci/inventory/group_vars/ci_grp/dockerfile_builder.yml
@@ -3,6 +3,12 @@ image_ansible_version: '2.15.*'
 molecule_version: '5.1.*'
 docker_version: '26-dind'
 
+# ansible collections
+ansible_collections:
+  - ansible.posix
+  - community.general
+  - community.docker
+
 # ci
 prepare_image_task: ansible-ci
 

diff --git a/.ansible-ci/requirements.yml b/.ansible-ci/requirements.yml
@@ -4,3 +4,5 @@ collections:
     version: "1.5.0"
   - name: community.docker
     version: "3.8.1"
+  - name: community.general
+    version: '>=7.0.0'