diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-21 10:01:30 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-24 13:29:45 +0100 |
| commit | a1b0f64bccea682e55ec5086aef979df57cf686f (patch) | |
| tree | 3da4de0c032d840322f7e84427c7e76b8e27167c /docker | |
| parent | 02bd6e30668b477781ab007e82bfe2a207baa8b7 (diff) | |
Automatically download defcore.txt
It stops writing files in Functest package dirs and cleans instance
variables in refstack modules too.
Change-Id: Iaddbe4fbaf12d1af207b86d4e44258efdc6d6f3a
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/restapi/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index 15b83fe3..a731679f 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -6,6 +6,7 @@ ARG ODL_TAG=master ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 ARG REFSTACK_TAG=master +ARG REFSTACK_TARGET=2017.09 ARG FDS_TAG=master ARG VIMS_TAG=stable @@ -56,6 +57,9 @@ RUN apk --no-cache add --update python3 sshpass \ 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 db create && \ + 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 && \ apk del .build-deps EXPOSE 5000 CMD ["functest_restapi"] diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 5e5b1591..00f5bac0 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -6,6 +6,7 @@ ARG ODL_TAG=master ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 ARG REFSTACK_TAG=master +ARG REFSTACK_TARGET=2017.09 COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ @@ -39,6 +40,9 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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 db create && \ + 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 && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |