diff options
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docs/testing/user/userguide/kubestone/deployment_capacity.rst | 59 | ||||
| -rw-r--r-- | docs/testing/user/userguide/overview.rst | 46 | ||||
| -rw-r--r-- | docs/testing/user/userguide/test_cases.rst | 1 | ||||
| -rw-r--r-- | docs/testing/user/userguide/test_scheduler_user_guide.rst (renamed from docs/testing/user/userguide/testing_scheduler_user_guide.rst) | 0 | ||||
| -rw-r--r-- | utils/k8s_setup/k8s_config_pre.sh | 18 | ||||
| -rw-r--r-- | utils/k8s_setup/kubectl_install.sh | 2 |
7 files changed, 104 insertions, 24 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index c91a60f1..ef63e3b1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -49,5 +49,7 @@ RUN git config --global http.sslVerify false RUN git clone -b $BRANCH https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR} RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR} +RUN bash ${BOTTLENECKS_REPO_DIR}/utils/k8s_setup/kubectl_install.sh + RUN pip install -r ${BOTTLENECKS_REPO_DIR}/requirements/requirements.txt RUN pip install -U ${BOTTLENECKS_REPO_DIR} diff --git a/docs/testing/user/userguide/kubestone/deployment_capacity.rst b/docs/testing/user/userguide/kubestone/deployment_capacity.rst new file mode 100644 index 00000000..06cdd886 --- /dev/null +++ b/docs/testing/user/userguide/kubestone/deployment_capacity.rst @@ -0,0 +1,59 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. + .. http://creativecommons.org/licenses/by/4.0 + .. (c) Huawei Technologies Co.,Ltd and others. + +*************************************************** +Kubenetes Stress Test of Deployment Capacity +*************************************************** + +Test Case +========= + ++-----------------------------------------------------------------------------+ +|Bottlenecks Kubestone Deployment Capacity Test | +| | ++--------------+--------------------------------------------------------------+ +|test case name| kubestone_deployment_capacity | +| | | ++--------------+--------------------------------------------------------------+ +|description | Stress test regarding capacity of deployment | ++--------------+--------------------------------------------------------------+ +|configuration | config file: | +| | testsuite/kubestone/testcases/deployment.yaml | +| | | +| | | ++--------------+--------------------------------------------------------------+ +|test result | Capcity, Life-Cycle Duration, Available Deployments | +| | | ++--------------+--------------------------------------------------------------+ + +Configuration +============ +:: + + apiVersion: apps/v1 + kind: Deployment + namespace: bottlenecks-kubestone + test_type: Horizontal-Scaling + scaling_steps: 10, 50, 100, 200 + template: None + metadata: + name: nginx-deployment + labels: + app: nginx + spec: + replicas: 3 + selector: + matchLabels: + app: nginx + template: + metadata: + labels: + app: nginx + spec: + containers: + - name: nginx + image: nginx:1.7.9 + ports: + - containerPort: 80 + diff --git a/docs/testing/user/userguide/overview.rst b/docs/testing/user/userguide/overview.rst index 725a4b9d..a03229f0 100644 --- a/docs/testing/user/userguide/overview.rst +++ b/docs/testing/user/userguide/overview.rst @@ -57,30 +57,34 @@ Integration Description +-------------+----------------------+----------------------+ | Fraser | Any | POSCA | +-------------+----------------------+----------------------+ +| Gambia | Any | POSCA, kubestone | ++-------------+----------------------+----------------------+ Test suite & Test case Description ================================== -+--------+----+-------------------------------------------+ -|POSCA | 1 | posca_factor_ping | -| +----+-------------------------------------------+ -| | 2 | posca_factor_system_bandwidth | -| +----+-------------------------------------------+ -| | 3 | posca_facotor_soak_througputs | -| +----+-------------------------------------------+ -| | 4 | posca_feature_vnf_scale_up | -| +----+-------------------------------------------+ -| | 5 | posca_feature_vnf_scale_out | -| +----+-------------------------------------------+ -| | 6 | posca_factor_storperf | -| +----+-------------------------------------------+ -| | 7 | posca_factor_multistack_storage_parallel | -| +----+-------------------------------------------+ -| | 8 | posca_factor_multistack_storage | -| +----+-------------------------------------------+ -| | 9 | posca_feature_moon_resources | -| +----+-------------------------------------------+ -| | 10 | posca_feature_moon_tenants | -+--------+----+-------------------------------------------+ ++----------+----+-------------------------------------------+ +|POSCA | 1 | posca_factor_ping | +| +----+-------------------------------------------+ +| | 2 | posca_factor_system_bandwidth | +| +----+-------------------------------------------+ +| | 3 | posca_facotor_soak_througputs | +| +----+-------------------------------------------+ +| | 4 | posca_feature_vnf_scale_up | +| +----+-------------------------------------------+ +| | 5 | posca_feature_vnf_scale_out | +| +----+-------------------------------------------+ +| | 6 | posca_factor_storperf | +| +----+-------------------------------------------+ +| | 7 | posca_factor_multistack_storage_parallel | +| +----+-------------------------------------------+ +| | 8 | posca_factor_multistack_storage | +| +----+-------------------------------------------+ +| | 9 | posca_feature_moon_resources | +| +----+-------------------------------------------+ +| | 10 | posca_feature_moon_tenants | ++----------+----+-------------------------------------------+ +|Kubestone | 1 | deployment_capacity | ++----------+----+-------------------------------------------+ As for the abandoned test suite in the previous Bottlenecks releases, please refer to http://docs.opnfv.org/en/stable-danube/submodules/bottlenecks/docs/testing/user/userguide/deprecated.html. diff --git a/docs/testing/user/userguide/test_cases.rst b/docs/testing/user/userguide/test_cases.rst index b6b1d17f..20003414 100644 --- a/docs/testing/user/userguide/test_cases.rst +++ b/docs/testing/user/userguide/test_cases.rst @@ -18,3 +18,4 @@ Bottlenecks - Test Cases ./posca/posca_feature_moon_resources.rst ./posca/posca_feature_moon_tenants.rst ./posca/posca_feature_vnf_scale_out.rst + ./kubestone/deployment_capacity.rst diff --git a/docs/testing/user/userguide/testing_scheduler_user_guide.rst b/docs/testing/user/userguide/test_scheduler_user_guide.rst index 9820810e..9820810e 100644 --- a/docs/testing/user/userguide/testing_scheduler_user_guide.rst +++ b/docs/testing/user/userguide/test_scheduler_user_guide.rst diff --git a/utils/k8s_setup/k8s_config_pre.sh b/utils/k8s_setup/k8s_config_pre.sh index 05c3f1c3..38e71d23 100644 --- a/utils/k8s_setup/k8s_config_pre.sh +++ b/utils/k8s_setup/k8s_config_pre.sh @@ -59,8 +59,22 @@ while [[ $# > 0 ]] shift done -if [[ ${INSTALLER_TYPE} == 'compass' ]]; then - sshpass -p root scp root@192.16.1.222:~/.kube/config ${K8S_CONFIG} +if [[ ${INSTALLER_TYPE} == 'compass' ]]; then + sshpass -p root scp -o StrictHostKeyChecking=no root@192.16.1.222:~/.kube/config ${K8S_CONFIG} else echo "BOTTLENECKS EROOR: unrecognized installer" fi + +if [[ -f ${K8S_CONFIG} ]]; then + if [[ -d ~/.kube ]]; then + cp ${K8S_CONFIG} ~/.kube/config + echo "BOTTLENECKS INFO: copying k8s config to ~./kube" + else + mkdir ~/.kube + cp ${K8S_CONFIG} ~/.kube/config + echo "BOTTLENECKS INFO: copying k8s config to ~./kube" + fi +else + echo "BOTTLENECKS ERROR: k8s config file does no exit (${K8S_CONFIG})" + exit 1 +fi diff --git a/utils/k8s_setup/kubectl_install.sh b/utils/k8s_setup/kubectl_install.sh index 14f97f2b..22c6197b 100644 --- a/utils/k8s_setup/kubectl_install.sh +++ b/utils/k8s_setup/kubectl_install.sh @@ -9,7 +9,7 @@ ############################################################################## OS_TYPE=$(uname -a) -OS_UBUNTU=$(echo $OS_TYPE | grep ubuntu) +OS_UBUNTU=$(echo $OS_TYPE | grep Ubuntu) if [[ $OS_UBUNTU ]]; then apt-get update && apt-get install -y apt-transport-https |