Skip to content

Commit 8ceb3b2

Browse files
nupurg-ibmNupur Goyal
andauthored
fix: Automation code for LSF DA (#203)
Changes related to the automation test cases Co-authored-by: Nupur Goyal <nupurgoyal@Nupurs-MacBook-Pro.local>
1 parent 74f1675 commit 8ceb3b2

33 files changed

+1641
-241
lines changed

.tekton/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ https://cloud.ibm.com/devops/getting-started?env_id=ibm:yp:eu-de
3636
3. cluster_prefix
3737
4. zone
3838
5. resource_group
39-
6. cluster_id
39+
6. cluster_name
4040
7. reservation_id
4141

4242
For additional assistance, contact the project maintainers.

.tekton/hpcaas/hpcaas-pr-pipeline/hpcaas-pipeline-git-pr-status.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ spec:
6060
- name: management_image_name
6161
description: Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Cloud HPC cluster management nodes. By default, the solution uses a RHEL88 base image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). If you would like to include your application-specific binary files, follow the instructions in [ Planning for custom images ](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Cloud HPC cluster through this offering.
6262
default: ""
63-
- name: cluster_id
63+
- name: cluster_name
6464
description: Ensure that you have received the cluster ID from IBM technical sales. A unique identifer for HPC cluster used by IBM Cloud HPC to differentiate different HPC clusters within the same reservation. This can be up to 39 alphanumeric characters including the underscore (_), the hyphen (-), and the period (.) characters. You cannot change the cluster ID after deployment.
6565
default: ""
6666
- name: reservation_id
@@ -223,8 +223,8 @@ spec:
223223
value: $(params.login_image_name)
224224
- name: management_image_name
225225
value: $(params.management_image_name)
226-
- name: cluster_id
227-
value: $(params.cluster_id)
226+
- name: cluster_name
227+
value: $(params.cluster_name)
228228
- name: reservation_id
229229
value: $(params.reservation_id)
230230
- name: pr-revision
@@ -279,8 +279,8 @@ spec:
279279
value: $(params.login_image_name)
280280
- name: management_image_name
281281
value: $(params.management_image_name)
282-
- name: cluster_id
283-
value: $(params.cluster_id)
282+
- name: cluster_name
283+
value: $(params.cluster_name)
284284
- name: reservation_id
285285
value: $(params.reservation_id)
286286
- name: pr-revision

.tekton/hpcaas/hpcaas-pr-pipeline/listener-git-pr-status.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ spec:
5555
- name: management_image_name
5656
description: Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Cloud HPC cluster management nodes. By default, the solution uses a RHEL88 base image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). If you would like to include your application-specific binary files, follow the instructions in [ Planning for custom images ](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Cloud HPC cluster through this offering.
5757
default: ""
58-
- name: cluster_id
58+
- name: cluster_name
5959
description: Ensure that you have received the cluster ID from IBM technical sales. A unique identifer for HPC cluster used by IBM Cloud HPC to differentiate different HPC clusters within the same reservation. This can be up to 39 alphanumeric characters including the underscore (_), the hyphen (-), and the period (.) characters. You cannot change the cluster ID after deployment.
6060
default: ""
6161
- name: reservation_id
@@ -169,8 +169,8 @@ spec:
169169
value: $(params.login_image_name)
170170
- name: management_image_name
171171
value: $(params.management_image_name)
172-
- name: cluster_id
173-
value: $(params.cluster_id)
172+
- name: cluster_name
173+
value: $(params.cluster_name)
174174
- name: reservation_id
175175
value: $(params.reservation_id)
176176
- name: us_east_zone

.tekton/hpcaas/hpcaas-regression-pipeline/hpcaas-pipeline-git-trigger.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
- name: management_image_name
6363
description: Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Cloud HPC cluster management nodes. By default, the solution uses a RHEL88 base image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). If you would like to include your application-specific binary files, follow the instructions in [ Planning for custom images ](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Cloud HPC cluster through this offering.
6464
default: ""
65-
- name: cluster_id
65+
- name: cluster_name
6666
description: Ensure that you have received the cluster ID from IBM technical sales. A unique identifer for HPC cluster used by IBM Cloud HPC to differentiate different HPC clusters within the same reservation. This can be up to 39 alphanumeric characters including the underscore (_), the hyphen (-), and the period (.) characters. You cannot change the cluster ID after deployment.
6767
default: ""
6868
- name: reservation_id
@@ -214,8 +214,8 @@ spec:
214214
value: $(params.login_image_name)
215215
- name: management_image_name
216216
value: $(params.management_image_name)
217-
- name: cluster_id
218-
value: $(params.cluster_id)
217+
- name: cluster_name
218+
value: $(params.cluster_name)
219219
- name: reservation_id
220220
value: $(params.reservation_id)
221221
- name: us_east_zone
@@ -288,8 +288,8 @@ spec:
288288
value: $(params.login_image_name)
289289
- name: management_image_name
290290
value: $(params.management_image_name)
291-
- name: cluster_id
292-
value: $(params.cluster_id)
291+
- name: cluster_name
292+
value: $(params.cluster_name)
293293
- name: reservation_id
294294
value: $(params.reservation_id)
295295
- name: us_east_zone
@@ -362,8 +362,8 @@ spec:
362362
value: $(params.login_image_name)
363363
- name: management_image_name
364364
value: $(params.management_image_name)
365-
- name: cluster_id
366-
value: $(params.cluster_id)
365+
- name: cluster_name
366+
value: $(params.cluster_name)
367367
- name: reservation_id
368368
value: $(params.reservation_id)
369369
- name: us_east_zone
@@ -436,8 +436,8 @@ spec:
436436
value: $(params.login_image_name)
437437
- name: management_image_name
438438
value: $(params.management_image_name)
439-
- name: cluster_id
440-
value: $(params.cluster_id)
439+
- name: cluster_name
440+
value: $(params.cluster_name)
441441
- name: reservation_id
442442
value: $(params.reservation_id)
443443
- name: us_east_zone

.tekton/hpcaas/hpcaas-regression-pipeline/listener-git-trigger.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
- name: management_image_name
6363
description: Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Cloud HPC cluster management nodes. By default, the solution uses a RHEL88 base image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). If you would like to include your application-specific binary files, follow the instructions in [ Planning for custom images ](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Cloud HPC cluster through this offering.
6464
default: ""
65-
- name: cluster_id
65+
- name: cluster_name
6666
description: Ensure that you have received the cluster ID from IBM technical sales. A unique identifer for HPC cluster used by IBM Cloud HPC to differentiate different HPC clusters within the same reservation. This can be up to 39 alphanumeric characters including the underscore (_), the hyphen (-), and the period (.) characters. You cannot change the cluster ID after deployment.
6767
default: ""
6868
- name: reservation_id
@@ -182,8 +182,8 @@ spec:
182182
value: $(params.login_image_name)
183183
- name: management_image_name
184184
value: $(params.management_image_name)
185-
- name: cluster_id
186-
value: $(params.cluster_id)
185+
- name: cluster_name
186+
value: $(params.cluster_name)
187187
- name: reservation_id
188188
value: $(params.reservation_id)
189189
- name: us_east_zone
@@ -259,8 +259,8 @@ spec:
259259
value: $(params.management_image_name)
260260
- name: reservation_id
261261
value: $(params.reservation_id)
262-
- name: cluster_id
263-
value: $(params.cluster_id)
262+
- name: cluster_name
263+
value: $(params.cluster_name)
264264
- name: us_east_zone
265265
value: $(params.us_east_zone)
266266
- name: us_east_cluster_id
@@ -350,7 +350,7 @@ spec:
350350
value: $(event.ref)
351351
- name: resource_group
352352
value: $(event.ref)
353-
- name: cluster_id
353+
- name: cluster_name
354354
value: $(event.ref)
355355
- name: compute_image_name_rhel
356356
value: $(event.ref)

.tekton/hpcaas/hpcaas_task/hpcaas-task-infra-rhel.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
- name: login_image_name
5454
description: Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Cloud HPC cluster login node. By default, the solution uses a RHEL 8-6 OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/hpc-spectrum-LSF#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v2). If you would like to include your application-specific binary files, follow the instructions in [ Planning for custom images ](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Cloud HPC cluster through this offering.
5555
default: ""
56-
- name: cluster_id
56+
- name: cluster_name
5757
description: Ensure that you have received the cluster ID from IBM technical sales. A unique identifer for HPC cluster used by IBM Cloud HPC to differentiate different HPC clusters within the same reservation. This can be up to 39 alphanumeric characters including the underscore (_), the hyphen (-), and the period (.) characters. You cannot change the cluster ID after deployment.
5858
default: ""
5959
- name: reservation_id
@@ -127,6 +127,10 @@ spec:
127127
name: $(params.continuous-delivery-context-secret)
128128
key: $(params.ibmcloud-apikey-secret-key)
129129
optional: true
130+
- name: BUILD_NUMBER
131+
valueFrom:
132+
fieldRef:
133+
fieldPath: metadata.annotations['devops.cloud.ibm.com/build-number']
130134
- name: PIPELINE_DEBUG
131135
value: $(params.pipeline-debug)
132136
- name: REVISION
@@ -141,8 +145,8 @@ spec:
141145
value: $(params.compute_image_name_rhel)
142146
- name: login_image_name
143147
value: $(params.login_image_name)
144-
- name: cluster_id
145-
value: $(params.cluster_id)
148+
- name: cluster_name
149+
value: $(params.cluster_name)
146150
- name: reservation_id
147151
value: $(params.reservation_id)
148152
- name: us_east_zone

.tekton/hpcaas/hpcaas_task/hpcaas-task-negative.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
- name: login_image_name
5454
description: Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Cloud HPC cluster login node. By default, the solution uses a RHEL 8-6 OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/hpc-spectrum-LSF#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v2). If you would like to include your application-specific binary files, follow the instructions in [ Planning for custom images ](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Cloud HPC cluster through this offering.
5555
default: ""
56-
- name: cluster_id
56+
- name: cluster_name
5757
description: Ensure that you have received the cluster ID from IBM technical sales. A unique identifer for HPC cluster used by IBM Cloud HPC to differentiate different HPC clusters within the same reservation. This can be up to 39 alphanumeric characters including the underscore (_), the hyphen (-), and the period (.) characters. You cannot change the cluster ID after deployment.
5858
default: ""
5959
- name: reservation_id
@@ -127,6 +127,10 @@ spec:
127127
name: $(params.continuous-delivery-context-secret)
128128
key: $(params.ibmcloud-apikey-secret-key)
129129
optional: true
130+
- name: BUILD_NUMBER
131+
valueFrom:
132+
fieldRef:
133+
fieldPath: metadata.annotations['devops.cloud.ibm.com/build-number']
130134
- name: PIPELINE_DEBUG
131135
value: $(params.pipeline-debug)
132136
- name: REVISION
@@ -141,8 +145,8 @@ spec:
141145
value: $(params.compute_image_name_rhel)
142146
- name: login_image_name
143147
value: $(params.login_image_name)
144-
- name: cluster_id
145-
value: $(params.cluster_id)
148+
- name: cluster_name
149+
value: $(params.cluster_name)
146150
- name: reservation_id
147151
value: $(params.reservation_id)
148152
- name: us_east_zone

.tekton/hpcaas/hpcaas_task/hpcaas-task-pr-rhel.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ spec:
5151
- name: login_image_name
5252
description: Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Cloud HPC cluster login node. By default, the solution uses a RHEL 8-6 OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/hpc-spectrum-LSF#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v2). If you would like to include your application-specific binary files, follow the instructions in [ Planning for custom images ](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Cloud HPC cluster through this offering.
5353
default: ""
54-
- name: cluster_id
54+
- name: cluster_name
5555
description: Ensure that you have received the cluster ID from IBM technical sales. A unique identifer for HPC cluster used by IBM Cloud HPC to differentiate different HPC clusters within the same reservation. This can be up to 39 alphanumeric characters including the underscore (_), the hyphen (-), and the period (.) characters. You cannot change the cluster ID after deployment.
5656
default: ""
5757
- name: reservation_id
@@ -101,6 +101,10 @@ spec:
101101
name: $(params.continuous-delivery-context-secret)
102102
key: $(params.ibmcloud-apikey-secret-key)
103103
optional: true
104+
- name: BUILD_NUMBER
105+
valueFrom:
106+
fieldRef:
107+
fieldPath: metadata.annotations['devops.cloud.ibm.com/build-number']
104108
- name: PIPELINE_DEBUG
105109
value: $(params.pipeline-debug)
106110
- name: PR_REVISION
@@ -120,8 +124,8 @@ spec:
120124
value: $(params.compute_image_name_rhel)
121125
- name: login_image_name
122126
value: $(params.login_image_name)
123-
- name: cluster_id
124-
value: $(params.cluster_id)
127+
- name: cluster_name
128+
value: $(params.cluster_name)
125129
- name: reservation_id
126130
value: $(params.reservation_id)
127131
- name: cos_region

.tekton/hpcaas/hpcaas_task/hpcaas-task-pr-ubuntu.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ spec:
5151
- name: login_image_name
5252
description: Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Cloud HPC cluster login node. By default, the solution uses a RHEL 8-6 OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/hpc-spectrum-LSF#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v2). If you would like to include your application-specific binary files, follow the instructions in [ Planning for custom images ](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Cloud HPC cluster through this offering.
5353
default: ""
54-
- name: cluster_id
54+
- name: cluster_name
5555
description: Ensure that you have received the cluster ID from IBM technical sales. A unique identifer for HPC cluster used by IBM Cloud HPC to differentiate different HPC clusters within the same reservation. This can be up to 39 alphanumeric characters including the underscore (_), the hyphen (-), and the period (.) characters. You cannot change the cluster ID after deployment.
5656
default: ""
5757
- name: reservation_id
@@ -101,6 +101,10 @@ spec:
101101
name: $(params.continuous-delivery-context-secret)
102102
key: $(params.ibmcloud-apikey-secret-key)
103103
optional: true
104+
- name: BUILD_NUMBER
105+
valueFrom:
106+
fieldRef:
107+
fieldPath: metadata.annotations['devops.cloud.ibm.com/build-number']
104108
- name: PIPELINE_DEBUG
105109
value: $(params.pipeline-debug)
106110
- name: PR_REVISION
@@ -120,8 +124,8 @@ spec:
120124
value: $(params.compute_image_name_ubuntu)
121125
- name: login_image_name
122126
value: $(params.login_image_name)
123-
- name: cluster_id
124-
value: $(params.cluster_id)
127+
- name: cluster_name
128+
value: $(params.cluster_name)
125129
- name: reservation_id
126130
value: $(params.reservation_id)
127131
- name: cos_region

.tekton/hpcaas/hpcaas_task/hpcaas-task-region.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
- name: login_image_name
5454
description: Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Cloud HPC cluster login node. By default, the solution uses a RHEL 8-6 OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/hpc-spectrum-LSF#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v2). If you would like to include your application-specific binary files, follow the instructions in [ Planning for custom images ](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Cloud HPC cluster through this offering.
5555
default: ""
56-
- name: cluster_id
56+
- name: cluster_name
5757
description: Ensure that you have received the cluster ID from IBM technical sales. A unique identifer for HPC cluster used by IBM Cloud HPC to differentiate different HPC clusters within the same reservation. This can be up to 39 alphanumeric characters including the underscore (_), the hyphen (-), and the period (.) characters. You cannot change the cluster ID after deployment.
5858
default: ""
5959
- name: reservation_id
@@ -127,6 +127,10 @@ spec:
127127
name: $(params.continuous-delivery-context-secret)
128128
key: $(params.ibmcloud-apikey-secret-key)
129129
optional: true
130+
- name: BUILD_NUMBER
131+
valueFrom:
132+
fieldRef:
133+
fieldPath: metadata.annotations['devops.cloud.ibm.com/build-number']
130134
- name: PIPELINE_DEBUG
131135
value: $(params.pipeline-debug)
132136
- name: REVISION
@@ -141,8 +145,8 @@ spec:
141145
value: $(params.compute_image_name_rhel)
142146
- name: login_image_name
143147
value: $(params.login_image_name)
144-
- name: cluster_id
145-
value: $(params.cluster_id)
148+
- name: cluster_name
149+
value: $(params.cluster_name)
146150
- name: reservation_id
147151
value: $(params.reservation_id)
148152
- name: us_east_zone

0 commit comments

Comments
 (0)