diff options
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 2 | ||||
| -rw-r--r-- | functest/ci/config_aarch64_patch.yaml | 3 | ||||
| -rw-r--r-- | functest/ci/config_functest.yaml | 2 | ||||
| -rw-r--r-- | functest/ci/config_patch.yaml | 3 |
5 files changed, 6 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 21ae33437..ff532ccc6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -66,7 +66,7 @@ sshpass \ wget \ --no-install-recommends -RUN pip install --upgrade pip +RUN pip install --upgrade pip && easy_install -U setuptools==30.0.0 RUN mkdir -p ${REPOS_DIR} \ && mkdir -p ${REPOS_VNFS_DIR} \ diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 729646119..44e6904b1 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -65,7 +65,7 @@ sshpass \ wget \ --no-install-recommends -RUN pip install --upgrade pip +RUN pip install --upgrade pip && easy_install -U setuptools==30.0.0 RUN mkdir -p ${REPOS_DIR} \ && mkdir -p ${REPOS_VNFS_DIR} \ diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index cd395ab89..80cf4ccc2 100644 --- a/functest/ci/config_aarch64_patch.yaml +++ b/functest/ci/config_aarch64_patch.yaml @@ -16,6 +16,9 @@ os: vping: image_name: TestVM + tempest: + use_custom_images: False + odl_sfc: image_base_url: "http://artifacts.opnfv.org/sfc/demo" image_name: sfc_nsh_danube diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 9b7960718..5aa5bfdab 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -139,7 +139,7 @@ tempest: private_subnet_name: tempest-subnet private_subnet_cidr: 192.168.150.0/24 router_name: tempest-router - use_custom_images: False + use_custom_images: True use_custom_flavors: False volume_device_name: vdc diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml index d47766b64..ad8b0889f 100644 --- a/functest/ci/config_patch.yaml +++ b/functest/ci/config_patch.yaml @@ -13,16 +13,13 @@ fdio: flavor_extra_specs: {'hw:mem_page_size':'large'} image_properties: {'hw_mem_page_size':'large'} tempest: - use_custom_images: True use_custom_flavors: True ovs: general: flavor_extra_specs: {'hw:mem_page_size':'large'} image_properties: {'hw_mem_page_size':'large'} tempest: - use_custom_images: True use_custom_flavors: True multisite: tempest: - use_custom_images: True use_custom_flavors: True |