From 13869a3837477bc5de3006500000648cb85003dd Mon Sep 17 00:00:00 2001 From: Arun Saravanan Balachandran Date: Mon, 1 Jun 2020 17:54:51 +0530 Subject: [PATCH 1/3] [docker-sonic-mgmt]: Include patch to support 'become' and 'become_user' in pytest-ansible --- dockers/docker-sonic-mgmt/Dockerfile.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2 index 78d5996f857..4875295175d 100644 --- a/dockers/docker-sonic-mgmt/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt/Dockerfile.j2 @@ -115,6 +115,10 @@ RUN pip install azure-kusto-data==0.0.13 \ RUN pip install wheel==0.33.6 RUN pip install pytest-ansible==2.2.2 +# Apply 'become_user' patch for pytest-ansible +RUN curl -fsSL https://github.com/ansible/pytest-ansible/commit/d33c025f070a9c870220a157cc5a999fda68de44.patch | \ + patch /usr/local/lib/python2.7/dist-packages/pytest_ansible/module_dispatcher/v28.py + ## Copy and install sonic-mgmt docker dependencies COPY \ {% for deb in docker_sonic_mgmt_debs.split(' ') -%} From 791f481dd94044cc2d61e99d7441f081ae50220d Mon Sep 17 00:00:00 2001 From: Arun Saravanan Balachandran Date: Tue, 2 Jun 2020 16:29:34 +0530 Subject: [PATCH 2/3] [docker-sonic-mgmt]: Install pytest-ansible module from source --- dockers/docker-sonic-mgmt/Dockerfile.j2 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2 index 4875295175d..25e8a1deb84 100644 --- a/dockers/docker-sonic-mgmt/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt/Dockerfile.j2 @@ -111,13 +111,7 @@ RUN apt-get update \ RUN pip install azure-kusto-data==0.0.13 \ azure-kusto-ingest==0.0.13 -# Install pytest-ansible module RUN pip install wheel==0.33.6 -RUN pip install pytest-ansible==2.2.2 - -# Apply 'become_user' patch for pytest-ansible -RUN curl -fsSL https://github.com/ansible/pytest-ansible/commit/d33c025f070a9c870220a157cc5a999fda68de44.patch | \ - patch /usr/local/lib/python2.7/dist-packages/pytest_ansible/module_dispatcher/v28.py ## Copy and install sonic-mgmt docker dependencies COPY \ @@ -135,6 +129,13 @@ RUN pip install ansible==2.8.7 RUN pip install pysubnettree +# Install pytest-ansible module +RUN git clone https://github.com/ansible/pytest-ansible.git \ + && cd pytest-ansible \ + && python setup.py install \ + && cd .. \ + && rm -fr pytest-ansible + RUN mkdir /var/run/sshd EXPOSE 22 From b98cd748dd4b27dbd1f73b81210f8caeddc6977f Mon Sep 17 00:00:00 2001 From: Arun Saravanan Balachandran Date: Wed, 10 Jun 2020 14:26:02 +0530 Subject: [PATCH 3/3] Checkout pytest-ansible commit to support 'become' and 'become_user' parameters --- dockers/docker-sonic-mgmt/Dockerfile.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2 index 25e8a1deb84..0c57bb4beb9 100644 --- a/dockers/docker-sonic-mgmt/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt/Dockerfile.j2 @@ -129,9 +129,10 @@ RUN pip install ansible==2.8.7 RUN pip install pysubnettree -# Install pytest-ansible module +# Install pytest-ansible module with 'become', 'become_user' parameters support RUN git clone https://github.com/ansible/pytest-ansible.git \ && cd pytest-ansible \ + && git checkout d33c025f070a9c870220a157cc5a999fda68de44 \ && python setup.py install \ && cd .. \ && rm -fr pytest-ansible