Merge pull request #647 from abays/stage_names

[OSPRH-21514] Ensure that all automation files have stage names

This will make maintaining kustomizations in CIFMW and jobs easier to maintain, because using stage indices instead does not tolerate stage addition/removal without corresponding changes elsewhere in the kustomization logic.
Jira: https://issues.redhat.com/browse/OSPRH-21514
Assisted-by: Cursor AI (Composer-1)

Reviewed-by: John Fulton <[email protected]>

Author: softwarefactory-project-zuul[bot]

automation/vars/bmo01.yaml

@@ -2,7 +2,8 @@
 vas:
   bmo01:
     stages:
-      - path: examples/dt/bmo01/control-plane/nncp
+      - name: nncp-configuration
+        path: examples/dt/bmo01/control-plane/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -24,6 +25,7 @@ vas:
             kind: Node
             resource_name: master-0
             state: patched
+        name: control-plane
         path: examples/dt/bmo01/control-plane
         wait_conditions:
           - >-
@@ -50,6 +52,7 @@ vas:
             kind: Provisioning
             resource_name: provisioning-configuration
             state: patched
+        name: baremetalhosts-configuration
         path: examples/dt/bmo01/dataplane/baremetalhosts
         wait_conditions:
           - >-
@@ -62,7 +65,8 @@ vas:
             src_file: values.yaml
         build_output: baremetalhosts.yaml
 
-      - path: examples/dt/bmo01/dataplane/secrets
+      - name: dataplane-secrets
+        path: examples/dt/bmo01/dataplane/secrets
         wait_conditions:
           - >-
             oc -n openstack wait secrets dataplane-ansible-ssh-private-key-secret
@@ -75,7 +79,8 @@ vas:
             src_file: values.yaml
         build_output: dataplane-secrets.yaml
 
-      - path: examples/dt/bmo01/dataplane/nodesets
+      - name: dataplane-nodesets
+        path: examples/dt/bmo01/dataplane/nodesets
         wait_conditions:
           - >-
             oc -n openstack wait openstackdataplanenodesets
@@ -92,7 +97,8 @@ vas:
             src_file: values.yaml
         build_output: dataplane-nodesets.yaml
 
-      - path: examples/dt/bmo01/dataplane
+      - name: edpm-deployment
+        path: examples/dt/bmo01/dataplane
         wait_conditions:
           - >-
             oc -n openstack wait openstackdataplanenodesets

automation/vars/dcn.yaml

@@ -2,7 +2,8 @@
 vas:
   dcn:
     stages:
-      - path: examples/dt/dcn/control-plane/nncp
+      - name: nncp-configuration
+        path: examples/dt/dcn/control-plane/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -14,7 +15,8 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
-      - path: examples/dt/dcn/control-plane
+      - name: control-plane
+        path: examples/dt/dcn/control-plane
         wait_conditions:
           - >-
             oc -n openstack wait osctlplane controlplane --for condition=Ready

automation/vars/dz-storage.yaml

@@ -94,7 +94,8 @@ vas:
             src_file: nncp/values.yaml
         build_output: networking.yaml
 
-      - path: examples/dt/dz-storage/topology
+      - name: topology-configuration
+        path: examples/dt/dz-storage/topology
         wait_conditions:
           - >-
             oc -n openstack wait

automation/vars/nfv-ovs-dpdk-sriov-adoption.yaml

@@ -2,7 +2,8 @@
 vas:
   nfv-ovs-dpdk-sriov-adoption:
     stages:
-      - path: examples/va/nfv/ovs-dpdk-sriov/nncp
+      - name: nncp-configuration
+        path: examples/va/nfv/ovs-dpdk-sriov/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp

automation/vars/nfv-ovs-dpdk-sriov-hci.yaml

@@ -2,7 +2,8 @@
 vas:
   nfv-ovs-dpdk-sriov-hci:
     stages:
-      - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane/nncp
+      - name: nncp-configuration
+        path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -14,7 +15,8 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
-      - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane
+      - name: control-plane
+        path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane
         wait_conditions:
           - >-
             oc -n openstack wait osctlplane controlplane --for condition=Ready
@@ -26,7 +28,8 @@ vas:
             src_file: nncp/values.yaml
         build_output: ../control-plane.yaml
 
-      - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/edpm-pre-ceph/nodeset
+      - name: edpm-pre-ceph-nodeset
+        path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/edpm-pre-ceph/nodeset
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -37,7 +40,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset-pre-ceph.yaml
 
-      - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/edpm-pre-ceph/deployment
+      - name: edpm-pre-ceph-deployment
+        path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/edpm-pre-ceph/deployment
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -55,7 +59,8 @@ vas:
             extra_vars:
               cifmw_cephadm_log_path: /home/zuul/ci-framework-data/logs/ceph
 
-      - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci
+      - name: edpm-post-ceph-nodeset
+        path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -68,7 +73,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset-post-ceph.yaml
 
-      - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/deployment
+      - name: edpm-post-ceph-deployment
+        path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/deployment
         wait_conditions:
           - >-
             oc -n openstack

automation/vars/nova-three-cells.yaml

@@ -2,7 +2,8 @@
 vas:
   nova-three-cells:
     stages:
-      - path: examples/dt/nova/nova-three-cells/control-plane/nncp
+      - name: nncp-configuration
+        path: examples/dt/nova/nova-three-cells/control-plane/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -14,7 +15,8 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
-      - path: examples/dt/nova/nova-three-cells/control-plane
+      - name: control-plane
+        path: examples/dt/nova/nova-three-cells/control-plane
         wait_conditions:
           - >-
             oc -n openstack wait osctlplane controlplane --for condition=Ready
@@ -26,7 +28,8 @@ vas:
             src_file: service-values.yaml
         build_output: control-plane.yaml
 
-      - path: examples/dt/nova/nova-three-cells/edpm/nodeset
+      - name: edpm-nodeset
+        path: examples/dt/nova/nova-three-cells/edpm/nodeset
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -37,7 +40,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset.yaml
 
-      - path: examples/dt/nova/nova-three-cells/edpm/nodeset2
+      - name: edpm-nodeset2
+        path: examples/dt/nova/nova-three-cells/edpm/nodeset2
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -48,7 +52,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset2.yaml
 
-      - path: examples/dt/nova/nova-three-cells/edpm/deployment
+      - name: edpm-deployment
+        path: examples/dt/nova/nova-three-cells/edpm/deployment
         wait_conditions:
           - >-
             oc -n openstack wait openstackdataplanedeployment

automation/vars/nova01alpha.yaml

@@ -2,7 +2,8 @@
 vas:
   nova01alpha:
     stages:
-      - path: examples/dt/nova/nova01alpha/nncp
+      - name: nncp-configuration
+        path: examples/dt/nova/nova01alpha/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -14,7 +15,8 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
-      - path: examples/dt/nova/nova01alpha
+      - name: control-plane
+        path: examples/dt/nova/nova01alpha
         wait_conditions:
           - >-
             oc -n openstack wait osctlplane controlplane --for condition=Ready
@@ -26,7 +28,8 @@ vas:
             src_file: service-values.yaml
         build_output: control-plane.yaml
 
-      - path: examples/dt/nova/nova01alpha/edpm/nodeset
+      - name: edpm-nodeset
+        path: examples/dt/nova/nova01alpha/edpm/nodeset
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -37,7 +40,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset.yaml
 
-      - path: examples/dt/nova/nova01alpha/edpm/deployment
+      - name: edpm-deployment
+        path: examples/dt/nova/nova01alpha/edpm/deployment
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -48,7 +52,8 @@ vas:
             src_file: values.yaml
         build_output: deployment.yaml
 
-      - path: examples/dt/nova/nova01alpha/edpm-post-driver/deployment
+      - name: edpm-post-driver-deployment
+        path: examples/dt/nova/nova01alpha/edpm-post-driver/deployment
         wait_conditions:
           - >-
             oc -n openstack wait

automation/vars/nova02beta.yaml

@@ -2,7 +2,8 @@
 vas:
   nova02beta:
     stages:
-      - path: examples/dt/nova/nova02beta/networking/nncp
+      - name: nncp-configuration
+        path: examples/dt/nova/nova02beta/networking/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -14,7 +15,8 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
-      - path: examples/dt/nova/nova02beta/networking
+      - name: network-configuration
+        path: examples/dt/nova/nova02beta/networking
         wait_conditions:
           - >-
             oc -n metallb-system wait pod
@@ -26,7 +28,8 @@ vas:
             src_file: nncp/values.yaml
         build_output: network.yaml
 
-      - path: examples/dt/nova/nova02beta
+      - name: control-plane
+        path: examples/dt/nova/nova02beta
         wait_conditions:
           - >-
             oc -n openstack wait osctlplane controlplane --for condition=Ready
@@ -38,7 +41,8 @@ vas:
             src_file: service-values.yaml
         build_output: control-plane.yaml
 
-      - path: examples/dt/nova/nova02beta/edpm/nodeset
+      - name: edpm-nodeset
+        path: examples/dt/nova/nova02beta/edpm/nodeset
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -49,7 +53,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset.yaml
 
-      - path: examples/dt/nova/nova02beta/edpm/nodeset2
+      - name: edpm-nodeset2
+        path: examples/dt/nova/nova02beta/edpm/nodeset2
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -60,7 +65,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset2.yaml
 
-      - path: examples/dt/nova/nova02beta/edpm/deployment
+      - name: edpm-deployment
+        path: examples/dt/nova/nova02beta/edpm/deployment
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -71,7 +77,8 @@ vas:
             src_file: values.yaml
         build_output: deployment.yaml
 
-      - path: examples/dt/nova/nova02beta/edpm-post-driver/deployment
+      - name: edpm-post-driver-deployment
+        path: examples/dt/nova/nova02beta/edpm-post-driver/deployment
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -82,7 +89,8 @@ vas:
             src_file: values.yaml
         build_output: post-driver-deployment.yaml
 
-      - path: examples/dt/nova/nova02beta/edpm-deploy-provider/dataplaneservice
+      - name: edpm-provider-dataplaneservice
+        path: examples/dt/nova/nova02beta/edpm-deploy-provider/dataplaneservice
         wait_conditions:
           - >-
             oc -n default wait
@@ -93,7 +101,8 @@ vas:
             src_file: values.yaml
         build_output: provider-dataplaneservice.yaml
 
-      - path: examples/dt/nova/nova02beta/edpm-deploy-provider/deployment
+      - name: edpm-provider-deployment
+        path: examples/dt/nova/nova02beta/edpm-deploy-provider/deployment
         wait_conditions:
           - >-
             oc -n openstack wait