10 files changed, 53 insertions, 29 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 7b98eade9..ff87f56d6 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,7 +1,7 @@
 FROM opnfv/functest-core
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/queens
+ARG OPENSTACK_TAG=master
 ARG VMTP_TAG=99b261ccccc2f8a08ee2d8fca9f54ef9d69899d7
 
 RUN apk --no-cache add --update libxml2 libxslt && \
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index c1e7ede03..eaedf2a29 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.8
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/queens
+ARG OPENSTACK_TAG=master
 ARG PIP_TAG=18.0
 
 RUN apk --no-cache add --update \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 99de1eda5..01e0cb2bb 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,7 +1,7 @@
 FROM opnfv/functest-tempest
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/queens
+ARG OPENSTACK_TAG=master
 ARG FDS_TAG=master
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
@@ -10,7 +10,7 @@ RUN apk --no-cache add --update python3 sshpass && \
         python-dev python3-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 && \
diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index a2f71f8c1..f2793fdd1 100644
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -10,6 +10,7 @@ tiers:
             -
                 case_name: doctor-notification
                 project_name: doctor
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
@@ -25,6 +26,7 @@ tiers:
             -
                 case_name: bgpvpn
                 project_name: sdnvpn
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
@@ -37,6 +39,7 @@ tiers:
             -
                 case_name: functest-odl-sfc
                 project_name: sfc
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
@@ -50,6 +53,7 @@ tiers:
             -
                 case_name: barometercollectd
                 project_name: barometer
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
@@ -64,6 +68,7 @@ tiers:
             -
                 case_name: fds
                 project_name: fastdatastacks
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
@@ -92,6 +97,7 @@ tiers:
             -
                 case_name: stor4nfv_os
                 project_name: stor4nfv
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt
index 510b3e6f6..e9b16b933 100644
--- a/docker/features/thirdparty-requirements.txt
+++ b/docker/features/thirdparty-requirements.txt
@@ -1,8 +1,8 @@
 robotframework-httplibrary
 robotframework-requests
 robotframework-sshlibrary;python_version=='2.7'
-baro_tests
-sdnvpn
-sfc
-stor4nfv_tests
-doctor-tests;python_version>='3.0'
+# baro_tests
+# sdnvpn
+# sfc
+# stor4nfv_tests
+# doctor-tests;python_version>='3.0'
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 4a1c255b3..aba2bbdee 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,7 +1,7 @@
 FROM opnfv/functest-core
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/queens
+ARG OPENSTACK_TAG=master
 ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
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
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index 0cc947939..9174a495c 100644
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -1,24 +1,17 @@
 FROM opnfv/functest-core
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/queens
+ARG OPENSTACK_TAG=master
 ARG RALLY_TAG=1.1.0
-ARG RALLY_OPENSTACK_TAG=1.2.0
+ARG RALLY_OPENSTACK_TAG=67882d55ca453d6aa863d279ec4cfc2b52c80f0a
 ARG OS_FAULTS_TAG=0.1.17
 
 RUN apk --no-cache add --virtual .build-deps --update \
         python-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev && \
-    case $OPENSTACK_TAG in \
-    master) \
-        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.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/ \
-            > upper-constraints.txt ;; \
-    esac && \
+    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 && \
     git init /src/os-faults && \
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index d081ff17f..0b39b480e 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,15 +1,16 @@
 FROM opnfv/functest-core
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/queens
+ARG OPENSTACK_TAG=master
 ARG VIMS_TEST_TAG=release-129
 ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909
 ARG CLOUDIFY_VIMS_TAG=fraser
 ARG HEAT_VIMS_TAG=release-129
 ARG VROUTER_TAG=fraser
-ARG JUJU_TAG=tags/juju-2.2.5
+ARG JUJU_TAG=tags/juju-2.3.9
 ARG JUJU_WAIT_TAG=2.6.4
 ARG ABOT_CHARM=opnfv-fraser
+ARG GODEPS_TAG=404a7e748cd352bb0d7449dedc645546eebbfc6e
 
 ENV GOPATH /src/epc-requirements/go
 ENV GOBIN /src/epc-requirements/go/bin
@@ -47,13 +48,19 @@ RUN apk --no-cache add --update \
     (cd /src/opnfv-vnf-vyos-blueprint && \
         git fetch --tags https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git $VROUTER_TAG && \
         git checkout FETCH_HEAD) && \
+    mkdir -p /home/opnfv/functest/data/router && \
+    git init /home/opnfv/functest/data/router/opnfv-vnf-data && \
+    (cd /home/opnfv/functest/data/router/opnfv-vnf-data && \
+        git fetch --tags https://github.com/oolorg/opnfv-vnf-data.git $VROUTER_TAG && \
+        git checkout FETCH_HEAD) && \
     git init /src/epc-requirements/abot_charm && \
     (cd /src/epc-requirements/abot_charm && \
         git fetch --tags https://github.com/RebacaInc/abot_charm.git $ABOT_CHARM && \
         git checkout FETCH_HEAD) && \
     python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
         juju-wait==$JUJU_WAIT_TAG && \
-    go get github.com/rogpeppe/godeps && \
+    go get -d github.com/rogpeppe/godeps && \
+    (cd $GOPATH/src/github.com/rogpeppe/godeps && git checkout $GODEPS_TAG && go install -v github.com/rogpeppe/godeps) && \
     go get -d -v github.com/juju/juju/... || true && \
     (cd $GOPATH/src/github.com/juju/juju && git checkout $JUJU_TAG && godeps -u dependencies.tsv) && \
     go install -v github.com/juju/juju/... && \