Skip to content

Commit 9225e06

Browse files
Merge pull request #543 from eduolivares/bgp-automation-steps-name
Add names to BGP automation steps Recent changes in ci-framework allow to configure user kustomize data for the automation steps referring to those steps with <stage_name> instead of stage_<number>. Names were added to other DT automation files, but not to BGP. Related-ticket: OSPRH-15775 Reviewed-by: Andrew Bays <[email protected]>
2 parents 6ab2341 + 7f19a09 commit 9225e06

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

automation/vars/bgp-l3-xl.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ vas:
6363
resource_name: openshift-no-reapply-sysctl
6464
namespace: openshift-cluster-node-tuning-operator
6565
state: present
66+
name: nncp-configuration
6667
path: examples/dt/bgp-l3-xl/control-plane/nncp
6768
wait_conditions:
6869
- >-
@@ -75,7 +76,8 @@ vas:
7576
src_file: values.yaml
7677
build_output: nncp.yaml
7778

78-
- path: examples/dt/bgp-l3-xl/control-plane
79+
- name: control-plane
80+
path: examples/dt/bgp-l3-xl/control-plane
7981
wait_conditions:
8082
- >-
8183
oc -n openstack wait openstackcontrolplane
@@ -99,7 +101,7 @@ vas:
99101
namespace: openstack
100102
state: present
101103

102-
- # stage_2
104+
- name: edpm-computes-r0-nodeset
103105
path: examples/dt/bgp-l3-xl/edpm/computes/r0
104106
wait_conditions:
105107
- >-
@@ -112,7 +114,7 @@ vas:
112114
src_file: values.yaml
113115
build_output: edpm-r0-compute-nodeset.yaml
114116

115-
- # stage_3
117+
- name: edpm-computes-r1-nodeset
116118
path: examples/dt/bgp-l3-xl/edpm/computes/r1
117119
wait_conditions:
118120
- >-
@@ -125,7 +127,7 @@ vas:
125127
src_file: values.yaml
126128
build_output: edpm-r1-compute-nodeset.yaml
127129

128-
- # stage_4
130+
- name: edpm-computes-r2-nodeset
129131
path: examples/dt/bgp-l3-xl/edpm/computes/r2
130132
wait_conditions:
131133
- >-
@@ -138,7 +140,7 @@ vas:
138140
src_file: values.yaml
139141
build_output: edpm-r2-compute-nodeset.yaml
140142

141-
- # stage_5
143+
- name: edpm-networkers-r0-nodeset
142144
path: examples/dt/bgp-l3-xl/edpm/networkers/r0
143145
wait_conditions:
144146
- >-
@@ -151,7 +153,7 @@ vas:
151153
src_file: values.yaml
152154
build_output: edpm-r0-networker-nodeset.yaml
153155

154-
- # stage_6
156+
- name: edpm-networkers-r1-nodeset
155157
path: examples/dt/bgp-l3-xl/edpm/networkers/r1
156158
wait_conditions:
157159
- >-
@@ -164,7 +166,7 @@ vas:
164166
src_file: values.yaml
165167
build_output: edpm-r1-networker-nodeset.yaml
166168

167-
- # stage_7
169+
- name: edpm-networkers-r2-nodeset
168170
path: examples/dt/bgp-l3-xl/edpm/networkers/r2
169171
wait_conditions:
170172
- >-
@@ -177,7 +179,7 @@ vas:
177179
src_file: values.yaml
178180
build_output: edpm-r2-networker-nodeset.yaml
179181

180-
- # stage_8
182+
- name: edpm-deployment
181183
path: examples/dt/bgp-l3-xl/edpm/deployment
182184
wait_conditions:
183185
- >-

automation/vars/bgp_dt01.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
vas:
33
bgp_dt01:
44
stages:
5-
- # stage_0
6-
pre_stage_run:
5+
- pre_stage_run:
76
- name: Apply taint on worker-3
87
type: cr
98
definition:
@@ -52,6 +51,7 @@ vas:
5251
resource_name: openshift-no-reapply-sysctl
5352
namespace: openshift-cluster-node-tuning-operator
5453
state: present
54+
name: nncp-configuration
5555
path: examples/dt/bgp_dt01/control-plane/nncp
5656
wait_conditions:
5757
- >-
@@ -64,7 +64,7 @@ vas:
6464
src_file: values.yaml
6565
build_output: nncp.yaml
6666

67-
- # stage_1
67+
- name: control-plane
6868
path: examples/dt/bgp_dt01/control-plane
6969
wait_conditions:
7070
- >-
@@ -89,7 +89,7 @@ vas:
8989
namespace: openstack
9090
state: present
9191

92-
- # stage_2
92+
- name: edpm-computes-r0-nodeset
9393
path: examples/dt/bgp_dt01/edpm/computes/r0
9494
wait_conditions:
9595
- >-
@@ -102,7 +102,7 @@ vas:
102102
src_file: values.yaml
103103
build_output: edpm-r0-compute-nodeset.yaml
104104

105-
- # stage_3
105+
- name: edpm-computes-r1-nodeset
106106
path: examples/dt/bgp_dt01/edpm/computes/r1
107107
wait_conditions:
108108
- >-
@@ -115,7 +115,7 @@ vas:
115115
src_file: values.yaml
116116
build_output: edpm-r1-compute-nodeset.yaml
117117

118-
- # stage_4
118+
- name: edpm-computes-r2-nodeset
119119
path: examples/dt/bgp_dt01/edpm/computes/r2
120120
wait_conditions:
121121
- >-
@@ -128,7 +128,7 @@ vas:
128128
src_file: values.yaml
129129
build_output: edpm-r2-compute-nodeset.yaml
130130

131-
- # stage_5
131+
- name: edpm-networkers-r0-nodeset
132132
path: examples/dt/bgp_dt01/edpm/networkers/r0
133133
wait_conditions:
134134
- >-
@@ -141,7 +141,7 @@ vas:
141141
src_file: values.yaml
142142
build_output: edpm-r0-networker-nodeset.yaml
143143

144-
- # stage_6
144+
- name: edpm-networkers-r1-nodeset
145145
path: examples/dt/bgp_dt01/edpm/networkers/r1
146146
wait_conditions:
147147
- >-
@@ -154,7 +154,7 @@ vas:
154154
src_file: values.yaml
155155
build_output: edpm-r1-networker-nodeset.yaml
156156

157-
- # stage_7
157+
- name: edpm-networkers-r2-nodeset
158158
path: examples/dt/bgp_dt01/edpm/networkers/r2
159159
wait_conditions:
160160
- >-
@@ -167,7 +167,7 @@ vas:
167167
src_file: values.yaml
168168
build_output: edpm-r2-networker-nodeset.yaml
169169

170-
- # stage_8
170+
- name: edpm-deployment
171171
path: examples/dt/bgp_dt01/edpm/deployment
172172
wait_conditions:
173173
- >-

0 commit comments

Comments
 (0)