diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-10-04 23:52:03 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-10-04 23:56:05 +0200 |
| commit | f4a7f631e286f9a163fbc992eead751b71679efe (patch) | |
| tree | 535a71bcbf5a1c68b9d6f9095d099e6eff724b5f | |
| parent | 435b84b001eacfad7abba1c5d15deef6d7e3ed71 (diff) | |
Update Shaker image (1.3.0 + Debian Stretch)
It udates Shaker to 1.3.0 and switches to Debian Stretch as base image.
It also eases debugging as ssh basic auth is enabled (shaker/shaker).
The arm image has to be built before enabling the testcase for arm.
Change-Id: I894bae86c7e8f7cafbba2b4e00e3334afed0b6e2
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 574243656df6acae28094c62f33410ef1fc3e7b5)
| -rw-r--r-- | functest/ci/config_aarch64_patch.yaml | 3 | ||||
| -rw-r--r-- | functest/ci/download_images.sh | 3 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/shaker/shaker.py | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index 37ed406ce..9eea4ed53 100644 --- a/functest/ci/config_aarch64_patch.yaml +++ b/functest/ci/config_aarch64_patch.yaml @@ -41,9 +41,6 @@ os: image: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-arm64-uefi1.img - shaker: - image: /home/opnfv/functest/images/shaker-image-arm64.qcow2 - neutron_trunk: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh index 9612f85b2..219bcbb02 100644 --- a/functest/ci/download_images.sh +++ b/functest/ci/download_images.sh @@ -13,6 +13,5 @@ http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-aarch64-disk.img https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-arm64-uefi1.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.qcow2 -http://testresults.opnfv.org/functest/shaker-image-arm64.qcow2 +http://testresults.opnfv.org/functest/shaker-image-1.3.0+stretch.qcow2 EOF diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 5cb5a56fd..ef3c93e3b 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -399,6 +399,8 @@ tiers: like iperf, iperf3 and netperf (with help of flent). Shaker is able to deploy OpenStack instances and networks in different topologies. + dependencies: + - POD_ARCH: '^(?!aarch64$)' run: name: shaker diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py index d7f97c18d..36706704f 100644 --- a/functest/opnfv_tests/openstack/shaker/shaker.py +++ b/functest/opnfv_tests/openstack/shaker/shaker.py @@ -31,11 +31,11 @@ class Shaker(singlevm.SingleVm2): __logger = logging.getLogger(__name__) - filename = '/home/opnfv/functest/images/shaker-image.qcow2' + filename = '/home/opnfv/functest/images/shaker-image-1.3.0+stretch.qcow2' flavor_ram = 512 flavor_vcpus = 1 flavor_disk = 3 - username = 'ubuntu' + username = 'debian' port = 9000 ssh_connect_loops = 12 create_server_timeout = 300 |