fix(gitlab-ci): prevent empty stages and missing deploy job when kubernetes disabled (BUG-1)

Co-authored-by: chefgs <7605658+chefgs@users.noreply.github.com>

Author: Copilot

cli/scaffold_gitlab.py

@@ -93,7 +93,7 @@ def _global_section(args):
         stages.append("build")
     if args.type in ("test", "complete"):
         stages.append("test")
-    if args.type in ("deploy", "complete") and args.kubernetes:
+    if args.type == "deploy" or (args.type == "complete" and args.kubernetes):
         stages.append("deploy")
 
     return {
@@ -225,9 +225,22 @@ def _test_job(lang_config):
 
 
 def _deploy_job(args):
-    """Kubernetes deploy job."""
+    """Kubernetes deploy job, or a generic deploy stub when kubernetes is disabled."""
     if not args.kubernetes:
-        return {}
+        protected_branches = [b.strip() for b in args.branches.split(",")]
+        rules = [
+            {"if": f"$CI_COMMIT_BRANCH == \"{b}\"", "when": "manual" if b != protected_branches[0] else "on_success"}
+            for b in protected_branches
+        ]
+        return {
+            "deploy": {
+                "stage": "deploy",
+                "script": [
+                    "echo \"Deploy stage — configure your deployment scripts here\"",
+                ],
+                "rules": rules,
+            }
+        }
 
     protected_branches = [b.strip() for b in args.branches.split(",")]
 
@@ -298,7 +311,7 @@ def generate_pipeline(args, custom_values):
     if args.type in ("test", "complete"):
         pipeline.update(_test_job(lang_config))
 
-    if args.type in ("deploy", "complete") and args.kubernetes:
+    if args.type == "deploy" or (args.type == "complete" and args.kubernetes):
         pipeline.update(_deploy_job(args))
 
     pipeline.update(custom_values)

tests/test_comprehensive.py

@@ -614,22 +614,13 @@ def test_build_job_docker_services(self):
             # Build job uses docker-in-docker services
             assert "services" in data["build"]
 
-    # BUG-1: deploy pipeline with no kubernetes produces empty stages list
-    @pytest.mark.xfail(
-        strict=True,
-        reason=(
-            "BUG-1: When type='deploy' and kubernetes=False, _global_section() "
-            "produces an empty stages list because the 'deploy' stage is only "
-            "appended when args.kubernetes is True. A deploy-only pipeline "
-            "without Kubernetes has no valid stages, making it an invalid "
-            "GitLab CI pipeline."
-        ),
-    )
+    # BUG-1 regression: deploy pipeline with no kubernetes must still have stages
     def test_deploy_pipeline_no_kubernetes_empty_stages(self):
         """
         BUG-1: When type='deploy' and kubernetes=False, the generated
         pipeline has an empty stages list, which is invalid for GitLab CI.
-        Expected: at least one stage should be present even for non-k8s deploy.
+        Expected: at least one stage should be present even for non-k8s deploy,
+        and a deploy job stub must be present in the pipeline.
         """
         with tempfile.TemporaryDirectory() as tmp:
             out = os.path.join(tmp, ".gitlab-ci.yml")
@@ -646,6 +637,10 @@ def test_deploy_pipeline_no_kubernetes_empty_stages(self):
             assert len(stages) > 0, (
                 "Expected at least one stage in a deploy pipeline, got: {!r}".format(stages)
             )
+            # A deploy job stub must be present so the pipeline is valid
+            assert "deploy" in data, (
+                "Expected a deploy job in the pipeline, got keys: {!r}".format(list(data.keys()))
+            )
 
 
 # ===========================================================================