Merge pull request #519 from sauragar/named_stage

Added name param for stages to get named stages in automation/vars for all unijobs

Ticket: https://issues.redhat.com/browse/OSPNW-971

Reviewed-by: Szymon Datko
Reviewed-by: Andrew Bays <[email protected]>

Author: softwarefactory-project-zuul[bot]

.ci/automation-schema.yaml

@@ -26,6 +26,7 @@ _hook:
   kind: str(required=False)
 ---
 _stage:
+  name: str(required=False)
   path: str()
   wait_conditions: list(str(matches='^(oc|kubectl) .* wait .*'), min=1)
   values: list(include('_values'), min=1)

automation/vars/hci-adoption.yaml

@@ -2,7 +2,8 @@
 vas:
   hci-adoption:
     stages:
-      - path: examples/va/hci/control-plane/networking/nncp
+      - name: nncp-configuration
+        path: examples/va/hci/control-plane/networking/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -14,7 +15,8 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
-      - path: examples/va/hci/control-plane/networking
+      - name: network-configuration
+        path: examples/va/hci/control-plane/networking
         wait_conditions:
           - >-
             oc -n metallb-system wait pod

automation/vars/hci.yaml

@@ -2,7 +2,8 @@
 vas:
   hci:
     stages:
-      - path: examples/va/hci/control-plane/networking/nncp
+      - name: nncp-configuration
+        path: examples/va/hci/control-plane/networking/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -14,7 +15,8 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
-      - path: examples/va/hci/control-plane/networking
+      - name: network-configuration
+        path: examples/va/hci/control-plane/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/va/hci/control-plane
+      - name: control-plane
+        path: examples/va/hci/control-plane
         wait_conditions:
           - >-
             oc -n openstack wait osctlplane controlplane --for condition=Ready
@@ -38,7 +41,8 @@ vas:
             src_file: networking/nncp/values.yaml
         build_output: ../control-plane.yaml
 
-      - path: examples/va/hci/edpm-pre-ceph/nodeset
+      - name: edpm-pre-ceph-nodeset
+        path: examples/va/hci/edpm-pre-ceph/nodeset
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -49,7 +53,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset-pre-ceph.yaml
 
-      - path: examples/va/hci/edpm-pre-ceph/deployment
+      - name: edpm-pre-ceph-deployment
+        path: examples/va/hci/edpm-pre-ceph/deployment
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -65,7 +70,8 @@ vas:
             source: "../../playbooks/ceph.yml"
             inventory: "${HOME}/ci-framework-data/artifacts/zuul_inventory.yml"
 
-      - path: examples/va/hci
+      - name: edpm-post-ceph-nodeset
+        path: examples/va/hci
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -78,7 +84,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset-post-ceph.yaml
 
-      - path: examples/va/hci/deployment
+      - name: edpm-post-ceph-deployment
+        path: examples/va/hci/deployment
         wait_conditions:
           - >-
             oc -n openstack wait

automation/vars/uni01alpha-adoption.yaml

@@ -12,6 +12,7 @@ vas:
             kind: Node
             resource_name: master-0
             state: patched
+        name: nncp-configuration
         path: examples/dt/uni01alpha/control-plane/networking/nncp
         wait_conditions:
           - >-
@@ -24,7 +25,8 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
-      - path: examples/dt/uni01alpha/control-plane/networking
+      - name: network-configuration
+        path: examples/dt/uni01alpha/control-plane/networking
         wait_conditions:
           - >-
             oc -n metallb-system wait pod

automation/vars/uni01alpha.yaml

@@ -12,6 +12,7 @@ vas:
             kind: Node
             resource_name: master-0
             state: patched
+        name: nncp-configuration
         path: examples/dt/uni01alpha/control-plane/networking/nncp
         wait_conditions:
           - >-
@@ -24,7 +25,8 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
-      - path: examples/dt/uni01alpha/control-plane/networking
+      - name: network-configuration
+        path: examples/dt/uni01alpha/control-plane/networking
         wait_conditions:
           - >-
             oc -n metallb-system wait pod
@@ -35,7 +37,8 @@ vas:
             src_file: nncp/values.yaml
         build_output: networking.yaml
 
-      - path: examples/dt/uni01alpha/control-plane
+      - name: control-plane
+        path: examples/dt/uni01alpha/control-plane
         wait_conditions:
           - >-
             oc -n openstack wait openstackcontrolplane
@@ -49,7 +52,8 @@ vas:
             src_file: service-values.yaml
         build_output: control-plane.yaml
 
-      - path: examples/dt/uni01alpha/networker/nodeset
+      - name: edpm-networker-nodeset
+        path: examples/dt/uni01alpha/networker/nodeset
         wait_conditions:
           - >-
             oc -n openstack wait openstackdataplanenodeset
@@ -61,7 +65,8 @@ vas:
             src_file: values.yaml
         build_output: edpm-networker.yaml
 
-      - path: examples/dt/uni01alpha/networker
+      - name: edpm-networker-deployment
+        path: examples/dt/uni01alpha/networker
         wait_conditions:
           - >-
             oc -n openstack wait openstackdataplanedeployment
@@ -73,7 +78,8 @@ vas:
             src_file: values.yaml
         build_output: edpm-networker.yaml
 
-      - path: examples/dt/uni01alpha/edpm
+      - name: edpm-nodeset
+        path: examples/dt/uni01alpha/edpm
         wait_conditions:
           - >-
             oc -n openstack wait openstackdataplanenodeset
@@ -85,7 +91,8 @@ vas:
             src_file: values.yaml
         build_output: edpm.yaml
 
-      - path: examples/dt/uni01alpha
+      - name: edpm-deployment
+        path: examples/dt/uni01alpha
         wait_conditions:
           - >-
             oc -n openstack wait openstackdataplanedeployment

automation/vars/uni02beta.yaml

@@ -2,7 +2,8 @@
 vas:
   uni02beta:
     stages:
-      - path: examples/dt/uni02beta/control-plane/nncp
+      - name: nncp-configuration
+        path: examples/dt/uni02beta/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/uni02beta/control-plane
+      - name: control-plane
+        path: examples/dt/uni02beta/control-plane
         wait_conditions:
           - >-
             oc -n openstack wait openstackcontrolplane
@@ -28,7 +30,8 @@ vas:
             src_file: service-values.yaml
         build_output: control-plane.yaml
 
-      - path: examples/dt/uni02beta
+      - name: edpm-deployment
+        path: examples/dt/uni02beta
         wait_conditions:
           - >-
             oc -n openstack wait openstackdataplanedeployment

automation/vars/uni04delta-adoption.yaml

@@ -2,7 +2,8 @@
 vas:
   uni04delta-adoption:
     stages:
-      - path: examples/dt/uni04delta/control-plane/networking/nncp
+      - name: nncp-configuration
+        path: examples/dt/uni04delta/control-plane/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/uni04delta/control-plane/networking
+      - name: network-configuration
+        path: examples/dt/uni04delta/control-plane/networking
         wait_conditions:
           - >-
             oc -n metallb-system wait pod

automation/vars/uni04delta-ipv6.yaml

@@ -2,7 +2,8 @@
 vas:
   uni04delta-ipv6:
     stages:
-      - path: examples/dt/uni04delta-ipv6/control-plane/nncp
+      - name: nncp-configuration
+        path: examples/dt/uni04delta-ipv6/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/uni04delta-ipv6/control-plane
+      - name: control-plane
+        path: examples/dt/uni04delta-ipv6/control-plane
         wait_conditions:
           - >-
             oc -n openstack wait osctlplane controlplane
@@ -27,7 +29,8 @@ vas:
             src_file: service-values.yaml
         build_output: control-plane.yaml
 
-      - path: examples/dt/uni04delta-ipv6/edpm-pre-ceph/nodeset
+      - name: edpm-nodeset-pre-ceph
+        path: examples/dt/uni04delta-ipv6/edpm-pre-ceph/nodeset
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -38,7 +41,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset-pre-ceph.yaml
 
-      - path: examples/dt/uni04delta-ipv6/edpm-pre-ceph
+      - name: edpm-deployment-pre-ceph
+        path: examples/dt/uni04delta-ipv6/edpm-pre-ceph
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -54,7 +58,8 @@ vas:
             source: "../../playbooks/ceph.yml"
             inventory: "${HOME}/ci-framework-data/artifacts/zuul_inventory.yml"
 
-      - path: examples/dt/uni04delta-ipv6
+      - name: edpm-nodeset
+        path: examples/dt/uni04delta-ipv6
         wait_conditions:
           - >-
             oc -n openstack wait osdpns
@@ -68,7 +73,8 @@ vas:
             src_file: values.yaml
         build_output: edpm-nodeset.yaml
 
-      - path: examples/dt/uni04delta-ipv6/deployment
+      - name: edpm-deployment
+        path: examples/dt/uni04delta-ipv6/deployment
         wait_conditions:
           - >-
             oc -n openstack wait osdpd

automation/vars/uni04delta.yaml

@@ -2,7 +2,8 @@
 vas:
   uni04delta:
     stages:
-      - path: examples/dt/uni04delta/control-plane/networking/nncp
+      - name: nncp-configuration
+        path: examples/dt/uni04delta/control-plane/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/uni04delta/control-plane/networking
+      - name: network-configuration
+        path: examples/dt/uni04delta/control-plane/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/uni04delta/control-plane
+      - name: control-plane
+        path: examples/dt/uni04delta/control-plane
         wait_conditions:
           - >-
             oc -n openstack wait osctlplane controlplane
@@ -39,7 +42,8 @@ vas:
             src_file: service-values.yaml
         build_output: control-plane.yaml
 
-      - path: examples/dt/uni04delta/edpm-pre-ceph/nodeset
+      - name: edpm-nodeset-pre-ceph
+        path: examples/dt/uni04delta/edpm-pre-ceph/nodeset
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -50,7 +54,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset-pre-ceph.yaml
 
-      - path: examples/dt/uni04delta/edpm-pre-ceph
+      - name: edpm-deployment-pre-ceph
+        path: examples/dt/uni04delta/edpm-pre-ceph
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -66,7 +71,8 @@ vas:
             source: "../../playbooks/ceph.yml"
             inventory: "${HOME}/ci-framework-data/artifacts/zuul_inventory.yml"
 
-      - path: examples/dt/uni04delta
+      - name: edpm-nodeset
+        path: examples/dt/uni04delta
         wait_conditions:
           - >-
             oc -n openstack wait osdpns
@@ -80,7 +86,8 @@ vas:
             src_file: values.yaml
         build_output: edpm-nodeset.yaml
 
-      - path: examples/dt/uni04delta/deployment
+      - name: edpm-deployment
+        path: examples/dt/uni04delta/deployment
         wait_conditions:
           - >-
             oc -n openstack wait osdpd

automation/vars/uni05epsilon-adoption.yaml

@@ -2,7 +2,8 @@
 vas:
   uni05epsilon-adoption:
     stages:
-      - path: examples/dt/uni05epsilon/control-plane/networking/nncp
+      - name: nncp-configuration
+        path: examples/dt/uni05epsilon/control-plane/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/uni05epsilon/control-plane/networking
+      - name: network-configuration
+        path: examples/dt/uni05epsilon/control-plane/networking
         wait_conditions:
           - >-
             oc -n metallb-system wait pod