Code Review / functest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: c729039)
Move rally and tempest in functest-restapi 43/47143/2
authorCédric Ollivier <cedric.ollivier@orange.com>
Mon, 13 Nov 2017 20:18:29 +0000 (21:18 +0100)
committerCédric Ollivier <cedric.ollivier@orange.com>
Mon, 13 Nov 2017 22:59:12 +0000 (23:59 +0100)
It completes the first patch which partially moved rally and tempest
out of functest-core [1] by updating functest-restapi as well.

os-faults is also installed in the right containers.

[1] https://gerrit.opnfv.org/gerrit/#/c/47115/

Change-Id: Ia460dbe7785e2beffa5ba1a15f5a5bf2083b252a
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
docker/components/Dockerfile patch | blob | history
docker/core/Dockerfile patch | blob | history
docker/restapi/Dockerfile patch | blob | history
docker/smoke/Dockerfile patch | blob | history

diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
index e692e1f..781022e 100644 (file)
--- a/docker/components/Dockerfile
+++ b/docker/components/Dockerfile
@@ -1,9 +1,9 @@
 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
+ARG OS_FAULTS_TAG=0.1.16
 
 RUN apk --no-cache add --virtual .build-deps --update \
         python-dev build-base linux-headers libffi-dev \
@@ -11,15 +11,20 @@ RUN apk --no-cache add --virtual .build-deps --update \
     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 && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        -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/rally && \
+        tempest /src/os-faults && \
     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 && \
+        /src/rally && \
+    rm -r upper-constraints.txt /src/os-faults /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 && \
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 704f5d9..5407466 100644 (file)
--- 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 OS_FAULTS_TAG=0.1.16
 
 RUN apk --no-cache add --update \
         python libffi libssl1.0 libjpeg-turbo py-pip bash \
@@ -14,17 +13,9 @@ RUN apk --no-cache add --update \
         > upper-constraints.txt && \
     git clone https://gerrit.opnfv.org/gerrit/functest /src/functest && \
     (cd /src/functest && git fetch origin $BRANCH && git checkout FETCH_HEAD) && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        -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/ && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        /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 && \
+    rm -r upper-constraints.txt /src/functest && \
     bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \
     apk del .build-deps
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
index f2810e1..f361001 100644 (file)
--- a/docker/restapi/Dockerfile
+++ b/docker/restapi/Dockerfile
@@ -3,8 +3,10 @@ FROM opnfv/functest-core
 ARG BRANCH=master
 ARG OPENSTACK_TAG=stable/pike
 ARG ODL_TAG=master
-ARG FDS_TAG=master
+ARG RALLY_TAG=stable/0.10
+ARG OS_FAULTS_TAG=0.1.16
 ARG REFSTACK_TAG=master
+ARG FDS_TAG=master
 ARG VIMS_TAG=stable
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
@@ -18,12 +20,22 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \
     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 && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        -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/ && \
     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/ && \
     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 -rthirdparty-requirements.txt && \
+        tempest /src/os-faults && \
+    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 /src/rally -rthirdparty-requirements.txt && \
     python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         doctor-tests && \
@@ -38,7 +50,7 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \
     (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \
     npm -g install npm@latest && \
     rm -r upper-constraints.txt thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \
-        /src/fds/.git /src/vims-test/.git && \
+        /src/os-faults /src/rally /src/fds/.git /src/vims-test/.git && \
     apk del .build-deps
 EXPOSE 5000
 CMD ["functest_restapi"]
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 4274c26..01414f3 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -4,6 +4,7 @@ ARG BRANCH=master
 ARG OPENSTACK_TAG=stable/pike
 ARG ODL_TAG=master
 ARG RALLY_TAG=stable/0.10
+ARG OS_FAULTS_TAG=0.1.16
 ARG REFSTACK_TAG=master
 
 RUN apk --no-cache add --virtual .build-deps --update \
@@ -12,25 +13,27 @@ RUN apk --no-cache add --virtual .build-deps --update \
     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 && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        -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/ && \
     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 && \
+        tempest /src/os-faults && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        tempest && \
+        -e/src/refstack-client /src/rally && \
     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 /src/rally && \
+    rm -r upper-constraints.txt /src/refstack-client/.git /src/odl_test/.git /src/os-faults /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 && \
Test suites and cases to verify OPNFV Platform functionality