Remove rally and tempest from core/Dockerfile

JIRA: FUNCTEST-889

Change-Id: I6092c8b6599705d23dcb3aba8c4470b76c41455c
Signed-off-by: Linda Wang <wangwulin@huawei.com>

4 files changed, 38 insertions, 14 deletions

diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
index 33e20eef3..e692e1f14 100644
--- a/docker/components/Dockerfile
+++ b/docker/components/Dockerfile
@@ -2,6 +2,27 @@ FROM opnfv/functest-core
 
 # useless build arg forced by releng/jjb/releng/opnfv-docker.sh
 ARG BRANCH=master
+ARG OPENSTACK_TAG=stable/pike
+ARG RALLY_TAG=stable/0.10
 
+RUN apk --no-cache add --virtual .build-deps --update \
+        python-dev build-base linux-headers libffi-dev \
+        openssl-dev libjpeg-turbo-dev && \
+    wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
+        sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
+        > upper-constraints.txt && \
+    git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
+    update-requirements -s --source /src/openstack-requirements /src/rally/ && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        /src/rally && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        tempest && \
+    rm -r upper-constraints.txt /src/rally && \
+    mkdir -p /etc/rally && \
+    printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
+    mkdir -p /var/lib/rally/database && rally-manage db create && \
+    apk del .build-deps
 COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
 CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 165c8a7b2..704f5d945 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -2,7 +2,6 @@ FROM alpine:3.6
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=stable/pike
-ARG RALLY_TAG=stable/0.10
 ARG OS_FAULTS_TAG=0.1.16
 
 RUN apk --no-cache add --update \
@@ -11,8 +10,7 @@ RUN apk --no-cache add --update \
     apk --no-cache add --virtual .build-deps --update \
         python-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev && \
-    wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
-        sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
+    wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
         > upper-constraints.txt && \
     git clone https://gerrit.opnfv.org/gerrit/functest /src/functest && \
     (cd /src/functest && git fetch origin $BRANCH && git checkout FETCH_HEAD) && \
@@ -21,17 +19,12 @@ RUN apk --no-cache add --update \
         -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
     git clone --depth 1 https://github.com/openstack/os-faults.git -b $OS_FAULTS_TAG /src/os-faults && \
     update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \
-    git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
-    update-requirements -s --source /src/openstack-requirements /src/rally/ && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-         /src/os-faults /src/rally && \
+        /src/os-faults && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         /src/functest && \
-    rm -r upper-constraints.txt /src/functest /src/os-faults/.git /src/rally/.git && \
-    mkdir -p /etc/rally && \
-    printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
-    mkdir -p /var/lib/rally/database && rally-manage db create && \
+    rm -r upper-constraints.txt /src/functest /src/os-faults/.git && \
     bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \
     apk del .build-deps
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index db02104f6..4274c267d 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -3,25 +3,37 @@ FROM opnfv/functest-core
 ARG BRANCH=master
 ARG OPENSTACK_TAG=stable/pike
 ARG ODL_TAG=master
+ARG RALLY_TAG=stable/0.10
 ARG REFSTACK_TAG=master
 
 RUN apk --no-cache add --virtual .build-deps --update \
         python-dev build-base linux-headers libffi-dev \
-        openssl-dev libjpeg-turbo-dev git && \
+        openssl-dev libjpeg-turbo-dev && \
     wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
         sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
         > upper-constraints.txt && \
     git clone https://github.com/openstack/refstack-client.git /src/refstack-client && \
     (cd src/refstack-client && git checkout $REFSTACK_TAG) && \
     update-requirements -s --source /src/openstack-requirements /src/refstack-client/ && \
+    git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
+    update-requirements -s --source /src/openstack-requirements /src/rally/ && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         -e/src/refstack-client && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        /src/rally && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        tempest && \
     git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
     (cd src/odl_test && git checkout $ODL_TAG) && \
     ln -s /src/tempest /src/refstack-client/.tempest && \
     virtualenv --system-site-packages /src/tempest/.venv && \
-    rm -r upper-constraints.txt /src/refstack-client/.git /src/odl_test/.git && \
+    rm -r upper-constraints.txt /src/refstack-client/.git /src/odl_test/.git /src/rally && \
+    mkdir -p /etc/rally && \
+    printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
+    mkdir -p /var/lib/rally/database && rally-manage db create && \
     apk del .build-deps
 COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
 CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/requirements.txt b/requirements.txt
index 32e354542..0e3d846ae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,8 +29,6 @@ PrettyTable<0.8,>=0.7.1 # BSD
 six>=1.9.0 # MIT
 opnfv
 snaps
-tempest>=16.1.0 # Apache-2.0
-rally
 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
 paramiko>=2.0 # LGPLv2.1+
 Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)