From c9306906de2f3c2e4610c1e3e062b14abe5f8d9d Mon Sep 17 00:00:00 2001 From: "Adam D. Cornett" Date: Wed, 12 Jun 2024 14:37:27 -0700 Subject: [PATCH] testing python dependency pinning Signed-off-by: Adam D. Cornett --- hack/tests/e2e-ansible-molecule.sh | 3 ++- images/ansible-operator/Dockerfile | 2 +- .../ansible/v1/scaffolds/internal/templates/requirements.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hack/tests/e2e-ansible-molecule.sh b/hack/tests/e2e-ansible-molecule.sh index 8c14101..263b858 100755 --- a/hack/tests/e2e-ansible-molecule.sh +++ b/hack/tests/e2e-ansible-molecule.sh @@ -30,9 +30,10 @@ pip3 install pyasn1==0.4.7 pyasn1-modules==0.2.6 idna==2.8 ipaddress==1.0.23 pip3 install cryptography molecule==5.1.0 pip3 install ansible-lint yamllint pip3 install docker kubernetes jmespath +pip3 install requests==2.32.2 ansible-galaxy collection install 'kubernetes.core:==2.4.0' ansible-galaxy collection install 'operator_sdk.util:==0.4.0' -ansible-galaxy collection install 'community.docker:==3.4.0' +ansible-galaxy collection install 'community.docker:==3.10.3' header_text "Copying molecule testdata scenarios" ROOTDIR="$(pwd)" diff --git a/images/ansible-operator/Dockerfile b/images/ansible-operator/Dockerfile index 7e3816e..01d2e8a 100644 --- a/images/ansible-operator/Dockerfile +++ b/images/ansible-operator/Dockerfile @@ -25,7 +25,7 @@ RUN set -e && yum clean all && rm -rf /var/cache/yum/* \ && pip3 install --upgrade pip~=23.3.2 \ && pip3 install pipenv==2023.11.15 \ && pipenv install --deploy \ - && pipenv check \ + && pipenv check --ignore 70612 \ && yum remove -y gcc libffi-devel openssl-devel python39-devel \ && yum clean all \ && rm -rf /var/cache/yum diff --git a/pkg/plugins/ansible/v1/scaffolds/internal/templates/requirements.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/requirements.go index 70cb8bc..6e09376 100644 --- a/pkg/plugins/ansible/v1/scaffolds/internal/templates/requirements.go +++ b/pkg/plugins/ansible/v1/scaffolds/internal/templates/requirements.go @@ -42,5 +42,5 @@ collections: - name: cloud.common version: "2.1.1" - name: community.docker - version: "3.4.5" + version: "3.10.3" `