From fc0b2e24041dd313781967c8b35f29aac769ecd4 Mon Sep 17 00:00:00 2001
From: Matias Charriere <matias@giantswarm.io>
Date: Wed, 15 Nov 2023 09:19:20 +0100
Subject: [PATCH] remove explicit deps and add pytest ini

Signed-off-by: Matias Charriere <matias@giantswarm.io>
---
 .ats/main.yaml                           |  3 ++-
 tests/ats/Pipfile                        | 11 +++--------
 tests/ats/Pipfile.lock                   | 15 +--------------
 tests/ats/pytest.ini                     |  5 +++++
 tests/{kind_config.yaml => cluster.yaml} |  0
 5 files changed, 11 insertions(+), 23 deletions(-)
 create mode 100644 tests/ats/pytest.ini
 rename tests/{kind_config.yaml => cluster.yaml} (100%)

diff --git a/.ats/main.yaml b/.ats/main.yaml
index b575748..aa32dc3 100644
--- a/.ats/main.yaml
+++ b/.ats/main.yaml
@@ -1,5 +1,6 @@
 app-tests-skip-app-deploy: true
 
-smoke-tests-cluster-config-file: tests/kind_config.yaml
+smoke-tests-cluster-config-file: tests/cluster.yaml
 smoke-tests-cluster-type: kind
+
 skip-steps: [functional, upgrade]
diff --git a/tests/ats/Pipfile b/tests/ats/Pipfile
index ac2914b..93d49e6 100644
--- a/tests/ats/Pipfile
+++ b/tests/ats/Pipfile
@@ -3,16 +3,11 @@ name = "pypi"
 url = "https://pypi.org/simple"
 verify_ssl = true
 
-[packages]
-pytest-helm-charts = ">=1.1.2"
-pytest = "~=7.4.2"
-pykube-ng = "~=23.6.0"
-pyyaml = "~=6.0"
-pytest-rerunfailures = ">=10.2"
-requests = "~=2.31.0"
-
 [requires]
 python_version = "3.9"
 
+[packages]
+pytest-helm-charts = ">=1.1.2"
+
 [pipenv]
 allow_prereleases = true
diff --git a/tests/ats/Pipfile.lock b/tests/ats/Pipfile.lock
index 3e51d38..38fa8b0 100644
--- a/tests/ats/Pipfile.lock
+++ b/tests/ats/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "f3e89ff71abe9adc7d66f0b4991d1bc503e92a08a80961441693a232fd8117c6"
+            "sha256": "42ffe3644a2670e6588481a2983bd7c94510f44e1591a145e02d477dbc5ab29b"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -173,7 +173,6 @@
                 "sha256:46de8e17ed87c1a1014667d60e7d94a1f3fa2b8037b41e67d32c28b5869af35d",
                 "sha256:63f20f634bfcd83966edec32f892286f75dffb817a2c097434ecc039e558ec8f"
             ],
-            "index": "pypi",
             "markers": "python_version >= '3.8' and python_version < '4'",
             "version": "==23.6.0"
         },
@@ -182,7 +181,6 @@
                 "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac",
                 "sha256:d989d136982de4e3b29dabcc838ad581c64e8ed52c11fbe86ddebd9da0818cd5"
             ],
-            "index": "pypi",
             "markers": "python_version >= '3.7'",
             "version": "==7.4.3"
         },
@@ -195,15 +193,6 @@
             "markers": "python_full_version >= '3.8.1' and python_full_version < '4.0.0'",
             "version": "==1.1.2"
         },
-        "pytest-rerunfailures": {
-            "hashes": [
-                "sha256:784f462fa87fe9bdf781d0027d856b47a4bfe6c12af108f6bd887057a917b48e",
-                "sha256:9a1afd04e21b8177faf08a9bbbf44de7a0fe3fc29f8ddbe83b9684bd5f8f92a9"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==12.0"
-        },
         "pyyaml": {
             "hashes": [
                 "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5",
@@ -257,7 +246,6 @@
                 "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d",
                 "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"
             ],
-            "index": "pypi",
             "markers": "python_version >= '3.6'",
             "version": "==6.0.1"
         },
@@ -266,7 +254,6 @@
                 "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f",
                 "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"
             ],
-            "index": "pypi",
             "markers": "python_version >= '3.7'",
             "version": "==2.31.0"
         },
diff --git a/tests/ats/pytest.ini b/tests/ats/pytest.ini
new file mode 100644
index 0000000..44023a2
--- /dev/null
+++ b/tests/ats/pytest.ini
@@ -0,0 +1,5 @@
+[pytest]
+markers =
+    smoke
+    functional
+    upgrade
diff --git a/tests/kind_config.yaml b/tests/cluster.yaml
similarity index 100%
rename from tests/kind_config.yaml
rename to tests/cluster.yaml