From ce4eefff6ae8f3c78237eab68dbd7521433fd985 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Fri, 17 Feb 2017 23:14:10 +0300 Subject: [PATCH] Use first kube-master to check results --- .gitlab-ci.yml | 2 +- docs/test_cases.md | 6 +++--- tests/testcases/040_check-network-adv.yml | 8 +++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d326aecbd..8546bfa6e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -325,7 +325,7 @@ before_script: KUBE_NETWORK_PLUGIN: weave CLOUD_IMAGE: coreos-alpha CLOUD_REGION: us-west1-a - CLUSTER_MODE: ha + CLUSTER_MODE: ha-scale BOOTSTRAP_OS: coreos .ubuntu_rkt_sep_variables: &ubuntu_rkt_sep_variables diff --git a/docs/test_cases.md b/docs/test_cases.md index 5e232b63a..8cb282395 100644 --- a/docs/test_cases.md +++ b/docs/test_cases.md @@ -57,13 +57,13 @@ GCE instances |--------------------|--------------------|--------------------|--------------------|--------------------| | part1| calico| coreos-stable| us-west1-b| separate| | part1| canal| debian-8-kubespray| us-east1-b| ha| -| part1| weave| rhel-7| europe-west1-b| scale| +| part1| weave| rhel-7| europe-west1-b| default| | part2| flannel| centos-7| us-west1-a| default| | part2| calico| debian-8-kubespray| us-central1-b| default| | part2| canal| coreos-stable| us-east1-b| default| | special| canal| rhel-7| us-east1-b| separate| -| special| weave| ubuntu-1604-xenial| us-central1-b| scale| +| special| weave| ubuntu-1604-xenial| us-central1-b| default| | special| calico| centos-7| europe-west1-b| ha-scale| -| special| weave| coreos-alpha| us-west1-a| ha| +| special| weave| coreos-alpha| us-west1-a| ha-scale| The "Stage" means a build step of the build pipeline. The steps are ordered as `part1->part2->special`. diff --git a/tests/testcases/040_check-network-adv.yml b/tests/testcases/040_check-network-adv.yml index 90a5eba7b..21d265bf5 100644 --- a/tests/testcases/040_check-network-adv.yml +++ b/tests/testcases/040_check-network-adv.yml @@ -42,7 +42,7 @@ - name: Get netchecker agents uri: url=http://localhost:{{netchecker_port}}/api/v1/agents/ return_content=yes run_once: true - delegate_to: "{{groups['kube-node'][0]}}" + delegate_to: "{{groups['kube-master'][0]}}" register: agents retries: 6 delay: "{{ agent_report_interval }}" @@ -54,12 +54,11 @@ - debug: var=agents.content|from_json failed_when: not agents|success and not agents.content=='{}' - delegate_to: "{{groups['kube-node'][0]}}" run_once: true - + - name: Check netchecker status uri: url=http://localhost:{{netchecker_port}}/api/v1/connectivity_check status_code=200 return_content=yes - delegate_to: "{{groups['kube-node'][0]}}" + delegate_to: "{{groups['kube-master'][0]}}" run_once: true register: result retries: 3 @@ -70,7 +69,6 @@ - debug: var=result.content|from_json failed_when: not result|success - delegate_to: "{{groups['kube-node'][0]}}" run_once: true when: not agents.content=='{}'