X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fsmoke%2FDockerfile;h=d7f93cf7198f5125c62674dfa2db6c4d7ee7cd00;hb=45423d891d0810e9a495a6506b700670e5271d03;hp=19bea3acd9c7d968eec2a415cbbd9193291a6013;hpb=83c1afa080f261d732be2842f8913208d20e411e;p=functest.git

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 19bea3acd..d7f93cf71 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,52 +1,51 @@
-FROM opnfv/functest-tempest
+FROM opnfv/functest-core
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=master
-ARG REFSTACK_TARGET=2018.02
+ARG REFSTACK_TARGET=2018.11
 ARG PATROLE_TAG=master
-ARG NEUTRON_TAG=master
+ARG NEUTRON_TEMPEST_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 && \
-    wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
-        sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ \
-        > upper-constraints.txt && \
-    wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
-        sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \
+        python3-dev build-base linux-headers libffi-dev \
+        openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \
+    wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
+    sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
+    case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \
+    wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
+    sed -i -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 fetch --tags https://opendev.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 fetch --tags https://git.openstack.org/openstack/neutron-tempest-plugin.git $NEUTRON_TEMPEST_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 fetch --tags https://opendev.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 && \
+    pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
+        /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \
     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/glance && \
-    wget -q -O /etc/glance/policy.json https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=$OPENSTACK_TAG && \
-    virtualenv 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 && \
+    mkdir -p /etc/neutron /etc/cinder /etc/glance /etc/keystone /etc/nova && \
+    wget -q -O /etc/glance/policy.json https://opendev.org/openstack/glance/raw/branch/$OPENSTACK_TAG/etc/policy.json && \
+    virtualenv --no-pip --no-setuptools --no-wheel oslo && . oslo/bin/activate && \
+    pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
+        oslo.policy -e git+https://opendev.org/openstack/neutron.git@$OPENSTACK_TAG#egg=neutron && \
     oslopolicy-sample-generator  --format json --output-file /etc/neutron/policy.json --namespace neutron && \
     deactivate && \
-    mkdir -p /home/opnfv/functest/data/rally/neutron && \
-    cp -r /src/neutron/rally-jobs /home/opnfv/functest/data/rally/neutron/rally-jobs && \
     rm -r oslo upper-constraints.txt upper-constraints.opnfv.txt \
-        /src/neutron /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \
+        /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \
+        /src/neutron && \
     apk del .build-deps
-COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
+COPY compute.txt /home/opnfv/functest/data/refstack/compute.txt
+COPY object.txt /home/opnfv/functest/data/refstack/object.txt
+COPY platform.txt /home/opnfv/functest/data/refstack/platform.txt
+COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]