Skip to content

Commit 6e89b94

Browse files
mbaldessarimbaldessari
authored
Merge pull request #121 from validatedpatterns/use_qe_common_libs
Use qe-common libs, add check for external test
2 parents 896d830 + 88f85fa commit 6e89b94

File tree

2 files changed

+82
-121
lines changed

2 files changed

+82
-121
lines changed

‎tests/interop/test_subscription_status_hub.py

Lines changed: 58 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -56,68 +56,72 @@ def test_subscription_status_hub(openshift_dyn_client):
5656

5757
cluster_version = subscription.openshift_version(openshift_dyn_client)
5858
logger.info(f"Openshift version:\n{cluster_version.instance.status.history}")
59-
shortversion = re.sub("(.[0-9]+$)", "", os.getenv("OPENSHIFT_VER"))
60-
61-
currentfile = os.getcwd() + "/operators_hub_current"
62-
sourceFile = open(currentfile, "w")
63-
for line in operator_versions:
64-
logger.info(line)
65-
print(line, file=sourceFile)
66-
sourceFile.close()
67-
68-
logger.info("Clone operator-versions repo")
69-
try:
70-
operator_versions_repo = (
71-
"[email protected]:mpqe/mps/vp/operator-versions.git"
72-
)
73-
clone = subprocess.run(
74-
["git", "clone", operator_versions_repo], capture_output=True, text=True
75-
)
76-
logger.info(clone.stdout)
77-
logger.info(clone.stderr)
78-
except Exception:
79-
pass
80-
81-
previouspath = os.getcwd() + f"/operator-versions/aegitops_hub_{shortversion}"
82-
previousfile = f"aegitops_hub_{shortversion}"
83-
84-
logger.info("Ensure previous file exists")
85-
checkpath = os.path.exists(previouspath)
86-
logger.info(checkpath)
87-
88-
if checkpath is True:
89-
logger.info("Diff current operator list with previous file")
90-
diff = opdiff(open(previouspath).readlines(), open(currentfile).readlines())
91-
diffstring = "".join(diff)
92-
logger.info(diffstring)
93-
94-
logger.info("Write diff to file")
95-
sourceFile = open("operator_diffs_hub.log", "w")
96-
print(diffstring, file=sourceFile)
59+
60+
if os.getenv("EXTERNAL_TEST") != "true":
61+
shortversion = re.sub("(.[0-9]+$)", "", os.getenv("OPENSHIFT_VER"))
62+
currentfile = os.getcwd() + "/operators_hub_current"
63+
sourceFile = open(currentfile, "w")
64+
for line in operator_versions:
65+
logger.info(line)
66+
print(line, file=sourceFile)
9767
sourceFile.close()
98-
else:
99-
logger.info("Skipping operator diff - previous file not found")
68+
69+
logger.info("Clone operator-versions repo")
70+
try:
71+
operator_versions_repo = (
72+
"[email protected]:mpqe/mps/vp/operator-versions.git"
73+
)
74+
clone = subprocess.run(
75+
["git", "clone", operator_versions_repo], capture_output=True, text=True
76+
)
77+
logger.info(clone.stdout)
78+
logger.info(clone.stderr)
79+
except Exception:
80+
pass
81+
82+
previouspath = os.getcwd() + f"/operator-versions/aegitops_hub_{shortversion}"
83+
previousfile = f"aegitops_hub_{shortversion}"
84+
85+
logger.info("Ensure previous file exists")
86+
checkpath = os.path.exists(previouspath)
87+
logger.info(checkpath)
88+
89+
if checkpath is True:
90+
logger.info("Diff current operator list with previous file")
91+
diff = opdiff(open(previouspath).readlines(), open(currentfile).readlines())
92+
diffstring = "".join(diff)
93+
logger.info(diffstring)
94+
95+
logger.info("Write diff to file")
96+
sourceFile = open("operator_diffs_hub.log", "w")
97+
print(diffstring, file=sourceFile)
98+
sourceFile.close()
99+
else:
100+
logger.info("Skipping operator diff - previous file not found")
100101

101102
if missing_subs or unhealthy_subs or missing_installplans or upgrades_pending:
102103
err_msg = "Subscription status check failed"
103104
logger.error(f"FAIL: {err_msg}")
104105
assert False, err_msg
105106
else:
106107
# Only push the new operarator list if the test passed
107-
if checkpath is True:
108-
os.remove(previouspath)
109-
os.rename(currentfile, previouspath)
110-
111-
cwd = os.getcwd() + "/operator-versions"
112-
logger.info(f"CWD: {cwd}")
113-
114-
logger.info("Push new operator list")
115-
subprocess.run(["git", "add", previousfile], cwd=cwd)
116-
subprocess.run(
117-
["git", "commit", "-m", "Update operator versions list"],
118-
cwd=cwd,
119-
)
120-
subprocess.run(["git", "push"], cwd=cwd)
108+
# and we are not testing a pre-release operator nor
109+
# running externally
110+
if os.getenv("EXTERNAL_TEST") != "true":
111+
if checkpath is True and not os.environ["INDEX_IMAGE"]:
112+
os.remove(previouspath)
113+
os.rename(currentfile, previouspath)
114+
115+
cwd = os.getcwd() + "/operator-versions"
116+
logger.info(f"CWD: {cwd}")
117+
118+
logger.info("Push new operator list")
119+
subprocess.run(["git", "add", previousfile], cwd=cwd)
120+
subprocess.run(
121+
["git", "commit", "-m", "Update operator versions list"],
122+
cwd=cwd,
123+
)
124+
subprocess.run(["git", "push"], cwd=cwd)
121125

122126
logger.info("PASS: Subscription status check passed")
123127

‎tests/interop/test_validate_hub_site_components.py

Lines changed: 24 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,8 @@
22
import os
33

44
import pytest
5-
from ocp_resources.route import Route
65
from ocp_resources.storage_class import StorageClass
7-
from openshift.dynamic.exceptions import NotFoundError
8-
from validatedpatterns_tests.interop import components
9-
from validatedpatterns_tests.interop.crd import ArgoCD
10-
from validatedpatterns_tests.interop.edge_util import (
11-
get_long_live_bearer_token,
12-
get_site_response,
13-
)
6+
from validatedpatterns_tests.interop import application, components
147

158
from . import __loggername__
169

@@ -47,26 +40,16 @@ def test_validate_hub_site_components(openshift_dyn_client):
4740
@pytest.mark.validate_hub_site_reachable
4841
def test_validate_hub_site_reachable(kube_config, openshift_dyn_client):
4942
logger.info("Check if hub site API end point is reachable")
50-
hub_api_url = kube_config.host
51-
if not hub_api_url:
52-
err_msg = "Hub site url is missing in kubeconfig file"
53-
logger.error(f"FAIL: {err_msg}")
54-
assert False, err_msg
55-
else:
56-
logger.info(f"HUB api url : {hub_api_url}")
57-
58-
bearer_token = get_long_live_bearer_token(
59-
dyn_client=openshift_dyn_client,
60-
namespace="openshift-gitops",
61-
sub_string="argocd-dex-server-token",
62-
)
63-
64-
if not bearer_token:
65-
assert False, "Bearer token is missing for argocd-dex-server"
66-
67-
hub_api_response = get_site_response(
68-
site_url=hub_api_url, bearer_token=bearer_token
69-
)
43+
namespace = "openshift-gitops"
44+
sub_string = "argocd-dex-server-token"
45+
try:
46+
hub_api_url = application.get_site_api_url(kube_config)
47+
hub_api_response = application.get_site_api_response(
48+
openshift_dyn_client, hub_api_url, namespace, sub_string
49+
)
50+
except AssertionError as e:
51+
logger.error(f"FAIL: {e}")
52+
assert False, e
7053

7154
if hub_api_response.status_code != 200:
7255
err_msg = "Hub site is not reachable. Please check the deployment."
@@ -123,37 +106,24 @@ def test_check_pod_status(openshift_dyn_client):
123106
@pytest.mark.validate_argocd_reachable_hub_site
124107
def test_validate_argocd_reachable_hub_site(openshift_dyn_client):
125108
namespace = "openshift-gitops"
109+
name = "openshift-gitops-server"
110+
sub_string = "argocd-dex-server-token"
126111
logger.info("Check if argocd route/url on hub site is reachable")
127112
try:
128-
for route in Route.get(
129-
dyn_client=openshift_dyn_client,
130-
namespace=namespace,
131-
name="openshift-gitops-server",
132-
):
133-
argocd_route_url = route.instance.spec.host
134-
except NotFoundError:
113+
argocd_route_url = application.get_argocd_route_url(
114+
openshift_dyn_client, namespace, name
115+
)
116+
argocd_route_response = application.get_site_api_response(
117+
openshift_dyn_client, argocd_route_url, namespace, sub_string
118+
)
119+
except StopIteration:
135120
err_msg = "Argocd url/route is missing in open-cluster-management namespace"
136121
logger.error(f"FAIL: {err_msg}")
137122
assert False, err_msg
138-
139-
final_argocd_url = f"{'http://'}{argocd_route_url}"
140-
logger.info(f"ACM route/url : {final_argocd_url}")
141-
142-
bearer_token = get_long_live_bearer_token(
143-
dyn_client=openshift_dyn_client,
144-
namespace=namespace,
145-
sub_string="argocd-dex-server-token",
146-
)
147-
if not bearer_token:
123+
except AssertionError:
148124
err_msg = "Bearer token is missing for argocd-dex-server"
149125
logger.error(f"FAIL: {err_msg}")
150126
assert False, err_msg
151-
else:
152-
logger.debug(f"Argocd bearer token : {bearer_token}")
153-
154-
argocd_route_response = get_site_response(
155-
site_url=final_argocd_url, bearer_token=bearer_token
156-
)
157127

158128
logger.info(f"Argocd route response : {argocd_route_response}")
159129

@@ -171,22 +141,9 @@ def test_validate_argocd_applications_health_hub_site(openshift_dyn_client):
171141
logger.info("Get all applications deployed by argocd on hub site")
172142
projects = ["openshift-gitops", "ansible-edge-gitops-hub"]
173143
for project in projects:
174-
for app in ArgoCD.get(dyn_client=openshift_dyn_client, namespace=project):
175-
app_name = app.instance.metadata.name
176-
app_health = app.instance.status.health.status
177-
app_sync = app.instance.status.sync.status
178-
179-
logger.info(f"Status for {app_name} : {app_health} : {app_sync}")
180-
181-
if "Healthy" != app_health or "Synced" != app_sync:
182-
logger.info(f"Dumping failed resources for app: {app_name}")
183-
unhealthy_apps.append(app_name)
184-
for res in app.instance.status.resources:
185-
if (
186-
res.health and res.health.status != "Healthy"
187-
) or res.status != "Synced":
188-
logger.info(f"\n{res}")
189-
144+
unhealthy_apps += application.get_argocd_application_status(
145+
openshift_dyn_client, project
146+
)
190147
if unhealthy_apps:
191148
err_msg = "Some or all applications deployed on hub site are unhealthy"
192149
logger.error(f"FAIL: {err_msg}:\n{unhealthy_apps}")

0 commit comments

Comments
 (0)