diff options
| -rw-r--r-- | docker/core/Dockerfile | 8 | ||||
| -rw-r--r-- | functest/ci/download_images.sh | 4 | ||||
| -rw-r--r-- | functest/core/singlevm.py | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 29723c709..c4d8de309 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.16 ARG BRANCH=master ARG OPENSTACK_TAG=master @@ -14,8 +14,6 @@ RUN apk -U upgrade && \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev rust cargo \ libxml2-dev libxslt-dev && \ - apk --no-cache add --update py3-distlib\>=0.3.1 \ - --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \ git init /src/requirements && \ (cd /src/requirements && \ git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \ @@ -25,9 +23,6 @@ RUN apk -U upgrade && \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest $BRANCH && \ git checkout FETCH_HEAD) && \ sed -i -E /^tempest==+.*$/d /src/requirements/upper-constraints.txt && \ - sed -i -E /^six=/d /src/requirements/upper-constraints.txt && \ - sed -i -E /^distlib=/d /src/requirements/upper-constraints.txt && \ - sed -i -E /^packaging=/d /src/requirements/upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && apk add --no-cache py3-pynacl ;; esac && \ sed -i -E /#egg=functest/d /src/functest/upper-constraints.txt && \ pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \ @@ -47,6 +42,7 @@ RUN apk -U upgrade && \ rm -r /src/requirements/.git /src/functest/.git \ /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch \ /tmp/Create-new-server-in-test_create_backup.patch && \ + mkdir -p /etc/xtesting && \ cp /src/functest/functest/ci/logging.ini /etc/xtesting/ && \ cp /src/functest/functest/ci/logging.debug.ini /etc/xtesting/ && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh index 358ccf916..c9fafa96e 100644 --- a/functest/ci/download_images.sh +++ b/functest/ci/download_images.sh @@ -6,10 +6,10 @@ wget_opts="-N --tries=1 --connect-timeout=30" [ -t 1 ] || wget_opts="${wget_opts} --progress=dot:giga" cat << EOF | wget ${wget_opts} -i - -P ${1:-/home/opnfv/functest/images} -http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img +http://download.cirros-cloud.net/0.6.0/cirros-0.6.0-x86_64-disk.img https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img -http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-aarch64-disk.img +http://download.cirros-cloud.net/0.6.0/cirros-0.6.0-aarch64-disk.img http://repository.cloudifysource.org/cloudify/19.01.24/community-release/cloudify-docker-manager-community-19.01.24.tar http://testresults.opnfv.org/functest/vyos-1.1.8-amd64.qcow2 http://testresults.opnfv.org/functest/shaker-image-1.3.4+stretch.qcow2 diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py index 7bb4e16c0..a14a7067a 100644 --- a/functest/core/singlevm.py +++ b/functest/core/singlevm.py @@ -39,7 +39,7 @@ class VmReady1(tenantnetwork.TenantNetwork1): # pylint: disable=too-many-instance-attributes __logger = logging.getLogger(__name__) - filename = '/home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.img' + filename = '/home/opnfv/functest/images/cirros-0.6.0-x86_64-disk.img' image_format = 'qcow2' extra_properties = {} filename_alt = filename |