aboutsummaryrefslogtreecommitdiffstats
path: root/docker/smoke
diff options
context:
space:
mode:
Diffstat (limited to 'docker/smoke')
-rw-r--r--docker/smoke/Dockerfile14
-rw-r--r--docker/smoke/testcases.yaml12
2 files changed, 22 insertions, 4 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index c405330a6..19fa9d9c1 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,17 +1,18 @@
FROM opnfv/functest-tempest
ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/queens
+ARG OPENSTACK_TAG=master
ARG REFSTACK_TARGET=2018.02
-ARG PATROLE_TAG=0.3.0
-ARG NEUTRON_TAG=0.2.0
+ARG PATROLE_TAG=0.4.0
+ARG NEUTRON_TAG=master
ARG BARBICAN_TAG=0.1.0
+ARG NEUTRON_RALLY_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@\\1#egg=tempest/ \
+ 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 && \
@@ -41,6 +42,11 @@ RUN apk --no-cache add --virtual .build-deps --update \
mkdir -p /etc/neutron /etc/glance && \
wget -q -O /etc/neutron/policy.json https://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json?h=$OPENSTACK_TAG && \
wget -q -O /etc/glance/policy.json https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=$OPENSTACK_TAG && \
+ git clone --depth 1 -b $NEUTRON_RALLY_TAG https://git.openstack.org/openstack/neutron.git /src/neutron && \
+ (cd /src/neutron && git fetch --tags origin $NEUTRON_RALLY_TAG && git checkout FETCH_HEAD) && \
+ mkdir -p /home/opnfv/functest/data/rally/neutron && \
+ cp -r /src/neutron/rally-jobs /home/opnfv/functest/data/rally/neutron/rally-jobs && \
+ rm -r /src/neutron && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index a510c6474..55f7a102a 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -53,6 +53,17 @@ tiers:
name: rally_sanity
-
+ case_name: rally_jobs
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ This test case runs a group of Rally jobs used in
+ OpenStack gating
+ run:
+ name: rally_jobs
+
+ -
case_name: refstack_defcore
project_name: functest
criteria: 100
@@ -82,6 +93,7 @@ tiers:
- 'network'
excludes:
- 'test_networks_multiprovider_rbac'
+ - 'test_auto_allocated_topology_rbac'
-
case_name: snaps_smoke