From b7e634be0b6f97bb1270861c69b455f630beeb6d Mon Sep 17 00:00:00 2001
From: xwjiang2021 <xwjiang2021@github.com>
Date: Fri, 11 Mar 2022 09:37:30 +0000
Subject: [PATCH] Install the allure-pytest package globally in sonic-mgmt
 docker

Why I did it
User install position caused the fail on nightly test

How I did it
Change the install position globally

How to verify it
Import allure in docker/ run nightly test
---
 dockers/docker-sonic-mgmt/Dockerfile.j2 | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2
index e2054ae81ba..8349df8e439 100755
--- a/dockers/docker-sonic-mgmt/Dockerfile.j2
+++ b/dockers/docker-sonic-mgmt/Dockerfile.j2
@@ -21,7 +21,6 @@ RUN apt-get update && apt-get install -y build-essential \
                                          python \
                                          python-dev \
                                          python-scapy \
-                                         python-setuptools \
                                          python-pip \
                                          python3-pip \
                                          python3-venv \
@@ -33,6 +32,7 @@ RUN apt-get update && apt-get install -y build-essential \
                                          telnet \
                                          vim
 
+RUN pip install setuptools==44.1.1
 RUN pip install cffi==1.10.0 \
                 contextlib2==0.6.0.post1 \
                 cryptography==3.3.2 \
@@ -74,6 +74,7 @@ RUN pip install cffi==1.10.0 \
                 virtualenv \
                 retry \
                 thrift==0.11.0 \
+                allure-pytest==2.8.22 \
     && git clone https://github.com/p4lang/scapy-vxlan.git \
     && cd scapy-vxlan \
     && python setup.py install \
@@ -182,10 +183,6 @@ RUN python3 -m venv env-python3
 #       the end until we figure that out.
 RUN pip install pycryptodome==3.9.8
 
-# Install allure-pytest library
-RUN pip install --upgrade setuptools \
-    && pip install allure-pytest==2.8.22
-
 # Activating a virtualenv. The virtualenv automatically works for RUN, ENV and CMD.
 ENV VIRTUAL_ENV=env-python3
 ARG BACKUP_OF_PATH="$PATH"