ATS: Rework tests.

giantswarm · Nov 20, 2023 · 0c64894 · 0c64894
1 parent 8bce388
commit 0c64894
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 474 deletions.
diff --git a/.ats/main.yaml b/.ats/main.yaml
@@ -1,5 +1,13 @@
-app-tests-skip-app-deploy: true
+app-tests-app-config-file: tests/values.yaml
+app-tests-deploy-namespace: kube-system
 
-smoke-tests-cluster-config-file: tests/kind_config.yaml
 smoke-tests-cluster-type: kind
-skip-steps: [functional, upgrade]
+smoke-tests-cluster-config-file: tests/cluster.yaml
+
+functional-tests-cluster-type: kind
+functional-tests-cluster-config-file: tests/cluster.yaml
+
+upgrade-tests-cluster-type: kind
+upgrade-tests-cluster-config-file: tests/cluster.yaml
+upgrade-tests-app-catalog-url: https://giantswarm.github.io/giantswarm-catalog
+upgrade-tests-app-config-file: tests/values.yaml
diff --git a/tests/ats/Pipfile b/tests/ats/Pipfile
@@ -3,16 +3,8 @@ name = "pypi"
 url = "https://pypi.org/simple"
 verify_ssl = true
 
-[packages]
-pytest-helm-charts = ">=1.1.1"
-pytest = ">=6.2.5"
-pykube-ng = ">=21.10.0"
-pyyaml = "~=6.0"
-pytest-rerunfailures = ">=10.2"
-requests = "~=2.31.0"
-
 [requires]
 python_version = "3.9"
 
-[pipenv]
-allow_prereleases = true
+[packages]
+pytest-helm-charts = ">=1.1.2"
diff --git a/tests/ats/Pipfile.lock b/tests/ats/Pipfile.lock
diff --git a/tests/ats/pytest.ini b/tests/ats/pytest.ini
@@ -0,0 +1,5 @@
+[pytest]
+markers =
+    smoke
+    functional
+    upgrade
diff --git a/tests/ats/test_app.py b/tests/ats/test_app.py
@@ -0,0 +1,16 @@
+from pytest import mark
+from pytest_helm_charts.clusters import Cluster
+from pytest_helm_charts.giantswarm_app_platform.app import wait_for_apps_to_run
+from pytest_helm_charts.k8s.deployment import wait_for_deployments_to_run
+
+@mark.smoke
+@mark.functional
+@mark.upgrade
+def test_coredns(kube_cluster: Cluster) -> None:
+    assert kube_cluster.kube_client is not None
+
+    # Wait for coredns app to run.
+    wait_for_apps_to_run(kube_cluster.kube_client, [ "coredns-app" ], "kube-system", 60)
+
+    # Wait for coredns-controlplane & coredns-workers deployments to run.
+    wait_for_deployments_to_run(kube_cluster.kube_client, [ "coredns-controlplane", "coredns-workers" ], "kube-system", 60)
diff --git a/tests/ats/test_coredns.py b/tests/ats/test_coredns.py
diff --git a/tests/kind_config.yaml → tests/cluster.yaml b/tests/kind_config.yaml → tests/cluster.yaml
@@ -3,5 +3,3 @@ apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
 - role: worker
-- role: worker
-- role: worker
diff --git a/tests/ats/test-values.yaml → tests/values.yaml b/tests/ats/test-values.yaml → tests/values.yaml
@@ -1,7 +1,3 @@
-
-name: coredns-test
-namespace: default
-
 cluster:
   kubernetes:
     DNS: