X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fsmoke%2FDockerfile;h=f360352e89a2780dfde7c690bd60cf3cfd8dea54;hb=1d0f0bbf773aaaf7139b76442a9e59d13bd32830;hp=8350602ae2bcf4e98b3eb4ce473432c0a85ebe42;hpb=9ca52cc93dbc869c214f47c38697e61adda03b8b;p=functest.git

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 8350602ae..f360352e8 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,29 +1,55 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-tempest
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
-ARG ODL_TAG=master
-ARG FDS_TAG=master
-ARG REFSTACK_TAG=master
+ARG OPENSTACK_TAG=master
+ARG REFSTACK_TARGET=2018.02
+ARG PATROLE_TAG=master
+ARG BARBICAN_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 libxml2-dev libxslt-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/ \
+        sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#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/ && \
-    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 && \
-    git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
-    (cd src/odl_test && git checkout $ODL_TAG) && \
-    git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
-    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/fds/.git && \
+    wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
+        sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \
+    git init /src/patrole && \
+    (cd /src/patrole && \
+        git fetch --tags https://git.openstack.org/openstack/patrole.git $PATROLE_TAG && \
+        git checkout FETCH_HEAD) && \
+    update-requirements -s --source /src/openstack-requirements /src/patrole/ && \
+    git init /src/neutron-tempest-plugin && \
+    (cd /src/neutron-tempest-plugin && \
+        git fetch --tags https://git.openstack.org/openstack/neutron-tempest-plugin.git $NEUTRON_TAG && \
+        git checkout FETCH_HEAD) && \
+    update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \
+    git init /src/barbican-tempest-plugin && \
+    (cd /src/barbican-tempest-plugin && \
+        git fetch --tags https://git.openstack.org/openstack/barbican-tempest-plugin.git $BARBICAN_TAG && \
+        git checkout FETCH_HEAD) && \
+    update-requirements -s --source /src/openstack-requirements /src/barbican-tempest-plugin/ && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
+        /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \
+        networking-bgpvpn networking-sfc && \
+    mkdir -p /home/opnfv/functest/data/refstack && \
+    wget "https://refstack.openstack.org/api/v1/guidelines/${REFSTACK_TARGET}/tests?target=compute&type=required&alias=true&flag=false" \
+        -O /home/opnfv/functest/data/refstack/defcore.txt && \
+    mkdir -p /etc/neutron /etc/cinder /etc/glance /etc/keystone /etc/nova && \
+    wget -q -O /etc/glance/policy.json https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=$OPENSTACK_TAG && \
+    virtualenv --no-pip --no-setuptools --no-wheel oslo && . oslo/bin/activate && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
+        oslo.policy -e git+https://git.openstack.org/openstack/neutron.git@$OPENSTACK_TAG#egg=neutron \
+        -e git+https://git.openstack.org/openstack/cinder.git@$OPENSTACK_TAG#egg=cinder \
+        -e git+https://git.openstack.org/openstack/keystone.git@$OPENSTACK_TAG#egg=keystone \
+        -e git+https://git.openstack.org/openstack/nova.git@$OPENSTACK_TAG#egg=nova && \
+    oslopolicy-sample-generator  --format json --output-file /etc/cinder/policy.json --namespace cinder && \
+    oslopolicy-sample-generator  --format json --output-file /etc/keystone/policy.json --namespace keystone && \
+    oslopolicy-sample-generator  --format json --output-file /etc/neutron/policy.json --namespace neutron && \
+    oslopolicy-sample-generator  --format json --output-file /etc/nova/policy.json --namespace nova && \
+    deactivate && \
+    rm -r oslo upper-constraints.txt upper-constraints.opnfv.txt \
+        /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \
     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"]
+COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
+CMD ["run_tests", "-t", "all"]