From f2ca929a4ac9f0e22a025a2918493766904852ba Mon Sep 17 00:00:00 2001
From: Florian Ruynat <florian234@hotmail.com>
Date: Tue, 9 Jun 2020 14:23:18 +0200
Subject: [PATCH] Move nodes readiness test before pods readiness (#6089)
---
tests/scripts/testcases_run.sh | 10 +++++-----
...check-nodes-ready.yml => 015_check-nodes-ready.yml} | 0
...eck-pods-running.yml => 020_check-pods-running.yml} | 0
3 files changed, 5 insertions(+), 5 deletions(-)
rename tests/testcases/{020_check-nodes-ready.yml => 015_check-nodes-ready.yml} (100%)
rename tests/testcases/{015_check-pods-running.yml => 020_check-pods-running.yml} (100%)
diff --git a/tests/scripts/testcases_run.sh b/tests/scripts/testcases_run.sh
index 33ed66554..551e854c8 100755
--- a/tests/scripts/testcases_run.sh
+++ b/tests/scripts/testcases_run.sh
@@ -41,7 +41,7 @@ fi
# Check out latest tag if testing upgrade
test "${UPGRADE_TEST}" != "false" && git fetch --all && git checkout "$KUBESPRAY_VERSION"
# Checkout the CI vars file so it is available
-test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" tests/files/${CI_JOB_NAME}.yml tests/testcases/*.yml
+test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" tests/files/${CI_JOB_NAME}.yml
# Install mitogen ansible plugin
if [ "${MITOGEN_ENABLE}" = "true" ]; then
@@ -71,11 +71,11 @@ fi
## Test Master API
ansible-playbook --limit "all:!fake_hosts" -e @${CI_TEST_VARS} tests/testcases/010_check-apiserver.yml $ANSIBLE_LOG_LEVEL
-## Test that all pods are Running
-ansible-playbook --limit "all:!fake_hosts" -e @${CI_TEST_VARS} tests/testcases/015_check-pods-running.yml $ANSIBLE_LOG_LEVEL
-
## Test that all nodes are Ready
-ansible-playbook --limit "all:!fake_hosts" -e @${CI_TEST_VARS} tests/testcases/020_check-nodes-ready.yml $ANSIBLE_LOG_LEVEL
+ansible-playbook --limit "all:!fake_hosts" -e @${CI_TEST_VARS} tests/testcases/015_check-nodes-ready.yml $ANSIBLE_LOG_LEVEL
+
+## Test that all pods are Running
+ansible-playbook --limit "all:!fake_hosts" -e @${CI_TEST_VARS} tests/testcases/020_check-pods-running.yml $ANSIBLE_LOG_LEVEL
## Test pod creation and ping between them
ansible-playbook --limit "all:!fake_hosts" -e @${CI_TEST_VARS} tests/testcases/030_check-network.yml $ANSIBLE_LOG_LEVEL
diff --git a/tests/testcases/020_check-nodes-ready.yml b/tests/testcases/015_check-nodes-ready.yml
similarity index 100%
rename from tests/testcases/020_check-nodes-ready.yml
rename to tests/testcases/015_check-nodes-ready.yml
diff --git a/tests/testcases/015_check-pods-running.yml b/tests/testcases/020_check-pods-running.yml
similarity index 100%
rename from tests/testcases/015_check-pods-running.yml
rename to tests/testcases/020_check-pods-running.yml
--
GitLab