diff options
| -rwxr-xr-x | ci/build_rpm/build_rpms_docker.sh | 9 | ||||
| -rw-r--r-- | tests/unit/test_tempest.py | 12 |
2 files changed, 7 insertions, 14 deletions
diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh index 3ea90eaf..0b488944 100755 --- a/ci/build_rpm/build_rpms_docker.sh +++ b/ci/build_rpm/build_rpms_docker.sh @@ -14,9 +14,6 @@ rpm_build_dir=/opt/daisy4nfv rpm_output_dir=$rpm_build_dir/build_output tmp_rpm_build_dir=/home/cache/daisy4nfv -DAISYCORE_REPO="https://git.openstack.org/openstack/daisycloud-core" -DAISYCORE_TAG= - if [[ -d $tmp_rpm_build_dir ]]; then rm -fr $tmp_rpm_build_dir fi @@ -37,11 +34,7 @@ do cnt=$[cnt + 1] echo -e "\n\n\n*** Starting build attempt # $cnt" - if [[ ! -z "$DAISYCORE_TAG" ]]; then - git clone $DAISYCORE_REPO --branch $DAISYCORE_TAG --depth 1 - else - git clone $DAISYCORE_REPO --depth 1 - fi + git clone https://git.openstack.org/openstack/daisycloud-core --branch stable/pike --depth 1 cp $rpm_build_dir/code/makefile_patch.sh daisycloud-core/tools/setup cp $rpm_build_dir/code/install_interface_patch.sh daisycloud-core/tools/setup diff --git a/tests/unit/test_tempest.py b/tests/unit/test_tempest.py index 9a70aec5..3c616bcd 100644 --- a/tests/unit/test_tempest.py +++ b/tests/unit/test_tempest.py @@ -218,7 +218,7 @@ def test_update_hosts_interface(isbare, tmpdir): 'interfaces': [{'name': 'ens8', 'mac': '11:11:11:11:11:11', 'assigned_networks': [{'ip': '', 'name': 'EXTERNAL'}]}], 'hugepagesize': '1G', - 'hugepages': '20', + 'hugepages': '80', } assert client.hosts.get(host_id2).metadata == { 'id': host_id2, 'name': 'controller02', 'cluster_id': cluster_id, @@ -232,7 +232,7 @@ def test_update_hosts_interface(isbare, tmpdir): {'ip': '', 'name': 'physnet1'}], 'vswitch_type': 'dvs'}], 'hugepagesize': '1G', - 'hugepages': '20', + 'hugepages': '80', } assert client.hosts.get(host_id3).metadata == { 'id': host_id3, 'name': 'computer01', 'cluster_id': cluster_id, @@ -241,7 +241,7 @@ def test_update_hosts_interface(isbare, tmpdir): 'interfaces': [{'name': 'ens9', 'mac': '33:33:33:33:33:33', 'assigned_networks': [{'ip': '', 'name': 'HEARTBEAT'}]}], 'hugepagesize': '1G', - 'hugepages': '20', + 'hugepages': '80', } else: assert client.hosts.get(host_id1).metadata == { @@ -250,7 +250,7 @@ def test_update_hosts_interface(isbare, tmpdir): 'interfaces': [{'name': 'ens8', 'mac': '11:11:11:11:11:11', 'assigned_networks': [{'ip': '', 'name': 'EXTERNAL'}]}], 'hugepagesize': '1G', - 'hugepages': '20', + 'hugepages': '80', } assert client.hosts.get(host_id2).metadata == { 'id': host_id2, 'name': 'controller02', 'cluster_id': cluster_id, @@ -263,7 +263,7 @@ def test_update_hosts_interface(isbare, tmpdir): {'ip': '', 'name': 'physnet1'}], 'vswitch_type': 'dvs'}], 'hugepagesize': '1G', - 'hugepages': '20', + 'hugepages': '80', } assert client.hosts.get(host_id3).metadata == { 'id': host_id3, 'name': 'computer01', 'cluster_id': cluster_id, @@ -271,7 +271,7 @@ def test_update_hosts_interface(isbare, tmpdir): 'interfaces': [{'name': 'ens9', 'mac': '33:33:33:33:33:33', 'assigned_networks': [{'ip': '', 'name': 'HEARTBEAT'}]}], 'hugepagesize': '1G', - 'hugepages': '20', + 'hugepages': '80', } tmpdir.remove() |