fix-up deployer helm-upgrade-decision tests

2i2c-org · Dec 16, 2024 · e69e856 · e69e856
1 parent db25720
commit e69e856
Show file tree

Hide file tree

Showing 3 changed files with 165 additions and 143 deletions.
diff --git a/deployer/commands/generate/helm_upgrade/decision.py b/deployer/commands/generate/helm_upgrade/decision.py
@@ -252,11 +252,11 @@ def generate_support_matrix_jobs(
 
             if upgrade_support_on_all_clusters:
                 if pr_labels and "deployer:deploy-support" in pr_labels:
-                    matrix_job["reason_for_support_redeploy"] = (
+                    matrix_job["reason_for_redeploy"] = (
                         "deployer:deploy-support label detected"
                     )
                 else:
-                    matrix_job["reason_for_support_redeploy"] = (
+                    matrix_job["reason_for_redeploy"] = (
                         "Support helm chart has been modified"
                     )
 
@@ -336,7 +336,6 @@ def assign_staging_jobs_for_missing_clusters(
                 hub["name"]
                 for hub in cluster_config.get("hubs")
                 if "staging" in hub["name"]
-                and cluster_config["name"] == missing_cluster
             ]
 
             for staging_hub in staging_hubs:

diff --git a/tests/test-clusters/cluster3/cluster.yaml b/tests/test-clusters/cluster3/cluster.yaml
@@ -0,0 +1,16 @@
+name: cluster1
+provider: gcp
+support:
+  helm_chart_values_files:
+    - support.values.yaml
+hubs:
+  - name: staging1
+    helm_chart_values_files:
+      - staging1.values.yaml
+  - name: staging2
+    helm_chart_values_files:
+      - staging2.values.yaml
+  - name: prod
+    helm_chart_values_files:
+      - prod.values.yaml
+