diff options
Diffstat (limited to 'docker/benchmarking')
-rw-r--r-- | docker/benchmarking/Dockerfile | 8 | ||||
-rw-r--r-- | docker/benchmarking/hooks/post_checkout | 2 | ||||
-rw-r--r-- | docker/benchmarking/testcases.yaml | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index a89dd0c95..d0957f6b8 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,6 +1,6 @@ FROM opnfv/functest-core -ARG VMTP_TAG=master +ARG VMTP_TAG=34a82c9f3598ec7f5d8de0a6d5139b92931db4cc ARG NEUTRON_TAG=master RUN apk --no-cache add --update libxml2 libxslt && \ @@ -8,14 +8,14 @@ RUN apk --no-cache add --update libxml2 libxslt && \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" \ - pip3 install --no-cache-dir -c/src/requirements/upper-constraints.txt \ + pip3 install --use-deprecated=legacy-resolver --no-cache-dir -c/src/requirements/upper-constraints.txt \ -c/src/functest/upper-constraints.txt lxml ;; esac && \ git init /src/vmtp && \ (cd /src/vmtp && \ git fetch --tags https://review.opendev.org/x/vmtp.git $VMTP_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/requirements /src/vmtp/ && \ - pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ + pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ -c/src/functest/upper-constraints.txt \ /src/vmtp && \ mkdir -p /home/opnfv/functest/data/rally/neutron/rally-jobs && \ @@ -26,5 +26,5 @@ RUN apk --no-cache add --update libxml2 libxslt && \ cp /src/neutron/rally-jobs/task-neutron.yaml /home/opnfv/functest/data/rally/neutron/rally-jobs/ && \ rm -r /src/vmtp /src/neutron && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /etc/xtesting/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/benchmarking/hooks/post_checkout b/docker/benchmarking/hooks/post_checkout index 8d0e98124..c347524ea 100644 --- a/docker/benchmarking/hooks/post_checkout +++ b/docker/benchmarking/hooks/post_checkout @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}" sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile diff --git a/docker/benchmarking/testcases.yaml b/docker/benchmarking/testcases.yaml index e63481e43..c84d3a00f 100644 --- a/docker/benchmarking/testcases.yaml +++ b/docker/benchmarking/testcases.yaml @@ -2,7 +2,6 @@ tiers: - name: benchmarking - order: 3 description: >- Run several OpenStack performance tools https://docs.openstack.org/performance-docs/latest/methodologies/tools.html @@ -30,6 +29,8 @@ tiers: description: >- This test case runs a group of Rally jobs used in OpenStack gating + dependencies: + - NO_TENANT_NETWORK: '^(?![tT]rue$)' run: name: rally_jobs args: @@ -46,7 +47,7 @@ tiers: perform ping connectivity, round trip time measurement (latency) and TCP/UDP throughput dependencies: - - POD_ARCH: '^(?!aarch64$)' + - NO_TENANT_NETWORK: '^(?![tT]rue$)' run: name: vmtp @@ -61,6 +62,6 @@ tiers: is able to deploy OpenStack instances and networks in different topologies. dependencies: - - POD_ARCH: '^(?!aarch64$)' + - NO_TENANT_NETWORK: '^(?![tT]rue$)' run: name: shaker |