mas-cli 15.7.0__py3-none-any.whl → 15.9.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of mas-cli might be problematic. Click here for more details.

@@ -129,7 +129,7 @@ spec:
129
129
 
130
130
  steps:
131
131
  - name: start-pipelinerun
132
- image: quay.io/ibmmas/cli:15.7.0
132
+ image: quay.io/ibmmas/cli:15.9.0
133
133
  imagePullPolicy: $(params.image_pull_policy)
134
134
  command:
135
135
  - ansible-playbook
@@ -201,7 +201,7 @@ spec:
201
201
  optional: false
202
202
 
203
203
  - name: wait-for-pipelinerun
204
- image: quay.io/ibmmas/cli:15.7.0
204
+ image: quay.io/ibmmas/cli:15.9.0
205
205
  imagePullPolicy: $(params.image_pull_policy)
206
206
  # 50 retries at 5 minute intervals = 4 hours
207
207
  command:
@@ -281,7 +281,7 @@ spec:
281
281
 
282
282
  # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set STATUS=pending and wait for it to be changed to "approved"
283
283
  - name: app-cfg-post-verify
284
- image: quay.io/ibmmas/cli:15.7.0
284
+ image: quay.io/ibmmas/cli:15.9.0
285
285
  imagePullPolicy: $(params.image_pull_policy)
286
286
  command:
287
287
  - /opt/app-root/src/wait-for-configmap.sh
@@ -400,6 +400,10 @@ spec:
400
400
  type: string
401
401
  description:
402
402
  default: "This option is mandatory"
403
+ - name: aiservice_watsonxai_ca_crt
404
+ type: string
405
+ description:
406
+ default: "This option is mandatory"
403
407
 
404
408
  # Tenant Entitlement
405
409
  - name: tenant_entitlement_type
@@ -485,6 +489,8 @@ spec:
485
489
  value: $(params.aiservice_watsonxai_space_id)
486
490
  - name: AISERVICE_WATSONX_ACTION
487
491
  value: $(params.aiservice_watsonx_action)
492
+ - name: AISERVICE_WATSONXAI_CA_CRT
493
+ value: $(params.aiservice_watsonxai_ca_crt)
488
494
 
489
495
  # Tenant Entitlement
490
496
  - name: AISERVICE_TENANT_ENTITLEMENT_TYPE
@@ -507,7 +513,7 @@ spec:
507
513
  command:
508
514
  - /opt/app-root/src/run-role.sh
509
515
  - aiservice_tenant
510
- image: quay.io/ibmmas/cli:15.7.0
516
+ image: quay.io/ibmmas/cli:15.9.0
511
517
  imagePullPolicy: $(params.image_pull_policy)
512
518
  workingDir: /workspace/configs
513
519
 
@@ -599,6 +605,10 @@ spec:
599
605
  type: string
600
606
  description:
601
607
  default: "This option is mandatory"
608
+ - name: aiservice_watsonxai_ca_crt
609
+ type: string
610
+ description:
611
+ default: "This option is mandatory"
602
612
 
603
613
  # AI Broker storage
604
614
  - name: aiservice_s3_accesskey
@@ -706,6 +716,8 @@ spec:
706
716
  value: $(params.aiservice_watsonxai_space_id)
707
717
  - name: AISERVICE_WATSONX_ACTION
708
718
  value: $(params.aiservice_watsonx_action)
719
+ - name: AISERVICE_WATSONXAI_CA_CRT
720
+ value: $(params.aiservice_watsonxai_ca_crt)
709
721
 
710
722
  # Opendatahub storage details
711
723
  - name: AISERVICE_S3_ACCESSKEY
@@ -735,7 +747,7 @@ spec:
735
747
  command:
736
748
  - /opt/app-root/src/run-role.sh
737
749
  - aiservice
738
- image: quay.io/ibmmas/cli:15.7.0
750
+ image: quay.io/ibmmas/cli:15.9.0
739
751
  imagePullPolicy: $(params.image_pull_policy)
740
752
  workingDir: /workspace/configs
741
753
 
@@ -851,7 +863,7 @@ spec:
851
863
  command:
852
864
  - /opt/app-root/src/run-role.sh
853
865
  - appconnect
854
- image: quay.io/ibmmas/cli:15.7.0
866
+ image: quay.io/ibmmas/cli:15.9.0
855
867
  imagePullPolicy: $(params.image_pull_policy)
856
868
  workingDir: /workspace/configs
857
869
 
@@ -969,7 +981,7 @@ spec:
969
981
  command:
970
982
  - /opt/app-root/src/run-role.sh
971
983
  - arcgis
972
- image: quay.io/ibmmas/cli:15.7.0
984
+ image: quay.io/ibmmas/cli:15.9.0
973
985
  imagePullPolicy: $(params.image_pull_policy)
974
986
  # --------------------------------------------------------------------------------
975
987
  # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -1039,7 +1051,7 @@ spec:
1039
1051
  command:
1040
1052
  - /opt/app-root/src/run-role.sh
1041
1053
  - cert_manager
1042
- image: quay.io/ibmmas/cli:15.7.0
1054
+ image: quay.io/ibmmas/cli:15.9.0
1043
1055
  imagePullPolicy: $(params.image_pull_policy)
1044
1056
  workingDir: /workspace/configs
1045
1057
  # --------------------------------------------------------------------------------
@@ -1105,7 +1117,7 @@ spec:
1105
1117
  command:
1106
1118
  - /opt/app-root/src/run-role.sh
1107
1119
  - common_services
1108
- image: quay.io/ibmmas/cli:15.7.0
1120
+ image: quay.io/ibmmas/cli:15.9.0
1109
1121
  imagePullPolicy: $(params.image_pull_policy)
1110
1122
  workingDir: /workspace/configs
1111
1123
  # --------------------------------------------------------------------------------
@@ -1232,7 +1244,7 @@ spec:
1232
1244
  command:
1233
1245
  - /opt/app-root/src/run-role.sh
1234
1246
  - cos
1235
- image: quay.io/ibmmas/cli:15.7.0
1247
+ image: quay.io/ibmmas/cli:15.9.0
1236
1248
  imagePullPolicy: $(params.image_pull_policy)
1237
1249
  workingDir: /workspace/configs
1238
1250
 
@@ -1352,7 +1364,7 @@ spec:
1352
1364
  command:
1353
1365
  - /opt/app-root/src/run-role.sh
1354
1366
  - cp4d_service
1355
- image: quay.io/ibmmas/cli:15.7.0
1367
+ image: quay.io/ibmmas/cli:15.9.0
1356
1368
  imagePullPolicy: $(params.image_pull_policy)
1357
1369
  workingDir: /workspace/configs
1358
1370
  # --------------------------------------------------------------------------------
@@ -1469,7 +1481,7 @@ spec:
1469
1481
  command:
1470
1482
  - /opt/app-root/src/run-role.sh
1471
1483
  - cp4d_service
1472
- image: quay.io/ibmmas/cli:15.7.0
1484
+ image: quay.io/ibmmas/cli:15.9.0
1473
1485
  imagePullPolicy: $(params.image_pull_policy)
1474
1486
  workingDir: /workspace/configs
1475
1487
 
@@ -1575,7 +1587,7 @@ spec:
1575
1587
  command:
1576
1588
  - /opt/app-root/src/run-role.sh
1577
1589
  - cp4d
1578
- image: quay.io/ibmmas/cli:15.7.0
1590
+ image: quay.io/ibmmas/cli:15.9.0
1579
1591
  imagePullPolicy: $(params.image_pull_policy)
1580
1592
  # --------------------------------------------------------------------------------
1581
1593
  # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1897,7 +1909,7 @@ spec:
1897
1909
  command:
1898
1910
  - /opt/app-root/src/run-role.sh
1899
1911
  - db2
1900
- image: quay.io/ibmmas/cli:15.7.0
1912
+ image: quay.io/ibmmas/cli:15.9.0
1901
1913
  imagePullPolicy: $(params.image_pull_policy)
1902
1914
  workingDir: /workspace/configs
1903
1915
 
@@ -2007,7 +2019,7 @@ spec:
2007
2019
  command:
2008
2020
  - /opt/app-root/src/run-role.sh
2009
2021
  - eck
2010
- image: quay.io/ibmmas/cli:15.7.0
2022
+ image: quay.io/ibmmas/cli:15.9.0
2011
2023
  imagePullPolicy: $(params.image_pull_policy)
2012
2024
  # --------------------------------------------------------------------------------
2013
2025
  # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -2096,7 +2108,7 @@ spec:
2096
2108
  command:
2097
2109
  - /opt/app-root/src/run-role.sh
2098
2110
  - gencfg_workspace
2099
- image: quay.io/ibmmas/cli:15.7.0
2111
+ image: quay.io/ibmmas/cli:15.9.0
2100
2112
  imagePullPolicy: $(params.image_pull_policy)
2101
2113
  workingDir: /workspace/configs
2102
2114
 
@@ -2290,7 +2302,7 @@ spec:
2290
2302
  - -c
2291
2303
  name: gitops-aiservice-tenant
2292
2304
  imagePullPolicy: IfNotPresent
2293
- image: quay.io/ibmmas/cli:15.7.0
2305
+ image: quay.io/ibmmas/cli:15.9.0
2294
2306
  workspaces:
2295
2307
  - name: configs
2296
2308
  # --------------------------------------------------------------------------------
@@ -2484,7 +2496,7 @@ spec:
2484
2496
  - -c
2485
2497
  name: gitops-aiservice
2486
2498
  imagePullPolicy: IfNotPresent
2487
- image: quay.io/ibmmas/cli:15.7.0
2499
+ image: quay.io/ibmmas/cli:15.9.0
2488
2500
  workspaces:
2489
2501
  - name: configs
2490
2502
  # --------------------------------------------------------------------------------
@@ -2585,7 +2597,7 @@ spec:
2585
2597
  - -c
2586
2598
  name: gitops-bootstrap
2587
2599
  imagePullPolicy: IfNotPresent
2588
- image: quay.io/ibmmas/cli:15.7.0
2600
+ image: quay.io/ibmmas/cli:15.9.0
2589
2601
  workspaces:
2590
2602
  - name: configs
2591
2603
  # --------------------------------------------------------------------------------
@@ -2667,7 +2679,7 @@ spec:
2667
2679
  - -c
2668
2680
  name: gitops-cis-compliance
2669
2681
  imagePullPolicy: IfNotPresent
2670
- image: quay.io/ibmmas/cli:15.7.0
2682
+ image: quay.io/ibmmas/cli:15.9.0
2671
2683
  workspaces:
2672
2684
  - name: configs
2673
2685
  # --------------------------------------------------------------------------------
@@ -3007,7 +3019,7 @@ spec:
3007
3019
  - -c
3008
3020
  name: gitops-cluster
3009
3021
  imagePullPolicy: Always
3010
- image: quay.io/ibmmas/cli:15.7.0
3022
+ image: quay.io/ibmmas/cli:15.9.0
3011
3023
  workspaces:
3012
3024
  - name: configs
3013
3025
  - name: gitops-cluster-configs
@@ -3116,7 +3128,7 @@ spec:
3116
3128
  - -c
3117
3129
  name: gitops-cos
3118
3130
  imagePullPolicy: IfNotPresent
3119
- image: quay.io/ibmmas/cli:15.7.0
3131
+ image: quay.io/ibmmas/cli:15.9.0
3120
3132
  workspaces:
3121
3133
  - name: configs
3122
3134
  # --------------------------------------------------------------------------------
@@ -3264,7 +3276,7 @@ spec:
3264
3276
  - -c
3265
3277
  name: gitops-cp4d-service
3266
3278
  imagePullPolicy: IfNotPresent
3267
- image: quay.io/ibmmas/cli:15.7.0
3279
+ image: quay.io/ibmmas/cli:15.9.0
3268
3280
  workspaces:
3269
3281
  - name: configs
3270
3282
  - name: shared-gitops-configs
@@ -3393,7 +3405,7 @@ spec:
3393
3405
  - -c
3394
3406
  name: gitops-cp4d
3395
3407
  imagePullPolicy: IfNotPresent
3396
- image: quay.io/ibmmas/cli:15.7.0
3408
+ image: quay.io/ibmmas/cli:15.9.0
3397
3409
  workspaces:
3398
3410
  - name: configs
3399
3411
  - name: shared-gitops-configs
@@ -3684,7 +3696,7 @@ spec:
3684
3696
  - -c
3685
3697
  name: gitops-db2u-database
3686
3698
  imagePullPolicy: Always
3687
- image: quay.io/ibmmas/cli:15.7.0
3699
+ image: quay.io/ibmmas/cli:15.9.0
3688
3700
  workspaces:
3689
3701
  - name: configs
3690
3702
  - name: shared-gitops-configs
@@ -3782,7 +3794,7 @@ spec:
3782
3794
  - -c
3783
3795
  name: gitops-db2u
3784
3796
  imagePullPolicy: IfNotPresent
3785
- image: quay.io/ibmmas/cli:15.7.0
3797
+ image: quay.io/ibmmas/cli:15.9.0
3786
3798
  workspaces:
3787
3799
  - name: configs
3788
3800
  # --------------------------------------------------------------------------------
@@ -3909,7 +3921,7 @@ spec:
3909
3921
  - -c
3910
3922
  name: gitops-delete-jdbc-config
3911
3923
  imagePullPolicy: IfNotPresent
3912
- image: quay.io/ibmmas/cli:15.7.0
3924
+ image: quay.io/ibmmas/cli:15.9.0
3913
3925
  workspaces:
3914
3926
  - name: configs
3915
3927
  # --------------------------------------------------------------------------------
@@ -4007,7 +4019,7 @@ spec:
4007
4019
  - -c
4008
4020
  name: gitops-delete-kafka-config
4009
4021
  imagePullPolicy: Always
4010
- image: quay.io/ibmmas/cli:15.7.0
4022
+ image: quay.io/ibmmas/cli:15.9.0
4011
4023
  workspaces:
4012
4024
  - name: configs
4013
4025
 
@@ -4103,7 +4115,7 @@ spec:
4103
4115
  - -c
4104
4116
  name: gitops-deprovision-aiservice-tenant
4105
4117
  imagePullPolicy: IfNotPresent
4106
- image: quay.io/ibmmas/cli:15.7.0
4118
+ image: quay.io/ibmmas/cli:15.9.0
4107
4119
  workspaces:
4108
4120
  - name: configs
4109
4121
  # --------------------------------------------------------------------------------
@@ -4191,7 +4203,7 @@ spec:
4191
4203
  - -c
4192
4204
  name: gitops-deprovision-aiservice
4193
4205
  imagePullPolicy: IfNotPresent
4194
- image: quay.io/ibmmas/cli:15.7.0
4206
+ image: quay.io/ibmmas/cli:15.9.0
4195
4207
  workspaces:
4196
4208
  - name: configs
4197
4209
  # --------------------------------------------------------------------------------
@@ -4279,7 +4291,7 @@ spec:
4279
4291
  - -c
4280
4292
  name: gitops-deprovision-app-config
4281
4293
  imagePullPolicy: IfNotPresent
4282
- image: quay.io/ibmmas/cli:15.7.0
4294
+ image: quay.io/ibmmas/cli:15.9.0
4283
4295
  workspaces:
4284
4296
  - name: configs
4285
4297
  # --------------------------------------------------------------------------------
@@ -4364,7 +4376,7 @@ spec:
4364
4376
  - -c
4365
4377
  name: gitops-deprovision-app-install
4366
4378
  imagePullPolicy: IfNotPresent
4367
- image: quay.io/ibmmas/cli:15.7.0
4379
+ image: quay.io/ibmmas/cli:15.9.0
4368
4380
  workspaces:
4369
4381
  - name: configs
4370
4382
  # --------------------------------------------------------------------------------
@@ -4449,7 +4461,7 @@ spec:
4449
4461
  - -c
4450
4462
  name: gitops-deprovision-cluster
4451
4463
  imagePullPolicy: IfNotPresent
4452
- image: quay.io/ibmmas/cli:15.7.0
4464
+ image: quay.io/ibmmas/cli:15.9.0
4453
4465
  workspaces:
4454
4466
  - name: configs
4455
4467
  # --------------------------------------------------------------------------------
@@ -4568,7 +4580,7 @@ spec:
4568
4580
  - -c
4569
4581
  name: gitops-deprovision-cos
4570
4582
  imagePullPolicy: IfNotPresent
4571
- image: quay.io/ibmmas/cli:15.7.0
4583
+ image: quay.io/ibmmas/cli:15.9.0
4572
4584
  workspaces:
4573
4585
  - name: configs
4574
4586
  # --------------------------------------------------------------------------------
@@ -4673,7 +4685,7 @@ spec:
4673
4685
  - -c
4674
4686
  name: gitops-deprovision-cp4d-service
4675
4687
  imagePullPolicy: IfNotPresent
4676
- image: quay.io/ibmmas/cli:15.7.0
4688
+ image: quay.io/ibmmas/cli:15.9.0
4677
4689
  workspaces:
4678
4690
  - name: configs# --------------------------------------------------------------------------------
4679
4691
  # /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-cp4d.yaml
@@ -4760,7 +4772,7 @@ spec:
4760
4772
  - -c
4761
4773
  name: gitops-deprovision-cp4d
4762
4774
  imagePullPolicy: IfNotPresent
4763
- image: quay.io/ibmmas/cli:15.7.0
4775
+ image: quay.io/ibmmas/cli:15.9.0
4764
4776
  workspaces:
4765
4777
  - name: configs
4766
4778
  # --------------------------------------------------------------------------------
@@ -4845,7 +4857,7 @@ spec:
4845
4857
  - -c
4846
4858
  name: gitops-deprovision-customer-subscription
4847
4859
  imagePullPolicy: IfNotPresent
4848
- image: quay.io/ibmmas/cli:15.7.0
4860
+ image: quay.io/ibmmas/cli:15.9.0
4849
4861
  workspaces:
4850
4862
  - name: shared-entitlement
4851
4863
  # --------------------------------------------------------------------------------
@@ -4938,7 +4950,7 @@ spec:
4938
4950
  - -c
4939
4951
  name: gitops-deprovision-db2u-database
4940
4952
  imagePullPolicy: IfNotPresent
4941
- image: quay.io/ibmmas/cli:15.7.0
4953
+ image: quay.io/ibmmas/cli:15.9.0
4942
4954
  workspaces:
4943
4955
  - name: configs
4944
4956
 
@@ -5021,7 +5033,7 @@ spec:
5021
5033
  - -c
5022
5034
  name: gitops-deprovision-db2u
5023
5035
  imagePullPolicy: IfNotPresent
5024
- image: quay.io/ibmmas/cli:15.7.0
5036
+ image: quay.io/ibmmas/cli:15.9.0
5025
5037
  workspaces:
5026
5038
  - name: configs
5027
5039
 
@@ -5138,7 +5150,7 @@ spec:
5138
5150
  - -c
5139
5151
  name: gitops-deprovision-efs
5140
5152
  imagePullPolicy: IfNotPresent
5141
- image: quay.io/ibmmas/cli:15.7.0
5153
+ image: quay.io/ibmmas/cli:15.9.0
5142
5154
  workspaces:
5143
5155
  - name: configs
5144
5156
 
@@ -5248,7 +5260,7 @@ spec:
5248
5260
  - -c
5249
5261
  name: gitops-deprovision-kafka
5250
5262
  imagePullPolicy: IfNotPresent
5251
- image: quay.io/ibmmas/cli:15.7.0
5263
+ image: quay.io/ibmmas/cli:15.9.0
5252
5264
  workspaces:
5253
5265
  - name: configs
5254
5266
  # --------------------------------------------------------------------------------
@@ -5351,7 +5363,7 @@ spec:
5351
5363
  - -c
5352
5364
  name: gitops-deprovision-mongo
5353
5365
  imagePullPolicy: IfNotPresent
5354
- image: quay.io/ibmmas/cli:15.7.0
5366
+ image: quay.io/ibmmas/cli:15.9.0
5355
5367
  workspaces:
5356
5368
  - name: configs
5357
5369
 
@@ -5442,7 +5454,7 @@ spec:
5442
5454
  - -c
5443
5455
  name: gitops-deprovision-odh
5444
5456
  imagePullPolicy: IfNotPresent
5445
- image: quay.io/ibmmas/cli:15.7.0
5457
+ image: quay.io/ibmmas/cli:15.9.0
5446
5458
  workspaces:
5447
5459
  - name: configs
5448
5460
  # --------------------------------------------------------------------------------
@@ -5496,7 +5508,7 @@ spec:
5496
5508
  - -c
5497
5509
  name: gitops-deprovision-rosa
5498
5510
  imagePullPolicy: IfNotPresent
5499
- image: quay.io/ibmmas/cli:15.7.0
5511
+ image: quay.io/ibmmas/cli:15.9.0
5500
5512
  workspaces:
5501
5513
  - name: configs
5502
5514
  # --------------------------------------------------------------------------------
@@ -5532,6 +5544,8 @@ spec:
5532
5544
  - name: jdbc_type_iot
5533
5545
  type: string
5534
5546
  default: "incluster-db2"
5547
+ - name: jdbc_connection_url_additional_params_iot
5548
+ type: string
5535
5549
  - name: jdbc_instance_name_iot
5536
5550
  type: string
5537
5551
  default: ""
@@ -5572,6 +5586,8 @@ spec:
5572
5586
  value: $(params.avp_aws_secret_region)
5573
5587
  - name: JDBC_TYPE_IOT
5574
5588
  value: $(params.jdbc_type_iot)
5589
+ - name: JDBC_CONNECTION_URL_ADDITIONAL_PARAMS_IOT
5590
+ value: $(params.jdbc_connection_url_additional_params_iot)
5575
5591
  - name: JDBC_INSTANCE_NAME_IOT
5576
5592
  value: $(params.jdbc_instance_name_iot)
5577
5593
  - name: JDBC_ROUTE_IOT
@@ -5619,6 +5635,7 @@ spec:
5619
5635
  --mas-app-id "iot" \
5620
5636
  --dir /tmp/deprovision-suite-config-iotdb \
5621
5637
  --jdbc-type "$JDBC_TYPE_IOT" \
5638
+ --jdbc_connection_url_additional_params "$JDBC_CONNECTION_URL_ADDITIONAL_PARAMS_IOT" \
5622
5639
  --jdbc-route "$JDBC_ROUTE_IOT" \
5623
5640
  --jdbc-instance-name "$JDBC_INSTANCE_NAME_IOT" \
5624
5641
  || exit 1
@@ -5701,7 +5718,7 @@ spec:
5701
5718
  - -c
5702
5719
  name: gitops-deprovision-suite-config
5703
5720
  imagePullPolicy: IfNotPresent
5704
- image: quay.io/ibmmas/cli:15.7.0
5721
+ image: quay.io/ibmmas/cli:15.9.0
5705
5722
  workspaces:
5706
5723
  - name: configs
5707
5724
 
@@ -5799,7 +5816,7 @@ spec:
5799
5816
  - -c
5800
5817
  name: gitops-deprovision-suite-idp-config
5801
5818
  imagePullPolicy: IfNotPresent
5802
- image: quay.io/ibmmas/cli:15.7.0
5819
+ image: quay.io/ibmmas/cli:15.9.0
5803
5820
  workspaces:
5804
5821
  - name: configs
5805
5822
  # --------------------------------------------------------------------------------
@@ -5891,7 +5908,7 @@ spec:
5891
5908
  - -c
5892
5909
  name: gitops-deprovision-suite-objectstorage-config
5893
5910
  imagePullPolicy: IfNotPresent
5894
- image: quay.io/ibmmas/cli:15.7.0
5911
+ image: quay.io/ibmmas/cli:15.9.0
5895
5912
  workspaces:
5896
5913
  - name: configs
5897
5914
  # --------------------------------------------------------------------------------
@@ -6103,7 +6120,7 @@ spec:
6103
6120
  - -c
6104
6121
  name: gitops-deprovision-suite-smtp-config
6105
6122
  imagePullPolicy: IfNotPresent
6106
- image: quay.io/ibmmas/cli:15.7.0
6123
+ image: quay.io/ibmmas/cli:15.9.0
6107
6124
  workspaces:
6108
6125
  - name: configs
6109
6126
  # --------------------------------------------------------------------------------
@@ -6196,7 +6213,7 @@ spec:
6196
6213
  - -c
6197
6214
  name: gitops-deprovision-suite-watson-studio-config
6198
6215
  imagePullPolicy: IfNotPresent
6199
- image: quay.io/ibmmas/cli:15.7.0
6216
+ image: quay.io/ibmmas/cli:15.9.0
6200
6217
  workspaces:
6201
6218
  - name: configs
6202
6219
  # --------------------------------------------------------------------------------
@@ -6287,7 +6304,7 @@ spec:
6287
6304
  - -c
6288
6305
  name: gitops-deprovision-suite-workspace
6289
6306
  imagePullPolicy: Always
6290
- image: quay.io/ibmmas/cli:15.7.0
6307
+ image: quay.io/ibmmas/cli:15.9.0
6291
6308
  workspaces:
6292
6309
  - name: configs
6293
6310
  # --------------------------------------------------------------------------------
@@ -6380,7 +6397,7 @@ spec:
6380
6397
  - -c
6381
6398
  name: gitops-deprovision-suite
6382
6399
  imagePullPolicy: IfNotPresent
6383
- image: quay.io/ibmmas/cli:15.7.0
6400
+ image: quay.io/ibmmas/cli:15.9.0
6384
6401
  workspaces:
6385
6402
  - name: configs
6386
6403
 
@@ -6493,7 +6510,7 @@ spec:
6493
6510
  - -c
6494
6511
  name: gitops-dro
6495
6512
  imagePullPolicy: IfNotPresent
6496
- image: quay.io/ibmmas/cli:15.7.0
6513
+ image: quay.io/ibmmas/cli:15.9.0
6497
6514
  workspaces:
6498
6515
  - name: configs
6499
6516
  # --------------------------------------------------------------------------------
@@ -6620,7 +6637,7 @@ spec:
6620
6637
  - -c
6621
6638
  name: gitops-efs
6622
6639
  imagePullPolicy: IfNotPresent
6623
- image: quay.io/ibmmas/cli:15.7.0
6640
+ image: quay.io/ibmmas/cli:15.9.0
6624
6641
  workspaces:
6625
6642
  - name: configs
6626
6643
 
@@ -6755,7 +6772,7 @@ spec:
6755
6772
  - -c
6756
6773
  name: gitops-jdbc-config
6757
6774
  imagePullPolicy: Always
6758
- image: quay.io/ibmmas/cli:15.7.0
6775
+ image: quay.io/ibmmas/cli:15.9.0
6759
6776
  workspaces:
6760
6777
  - name: configs
6761
6778
  - name: shared-gitops-configs
@@ -6851,7 +6868,7 @@ spec:
6851
6868
  - -c
6852
6869
  name: gitops-kafka-config
6853
6870
  imagePullPolicy: Always
6854
- image: quay.io/ibmmas/cli:15.7.0
6871
+ image: quay.io/ibmmas/cli:15.9.0
6855
6872
  workspaces:
6856
6873
  - name: configs
6857
6874
 
@@ -6973,7 +6990,7 @@ spec:
6973
6990
  - -c
6974
6991
  name: gitops-kafka
6975
6992
  imagePullPolicy: IfNotPresent
6976
- image: quay.io/ibmmas/cli:15.7.0
6993
+ image: quay.io/ibmmas/cli:15.9.0
6977
6994
  workspaces:
6978
6995
  - name: configs
6979
6996
  # --------------------------------------------------------------------------------
@@ -7129,7 +7146,7 @@ spec:
7129
7146
  - -c
7130
7147
  name: gitops-license
7131
7148
  imagePullPolicy: Always
7132
- image: quay.io/ibmmas/cli:15.7.0
7149
+ image: quay.io/ibmmas/cli:15.9.0
7133
7150
  workspaces:
7134
7151
  - name: shared-entitlement
7135
7152
 
@@ -7234,8 +7251,7 @@ spec:
7234
7251
  default: ""
7235
7252
  - name: mas_appws_components
7236
7253
  type: string
7237
- default: ""
7238
-
7254
+ default: ""
7239
7255
  - name: launchfvt_core
7240
7256
  type: string
7241
7257
  default: "true"
@@ -7480,7 +7496,6 @@ spec:
7480
7496
  trap '[[ $? -eq 1 ]] && mas must-gather --directory /workspace/mustgather --mas-instance-ids ${MAS_INSTANCE_ID} --extra-namespaces selenium' ERR EXIT
7481
7497
 
7482
7498
 
7483
-
7484
7499
  get_trailing_number() {
7485
7500
  local input_string="$1"
7486
7501
  local trailing_number=$(echo $input_string | grep -Eo '[0-9]+$')
@@ -7853,7 +7868,7 @@ spec:
7853
7868
  - -c
7854
7869
  name: gitops-mas-fvt-preparer
7855
7870
  imagePullPolicy: Always
7856
- image: quay.io/ibmmas/cli:15.7.0
7871
+ image: quay.io/ibmmas/cli:15.9.0
7857
7872
  workspaces:
7858
7873
  - name: configs
7859
7874
  - name: shared-additional-configs
@@ -8353,7 +8368,7 @@ spec:
8353
8368
  - -c
8354
8369
  name: gitops-mas-initiator
8355
8370
  imagePullPolicy: IfNotPresent
8356
- image: quay.io/ibmmas/cli:15.7.0
8371
+ image: quay.io/ibmmas/cli:15.9.0
8357
8372
  workspaces:
8358
8373
  - name: configs
8359
8374
  # --------------------------------------------------------------------------------
@@ -8494,7 +8509,7 @@ spec:
8494
8509
  - -c
8495
8510
  name: gitops-mas-provisioner
8496
8511
  imagePullPolicy: IfNotPresent
8497
- image: quay.io/ibmmas/cli:15.7.0
8512
+ image: quay.io/ibmmas/cli:15.9.0
8498
8513
  workspaces:
8499
8514
  - name: configs
8500
8515
  - name: gitops-cluster-configs
@@ -8603,7 +8618,7 @@ spec:
8603
8618
  - -c
8604
8619
  name: gitops-mongo
8605
8620
  imagePullPolicy: IfNotPresent
8606
- image: quay.io/ibmmas/cli:15.7.0
8621
+ image: quay.io/ibmmas/cli:15.9.0
8607
8622
  workspaces:
8608
8623
  - name: configs
8609
8624
 
@@ -8729,7 +8744,7 @@ spec:
8729
8744
  - -c
8730
8745
  name: gitops-nvidia-gpu
8731
8746
  imagePullPolicy: IfNotPresent
8732
- image: quay.io/ibmmas/cli:15.7.0
8747
+ image: quay.io/ibmmas/cli:15.9.0
8733
8748
  workspaces:
8734
8749
  - name: configs
8735
8750
  # --------------------------------------------------------------------------------
@@ -8863,7 +8878,7 @@ spec:
8863
8878
  - -c
8864
8879
  name: gitops-odh
8865
8880
  imagePullPolicy: IfNotPresent
8866
- image: quay.io/ibmmas/cli:15.7.0
8881
+ image: quay.io/ibmmas/cli:15.9.0
8867
8882
  workspaces:
8868
8883
  - name: configs
8869
8884
  # --------------------------------------------------------------------------------
@@ -8981,7 +8996,7 @@ spec:
8981
8996
  - -c
8982
8997
  name: gitops-process-mongo-user
8983
8998
  imagePullPolicy: IfNotPresent
8984
- image: quay.io/ibmmas/cli:15.7.0
8999
+ image: quay.io/ibmmas/cli:15.9.0
8985
9000
  workspaces:
8986
9001
  - name: configs
8987
9002
  # --------------------------------------------------------------------------------
@@ -9037,7 +9052,7 @@ spec:
9037
9052
  - -c
9038
9053
  name: gitops-rosa
9039
9054
  imagePullPolicy: IfNotPresent
9040
- image: quay.io/ibmmas/cli:15.7.0
9055
+ image: quay.io/ibmmas/cli:15.9.0
9041
9056
  workspaces:
9042
9057
  - name: configs
9043
9058
  # --------------------------------------------------------------------------------
@@ -9056,8 +9071,6 @@ spec:
9056
9071
  type: string
9057
9072
  - name: cluster_url
9058
9073
  type: string
9059
- - name: mas_instance_id
9060
- type: string
9061
9074
  - name: avp_aws_secret_region
9062
9075
  type: string
9063
9076
  - name: sls_license_icn
@@ -9074,6 +9087,8 @@ spec:
9074
9087
  type: string
9075
9088
  - name: mongo_provider
9076
9089
  type: string
9090
+ - name: docdb_user_action
9091
+ type: string
9077
9092
  - name: icr_cp
9078
9093
  type: string
9079
9094
  - name: icr_cp_open
@@ -9093,6 +9108,8 @@ spec:
9093
9108
  type: string
9094
9109
  - name: github_ssh
9095
9110
  type: string
9111
+ - name: mas_slscfg_pod_template_yaml
9112
+ type: string
9096
9113
 
9097
9114
  stepTemplate:
9098
9115
  name: gitops-sls
@@ -9103,8 +9120,6 @@ spec:
9103
9120
  value: $(params.account)
9104
9121
  - name: CLUSTER_URL
9105
9122
  value: $(params.cluster_url)
9106
- - name: MAS_INSTANCE_ID
9107
- value: $(params.mas_instance_id)
9108
9123
  - name: SM_AWS_REGION
9109
9124
  value: $(params.avp_aws_secret_region)
9110
9125
  - name: ICN
@@ -9113,6 +9128,8 @@ spec:
9113
9128
  value: $(params.sls_subscription_id)
9114
9129
  - name: MONGODB_PROVIDER
9115
9130
  value: $(params.mongo_provider)
9131
+ - name: USER_ACTION
9132
+ value: $(params.docdb_user_action)
9116
9133
  - name: SLS_CHANNEL
9117
9134
  value: $(params.sls_channel)
9118
9135
  - name: SLS_INSTALL_PLAN
@@ -9140,6 +9157,8 @@ spec:
9140
9157
  value: $(params.git_commit_msg)
9141
9158
  - name: GIT_SSH
9142
9159
  value: $(params.github_ssh)
9160
+ - name: POD_TEMPLATE
9161
+ value: $(params.mas_slscfg_pod_template_yaml)
9143
9162
 
9144
9163
  envFrom:
9145
9164
  - configMapRef:
@@ -9158,17 +9177,19 @@ spec:
9158
9177
  WORKING_DIR=/tmp
9159
9178
 
9160
9179
  mas gitops-suite-license-service -d $WORKING_DIR -a $ACCOUNT -c $CLUSTER_NAME --ibm-customer-number ${ICN} --subscription-id ${SAAS_SUB_ID} \
9161
- --secrets-path "${SECRETS_PATH}" --domain ${SLS_DOMAIN} --sls-channel ${SLS_CHANNEL} --sls-install-plan ${SLS_INSTALL_PLAN} --cluster-url ${CLUSTER_URL}
9180
+ --secrets-path "${SECRETS_PATH}" --domain ${SLS_DOMAIN} --sls-channel ${SLS_CHANNEL} --sls-install-plan ${SLS_INSTALL_PLAN} \
9181
+ --cluster-url ${CLUSTER_URL} --github-push
9162
9182
 
9163
- sleep 3000
9164
9183
  command:
9165
9184
  - /bin/sh
9166
9185
  - -c
9167
9186
  name: gitops-sls
9168
9187
  imagePullPolicy: Always
9169
- image: quay.io/ibmmas/cli:15.7.0
9188
+ image: quay.io/ibmmas/cli:15.9.0
9170
9189
  workspaces:
9171
9190
  - name: shared-entitlement
9191
+ - name: configs
9192
+ - name: shared-gitops-configs
9172
9193
 
9173
9194
  # --------------------------------------------------------------------------------
9174
9195
  # /home/runner/work/cli/cli/tekton/target/tasks/gitops-suite-app-config.yaml
@@ -9349,7 +9370,7 @@ spec:
9349
9370
  - -c
9350
9371
  name: gitops-suite-app-config
9351
9372
  imagePullPolicy: IfNotPresent
9352
- image: quay.io/ibmmas/cli:15.7.0
9373
+ image: quay.io/ibmmas/cli:15.9.0
9353
9374
  workspaces:
9354
9375
  - name: configs
9355
9376
  - name: shared-gitops-configs
@@ -9507,7 +9528,7 @@ spec:
9507
9528
  - -c
9508
9529
  name: gitops-suite-app-install
9509
9530
  imagePullPolicy: Always
9510
- image: quay.io/ibmmas/cli:15.7.0
9531
+ image: quay.io/ibmmas/cli:15.9.0
9511
9532
  workspaces:
9512
9533
  - name: configs
9513
9534
  - name: shared-gitops-configs
@@ -9613,7 +9634,7 @@ spec:
9613
9634
  - -c
9614
9635
  name: gitops-suite-certs
9615
9636
  imagePullPolicy: IfNotPresent
9616
- image: quay.io/ibmmas/cli:15.7.0
9637
+ image: quay.io/ibmmas/cli:15.9.0
9617
9638
  workspaces:
9618
9639
  - name: configs
9619
9640
  - name: certificates
@@ -9788,7 +9809,7 @@ spec:
9788
9809
  - -c
9789
9810
  name: gitops-suite-config
9790
9811
  imagePullPolicy: IfNotPresent
9791
- image: quay.io/ibmmas/cli:15.7.0
9812
+ image: quay.io/ibmmas/cli:15.9.0
9792
9813
  workspaces:
9793
9814
  - name: configs
9794
9815
  - name: shared-additional-configs
@@ -9888,7 +9909,7 @@ spec:
9888
9909
  - -c
9889
9910
  name: gitops-suite-dns
9890
9911
  imagePullPolicy: IfNotPresent
9891
- image: quay.io/ibmmas/cli:15.7.0
9912
+ image: quay.io/ibmmas/cli:15.9.0
9892
9913
  workspaces:
9893
9914
  - name: configs
9894
9915
 
@@ -10012,7 +10033,7 @@ spec:
10012
10033
  - -c
10013
10034
  name: gitops-suite-idp-config
10014
10035
  imagePullPolicy: IfNotPresent
10015
- image: quay.io/ibmmas/cli:15.7.0
10036
+ image: quay.io/ibmmas/cli:15.9.0
10016
10037
  workspaces:
10017
10038
  - name: configs
10018
10039
  - name: shared-additional-configs
@@ -10113,7 +10134,7 @@ spec:
10113
10134
  - -c
10114
10135
  name: gitops-suite-objectstorage-config
10115
10136
  imagePullPolicy: IfNotPresent
10116
- image: quay.io/ibmmas/cli:15.7.0
10137
+ image: quay.io/ibmmas/cli:15.9.0
10117
10138
  workspaces:
10118
10139
  - name: configs
10119
10140
  - name: shared-gitops-configs
@@ -10535,7 +10556,7 @@ spec:
10535
10556
  - -c
10536
10557
  name: gitops-suite-smtp-config
10537
10558
  imagePullPolicy: IfNotPresent
10538
- image: quay.io/ibmmas/cli:15.7.0
10559
+ image: quay.io/ibmmas/cli:15.9.0
10539
10560
  workspaces:
10540
10561
  - name: configs
10541
10562
  - name: shared-gitops-configs
@@ -10655,7 +10676,7 @@ spec:
10655
10676
  - -c
10656
10677
  name: gitops-suite-watson-studio-config
10657
10678
  imagePullPolicy: IfNotPresent
10658
- image: quay.io/ibmmas/cli:15.7.0
10679
+ image: quay.io/ibmmas/cli:15.9.0
10659
10680
  workspaces:
10660
10681
  - name: configs
10661
10682
  - name: shared-gitops-configs
@@ -10757,7 +10778,7 @@ spec:
10757
10778
  - -c
10758
10779
  name: gitops-suite-workspace
10759
10780
  imagePullPolicy: IfNotPresent
10760
- image: quay.io/ibmmas/cli:15.7.0
10781
+ image: quay.io/ibmmas/cli:15.9.0
10761
10782
  workspaces:
10762
10783
  - name: configs
10763
10784
  # --------------------------------------------------------------------------------
@@ -11095,7 +11116,7 @@ spec:
11095
11116
  - -c
11096
11117
  name: gitops-suite
11097
11118
  imagePullPolicy: IfNotPresent
11098
- image: quay.io/ibmmas/cli:15.7.0
11119
+ image: quay.io/ibmmas/cli:15.9.0
11099
11120
  workspaces:
11100
11121
  - name: configs
11101
11122
  - name: shared-gitops-configs
@@ -11145,7 +11166,7 @@ spec:
11145
11166
 
11146
11167
  steps:
11147
11168
  - name: grafana
11148
- image: quay.io/ibmmas/cli:15.7.0
11169
+ image: quay.io/ibmmas/cli:15.9.0
11149
11170
  imagePullPolicy: $(params.image_pull_policy)
11150
11171
  command:
11151
11172
  - /opt/app-root/src/run-role.sh
@@ -11279,7 +11300,7 @@ spec:
11279
11300
  command:
11280
11301
  - /opt/app-root/src/run-role.sh
11281
11302
  - ibm_catalogs
11282
- image: quay.io/ibmmas/cli:15.7.0
11303
+ image: quay.io/ibmmas/cli:15.9.0
11283
11304
  imagePullPolicy: $(params.image_pull_policy)
11284
11305
  workingDir: /workspace/configs
11285
11306
  # --------------------------------------------------------------------------------
@@ -11521,7 +11542,7 @@ spec:
11521
11542
  command:
11522
11543
  - /opt/app-root/src/run-role.sh
11523
11544
  - kafka
11524
- image: quay.io/ibmmas/cli:15.7.0
11545
+ image: quay.io/ibmmas/cli:15.9.0
11525
11546
  imagePullPolicy: $(params.image_pull_policy)
11526
11547
  workingDir: /workspace/configs
11527
11548
 
@@ -11529,6 +11550,64 @@ spec:
11529
11550
  - name: configs
11530
11551
  optional: true
11531
11552
  # --------------------------------------------------------------------------------
11553
+ # /home/runner/work/cli/cli/tekton/target/tasks/mas-config-helper.yaml
11554
+ # --------------------------------------------------------------------------------
11555
+ ---
11556
+ apiVersion: tekton.dev/v1beta1
11557
+ kind: Task
11558
+ metadata:
11559
+ name: mas-config-helper
11560
+ spec:
11561
+ params:
11562
+ - name: image_pull_policy
11563
+ type: string
11564
+ default: IfNotPresent
11565
+ - name: mas_channel
11566
+ type: string
11567
+ description: "MAS channel version (e.g., 9.2.0)"
11568
+ results:
11569
+ - name: is-post-92
11570
+ description: "True if MAS channel is >= 9.2.0, used for FVT task sequencing"
11571
+ # Additional results can be added here in the future
11572
+ steps:
11573
+ - name: analyze-config
11574
+ image: quay.io/ibmmas/cli:15.9.0
11575
+ imagePullPolicy: $(params.image_pull_policy)
11576
+ script: |
11577
+ #!/bin/bash
11578
+ set -e
11579
+
11580
+ echo "DEBUG: Starting mas-config-helper task"
11581
+ echo "DEBUG: Input mas_channel: $(params.mas_channel)"
11582
+
11583
+ # Default to false if mas_channel is not set
11584
+ IS_POST_92="false"
11585
+ echo "DEBUG: Initial IS_POST_92 value: $IS_POST_92"
11586
+
11587
+ if [ -n "$(params.mas_channel)" ]; then
11588
+ echo "DEBUG: mas_channel is not empty, parsing version"
11589
+ # Extract major, minor, patch versions
11590
+ MAJOR=$(echo "$(params.mas_channel)" | cut -d. -f1)
11591
+ MINOR=$(echo "$(params.mas_channel)" | cut -d. -f2)
11592
+ echo "DEBUG: Parsed version - MAJOR: $MAJOR, MINOR: $MINOR"
11593
+
11594
+ # Check if version is >= 9.2
11595
+ if [ "$MAJOR" -gt 9 ] || ([ "$MAJOR" -eq 9 ] && [ "$MINOR" -ge 2 ]); then
11596
+ IS_POST_92="true"
11597
+ echo "DEBUG: Version is >= 9.2, setting IS_POST_92 to true"
11598
+ else
11599
+ echo "DEBUG: Version is < 9.2, keeping IS_POST_92 as false"
11600
+ fi
11601
+ else
11602
+ echo "DEBUG: mas_channel is empty, keeping IS_POST_92 as false"
11603
+ fi
11604
+
11605
+ # Output the result
11606
+ echo "DEBUG: Final IS_POST_92 value: $IS_POST_92"
11607
+ echo -n "$IS_POST_92" > $(results.is-post-92.path)
11608
+ echo "DEBUG: Result written to $(results.is-post-92.path)"
11609
+
11610
+ # Additional configuration analysis can be added here in the future# --------------------------------------------------------------------------------
11532
11611
  # /home/runner/work/cli/cli/tekton/target/tasks/mas-fvt-assist-desktop.yaml
11533
11612
  # --------------------------------------------------------------------------------
11534
11613
  ---
@@ -11989,7 +12068,7 @@ spec:
11989
12068
  description: Extracted component names as a JSON array
11990
12069
  steps:
11991
12070
  - name: extract
11992
- image: quay.io/ibmmas/cli:15.7.0
12071
+ image: quay.io/ibmmas/cli:15.9.0
11993
12072
  script: |
11994
12073
  #!/bin/sh
11995
12074
  echo "Hello.. Start extraction for $(params.mas_appws_components)"
@@ -12342,7 +12421,7 @@ spec:
12342
12421
  echo "No IBM COS instance to delete"
12343
12422
  fi
12344
12423
  exit 0
12345
- image: quay.io/ibmmas/cli:15.7.0
12424
+ image: quay.io/ibmmas/cli:15.9.0
12346
12425
  imagePullPolicy: $(params.image_pull_policy)
12347
12426
  workingDir: /workspace/configs
12348
12427
  env:
@@ -12442,7 +12521,7 @@ spec:
12442
12521
  echo "No EventStreams instance to delete"
12443
12522
  fi
12444
12523
  exit 0
12445
- image: quay.io/ibmmas/cli:15.7.0
12524
+ image: quay.io/ibmmas/cli:15.9.0
12446
12525
  imagePullPolicy: $(params.image_pull_policy)
12447
12526
  workingDir: /workspace/configs
12448
12527
  env:
@@ -12543,7 +12622,7 @@ spec:
12543
12622
  command:
12544
12623
  - /opt/app-root/src/run-role.sh
12545
12624
  - ocp_deprovision
12546
- image: quay.io/ibmmas/cli:15.7.0
12625
+ image: quay.io/ibmmas/cli:15.9.0
12547
12626
  imagePullPolicy: $(params.image_pull_policy)
12548
12627
  env:
12549
12628
  - name: DEVOPS_MONGO_URI
@@ -12700,7 +12779,7 @@ spec:
12700
12779
  command:
12701
12780
  - python3
12702
12781
  - /opt/app-root/src/finalizer.py
12703
- image: quay.io/ibmmas/cli:15.7.0
12782
+ image: quay.io/ibmmas/cli:15.9.0
12704
12783
  imagePullPolicy: $(params.image_pull_policy)
12705
12784
  env:
12706
12785
  - name: DEVOPS_MONGO_URI
@@ -14404,7 +14483,7 @@ spec:
14404
14483
  command:
14405
14484
  - python3
14406
14485
  - /opt/app-root/src/mobilever.py
14407
- image: quay.io/ibmmas/cli:15.7.0
14486
+ image: quay.io/ibmmas/cli:15.9.0
14408
14487
  imagePullPolicy: $(params.image_pull_policy)
14409
14488
  onError: continue
14410
14489
 
@@ -14767,7 +14846,7 @@ spec:
14767
14846
 
14768
14847
  steps:
14769
14848
  - name: post-update-verify
14770
- image: quay.io/ibmmas/cli:15.7.0
14849
+ image: quay.io/ibmmas/cli:15.9.0
14771
14850
  imagePullPolicy: $(params.image_pull_policy)
14772
14851
  command:
14773
14852
  - ansible-playbook
@@ -14823,7 +14902,7 @@ spec:
14823
14902
 
14824
14903
  steps:
14825
14904
  - name: create-offline-upgrade-cron
14826
- image: quay.io/ibmmas/cli:15.7.0
14905
+ image: quay.io/ibmmas/cli:15.9.0
14827
14906
  imagePullPolicy: $(params.image_pull_policy)
14828
14907
  command:
14829
14908
  - ansible-playbook
@@ -14879,7 +14958,7 @@ spec:
14879
14958
 
14880
14959
  steps:
14881
14960
  - name: create-offline-upgrade-cron
14882
- image: quay.io/ibmmas/cli:15.7.0
14961
+ image: quay.io/ibmmas/cli:15.9.0
14883
14962
  imagePullPolicy: $(params.image_pull_policy)
14884
14963
  command:
14885
14964
  - ansible-playbook
@@ -15313,7 +15392,7 @@ spec:
15313
15392
  echo '--------------------------------------------------------------------------------'
15314
15393
  exit $RESULT
15315
15394
  timeout: "0"
15316
- image: quay.io/ibmmas/cli:15.7.0
15395
+ image: quay.io/ibmmas/cli:15.9.0
15317
15396
  imagePullPolicy: $(params.image_pull_policy)
15318
15397
  env:
15319
15398
  - name: DEVOPS_MONGO_URI
@@ -15373,7 +15452,7 @@ spec:
15373
15452
  echo '--------------------------------------------------------------------------------'
15374
15453
  exit $RESULT
15375
15454
  timeout: "0"
15376
- image: quay.io/ibmmas/cli:15.7.0
15455
+ image: quay.io/ibmmas/cli:15.9.0
15377
15456
  imagePullPolicy: $(params.image_pull_policy)
15378
15457
  env:
15379
15458
  - name: DEVOPS_MONGO_URI
@@ -15446,7 +15525,7 @@ spec:
15446
15525
  echo '--------------------------------------------------------------------------------'
15447
15526
  exit $RESULT
15448
15527
  timeout: "0"
15449
- image: quay.io/ibmmas/cli:15.7.0
15528
+ image: quay.io/ibmmas/cli:15.9.0
15450
15529
  imagePullPolicy: $(params.image_pull_policy)
15451
15530
  env:
15452
15531
  - name: DEVOPS_MONGO_URI
@@ -15492,7 +15571,7 @@ spec:
15492
15571
 
15493
15572
  steps:
15494
15573
  - name: start-pipelinerun
15495
- image: quay.io/ibmmas/cli:15.7.0
15574
+ image: quay.io/ibmmas/cli:15.9.0
15496
15575
  imagePullPolicy: $(params.image_pull_policy)
15497
15576
  command:
15498
15577
  - ansible-playbook
@@ -15589,7 +15668,7 @@ spec:
15589
15668
  optional: false
15590
15669
 
15591
15670
  - name: wait-for-pipelinerun
15592
- image: quay.io/ibmmas/cli:15.7.0
15671
+ image: quay.io/ibmmas/cli:15.9.0
15593
15672
  imagePullPolicy: $(params.image_pull_policy)
15594
15673
  # 50 retries at 5 minute intervals = just over 4 hours
15595
15674
  command:
@@ -15633,7 +15712,7 @@ spec:
15633
15712
 
15634
15713
  steps:
15635
15714
  - name: start-pipelinerun
15636
- image: quay.io/ibmmas/cli:15.7.0
15715
+ image: quay.io/ibmmas/cli:15.9.0
15637
15716
  imagePullPolicy: $(params.image_pull_policy)
15638
15717
  command:
15639
15718
  - ansible-playbook
@@ -15786,7 +15865,7 @@ spec:
15786
15865
  optional: false
15787
15866
 
15788
15867
  - name: wait-for-pipelinerun
15789
- image: quay.io/ibmmas/cli:15.7.0
15868
+ image: quay.io/ibmmas/cli:15.9.0
15790
15869
  imagePullPolicy: $(params.image_pull_policy)
15791
15870
  # 50 retries at 10 minute intervals = just over 8 hours
15792
15871
  command:
@@ -15835,7 +15914,7 @@ spec:
15835
15914
 
15836
15915
  steps:
15837
15916
  - name: start-pipelinerun
15838
- image: quay.io/ibmmas/cli:15.7.0
15917
+ image: quay.io/ibmmas/cli:15.9.0
15839
15918
  imagePullPolicy: $(params.image_pull_policy)
15840
15919
  command:
15841
15920
  - ansible-playbook
@@ -15885,7 +15964,7 @@ spec:
15885
15964
 
15886
15965
  steps:
15887
15966
  - name: start-pipelinerun
15888
- image: quay.io/ibmmas/cli:15.7.0
15967
+ image: quay.io/ibmmas/cli:15.9.0
15889
15968
  imagePullPolicy: $(params.image_pull_policy)
15890
15969
  command:
15891
15970
  - ansible-playbook
@@ -15964,7 +16043,7 @@ spec:
15964
16043
  optional: false
15965
16044
 
15966
16045
  - name: wait-for-pipelinerun
15967
- image: quay.io/ibmmas/cli:15.7.0
16046
+ image: quay.io/ibmmas/cli:15.9.0
15968
16047
  imagePullPolicy: $(params.image_pull_policy)
15969
16048
  # 15 retries at 5 minute intervals = just over 1 hour
15970
16049
  command:
@@ -16009,7 +16088,7 @@ spec:
16009
16088
 
16010
16089
  steps:
16011
16090
  - name: start-pipelinerun
16012
- image: quay.io/ibmmas/cli:15.7.0
16091
+ image: quay.io/ibmmas/cli:15.9.0
16013
16092
  imagePullPolicy: $(params.image_pull_policy)
16014
16093
  command:
16015
16094
  - ansible-playbook
@@ -16137,7 +16216,7 @@ spec:
16137
16216
  optional: false
16138
16217
 
16139
16218
  - name: wait-for-pipelinerun
16140
- image: quay.io/ibmmas/cli:15.7.0
16219
+ image: quay.io/ibmmas/cli:15.9.0
16141
16220
  imagePullPolicy: $(params.image_pull_policy)
16142
16221
  # 50 retries at 10 minute intervals = just over 8 hours
16143
16222
  command:
@@ -16181,7 +16260,7 @@ spec:
16181
16260
 
16182
16261
  steps:
16183
16262
  - name: start-pipelinerun
16184
- image: quay.io/ibmmas/cli:15.7.0
16263
+ image: quay.io/ibmmas/cli:15.9.0
16185
16264
  imagePullPolicy: $(params.image_pull_policy)
16186
16265
  command:
16187
16266
  - ansible-playbook
@@ -16334,7 +16413,7 @@ spec:
16334
16413
  optional: false
16335
16414
 
16336
16415
  - name: wait-for-pipelinerun
16337
- image: quay.io/ibmmas/cli:15.7.0
16416
+ image: quay.io/ibmmas/cli:15.9.0
16338
16417
  imagePullPolicy: $(params.image_pull_policy)
16339
16418
  # 50 retries at 10 minute intervals = just over 8 hours
16340
16419
  command:
@@ -16384,7 +16463,7 @@ spec:
16384
16463
 
16385
16464
  steps:
16386
16465
  - name: start-pytest-pipelinerun
16387
- image: quay.io/ibmmas/cli:15.7.0
16466
+ image: quay.io/ibmmas/cli:15.9.0
16388
16467
  imagePullPolicy: $(params.image_pull_policy)
16389
16468
  command:
16390
16469
  - ansible-playbook
@@ -16464,7 +16543,7 @@ spec:
16464
16543
  optional: false
16465
16544
 
16466
16545
  - name: wait-for-pytest-pipelinerun
16467
- image: quay.io/ibmmas/cli:15.7.0
16546
+ image: quay.io/ibmmas/cli:15.9.0
16468
16547
  imagePullPolicy: $(params.image_pull_policy)
16469
16548
  # 50 retries at 10 minute intervals = just over 8 hours
16470
16549
  command:
@@ -16490,7 +16569,7 @@ spec:
16490
16569
  value: "True"
16491
16570
 
16492
16571
  - name: start-testng-pipelinerun
16493
- image: quay.io/ibmmas/cli:15.7.0
16572
+ image: quay.io/ibmmas/cli:15.9.0
16494
16573
  imagePullPolicy: $(params.image_pull_policy)
16495
16574
  command:
16496
16575
  - ansible-playbook
@@ -16589,7 +16668,7 @@ spec:
16589
16668
  optional: false
16590
16669
 
16591
16670
  - name: wait-for-testng-pipelinerun
16592
- image: quay.io/ibmmas/cli:15.7.0
16671
+ image: quay.io/ibmmas/cli:15.9.0
16593
16672
  imagePullPolicy: $(params.image_pull_policy)
16594
16673
  # 50 retries at 10 minute intervals = just over 8 hours
16595
16674
  command:
@@ -16615,7 +16694,7 @@ spec:
16615
16694
  value: "True"
16616
16695
 
16617
16696
  - name: start-requests-pipelinerun
16618
- image: quay.io/ibmmas/cli:15.7.0
16697
+ image: quay.io/ibmmas/cli:15.9.0
16619
16698
  imagePullPolicy: $(params.image_pull_policy)
16620
16699
  command:
16621
16700
  - ansible-playbook
@@ -16697,7 +16776,7 @@ spec:
16697
16776
  optional: false
16698
16777
 
16699
16778
  - name: wait-for-requests-pipelinerun
16700
- image: quay.io/ibmmas/cli:15.7.0
16779
+ image: quay.io/ibmmas/cli:15.9.0
16701
16780
  imagePullPolicy: $(params.image_pull_policy)
16702
16781
  # 50 retries at 10 minute intervals = just over 8 hours
16703
16782
  command:
@@ -16741,7 +16820,7 @@ spec:
16741
16820
 
16742
16821
  steps:
16743
16822
  - name: start-pipelinerun
16744
- image: quay.io/ibmmas/cli:15.7.0
16823
+ image: quay.io/ibmmas/cli:15.9.0
16745
16824
  imagePullPolicy: $(params.image_pull_policy)
16746
16825
  command:
16747
16826
  - ansible-playbook
@@ -16832,7 +16911,7 @@ spec:
16832
16911
  optional: false
16833
16912
 
16834
16913
  - name: wait-for-pipelinerun
16835
- image: quay.io/ibmmas/cli:15.7.0
16914
+ image: quay.io/ibmmas/cli:15.9.0
16836
16915
  imagePullPolicy: $(params.image_pull_policy)
16837
16916
  # 50 retries at 5 minute intervals = 4 hours
16838
16917
  command:
@@ -16876,7 +16955,7 @@ spec:
16876
16955
 
16877
16956
  steps:
16878
16957
  - name: start-pipelinerun
16879
- image: quay.io/ibmmas/cli:15.7.0
16958
+ image: quay.io/ibmmas/cli:15.9.0
16880
16959
  imagePullPolicy: $(params.image_pull_policy)
16881
16960
  command:
16882
16961
  - ansible-playbook
@@ -16967,7 +17046,7 @@ spec:
16967
17046
  optional: false
16968
17047
 
16969
17048
  - name: wait-for-pipelinerun
16970
- image: quay.io/ibmmas/cli:15.7.0
17049
+ image: quay.io/ibmmas/cli:15.9.0
16971
17050
  imagePullPolicy: $(params.image_pull_policy)
16972
17051
  # 50 retries at 5 minute intervals = 4 hours
16973
17052
  command:
@@ -17011,7 +17090,7 @@ spec:
17011
17090
 
17012
17091
  steps:
17013
17092
  - name: start-pipelinerun
17014
- image: quay.io/ibmmas/cli:15.7.0
17093
+ image: quay.io/ibmmas/cli:15.9.0
17015
17094
  imagePullPolicy: $(params.image_pull_policy)
17016
17095
  command:
17017
17096
  - ansible-playbook
@@ -17090,7 +17169,7 @@ spec:
17090
17169
  optional: false
17091
17170
 
17092
17171
  - name: wait-for-pipelinerun
17093
- image: quay.io/ibmmas/cli:15.7.0
17172
+ image: quay.io/ibmmas/cli:15.9.0
17094
17173
  imagePullPolicy: $(params.image_pull_policy)
17095
17174
  # 50 retries at 5 minute intervals = 4 hours
17096
17175
  command:
@@ -17134,7 +17213,7 @@ spec:
17134
17213
 
17135
17214
  steps:
17136
17215
  - name: start-pipelinerun
17137
- image: quay.io/ibmmas/cli:15.7.0
17216
+ image: quay.io/ibmmas/cli:15.9.0
17138
17217
  imagePullPolicy: $(params.image_pull_policy)
17139
17218
  command:
17140
17219
  - ansible-playbook
@@ -17219,7 +17298,7 @@ spec:
17219
17298
  optional: false
17220
17299
 
17221
17300
  - name: wait-for-pipelinerun
17222
- image: quay.io/ibmmas/cli:15.7.0
17301
+ image: quay.io/ibmmas/cli:15.9.0
17223
17302
  imagePullPolicy: $(params.image_pull_policy)
17224
17303
  # 15 retries at 5 minute intervals = just over 1 hour
17225
17304
  command:
@@ -17263,7 +17342,7 @@ spec:
17263
17342
 
17264
17343
  steps:
17265
17344
  - name: start-pipelinerun
17266
- image: quay.io/ibmmas/cli:15.7.0
17345
+ image: quay.io/ibmmas/cli:15.9.0
17267
17346
  imagePullPolicy: $(params.image_pull_policy)
17268
17347
  command:
17269
17348
  - ansible-playbook
@@ -17359,7 +17438,7 @@ spec:
17359
17438
  optional: false
17360
17439
 
17361
17440
  - name: wait-for-pipelinerun
17362
- image: quay.io/ibmmas/cli:15.7.0
17441
+ image: quay.io/ibmmas/cli:15.9.0
17363
17442
  imagePullPolicy: $(params.image_pull_policy)
17364
17443
  # 10 retries at 5 minute intervals = 50 min
17365
17444
  command:
@@ -17407,7 +17486,7 @@ spec:
17407
17486
 
17408
17487
  steps:
17409
17488
  - name: start-pipelinerun
17410
- image: quay.io/ibmmas/cli:15.7.0
17489
+ image: quay.io/ibmmas/cli:15.9.0
17411
17490
  imagePullPolicy: $(params.image_pull_policy)
17412
17491
  command:
17413
17492
  - ansible-playbook
@@ -17511,7 +17590,7 @@ spec:
17511
17590
  optional: false
17512
17591
 
17513
17592
  - name: wait-for-pipelinerun
17514
- image: quay.io/ibmmas/cli:15.7.0
17593
+ image: quay.io/ibmmas/cli:15.9.0
17515
17594
  imagePullPolicy: $(params.image_pull_policy)
17516
17595
  # 10 retries at 5 minute intervals = 50 min
17517
17596
  command:
@@ -17555,7 +17634,7 @@ spec:
17555
17634
 
17556
17635
  steps:
17557
17636
  - name: start-pipelinerun
17558
- image: quay.io/ibmmas/cli:15.7.0
17637
+ image: quay.io/ibmmas/cli:15.9.0
17559
17638
  imagePullPolicy: $(params.image_pull_policy)
17560
17639
  command:
17561
17640
  - ansible-playbook
@@ -17634,7 +17713,7 @@ spec:
17634
17713
  optional: false
17635
17714
 
17636
17715
  - name: wait-for-pipelinerun
17637
- image: quay.io/ibmmas/cli:15.7.0
17716
+ image: quay.io/ibmmas/cli:15.9.0
17638
17717
  imagePullPolicy: $(params.image_pull_policy)
17639
17718
  # 50 retries at 10 minute intervals = just over 8 hours
17640
17719
  command:
@@ -17678,7 +17757,7 @@ spec:
17678
17757
 
17679
17758
  steps:
17680
17759
  - name: start-pipelinerun
17681
- image: quay.io/ibmmas/cli:15.7.0
17760
+ image: quay.io/ibmmas/cli:15.9.0
17682
17761
  imagePullPolicy: $(params.image_pull_policy)
17683
17762
  command:
17684
17763
  - ansible-playbook
@@ -17783,7 +17862,7 @@ spec:
17783
17862
  optional: false
17784
17863
 
17785
17864
  - name: wait-for-pipelinerun
17786
- image: quay.io/ibmmas/cli:15.7.0
17865
+ image: quay.io/ibmmas/cli:15.9.0
17787
17866
  imagePullPolicy: $(params.image_pull_policy)
17788
17867
  # 50 retries at 10 minute intervals = just over 8 hours
17789
17868
  command:
@@ -17808,6 +17887,112 @@ spec:
17808
17887
  - name: IGNORE_FAILURE
17809
17888
  value: "True"
17810
17889
  # --------------------------------------------------------------------------------
17890
+ # /home/runner/work/cli/cli/tekton/target/tasks/minio.yaml
17891
+ # --------------------------------------------------------------------------------
17892
+ ---
17893
+ apiVersion: tekton.dev/v1beta1
17894
+ kind: Task
17895
+ metadata:
17896
+ name: mas-devops-minio
17897
+ spec:
17898
+ params:
17899
+ # Common: Control the image pull policy for the CLI container image
17900
+ - name: image_pull_policy
17901
+ type: string
17902
+ default: IfNotPresent
17903
+
17904
+ # Common: Support for saving task execution results to a MongoDb instance
17905
+ - name: devops_suite_name
17906
+ type: string
17907
+ description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
17908
+ default: ""
17909
+
17910
+
17911
+ # Pre-Release Support
17912
+ - name: artifactory_username
17913
+ default: ''
17914
+ type: string
17915
+ description: Required to use development MAS builds
17916
+ - name: artifactory_token
17917
+ default: ''
17918
+ type: string
17919
+ description: Required to use development MAS builds
17920
+
17921
+ # Entitlement
17922
+ - name: ibm_entitlement_key
17923
+ type: string
17924
+
17925
+ # MAS Details
17926
+ - name: mas_instance_id
17927
+ type: string
17928
+ description: Instance ID
17929
+
17930
+ # Minio credentials
17931
+ - name: minio_root_user
17932
+ type: string
17933
+ description: root user for minio
17934
+ default: ""
17935
+ - name: minio_root_password
17936
+ type: string
17937
+
17938
+ stepTemplate:
17939
+ env:
17940
+ - name: DEVOPS_MONGO_URI
17941
+ valueFrom:
17942
+ secretKeyRef:
17943
+ name: mas-devops
17944
+ key: DEVOPS_MONGO_URI
17945
+ optional: true
17946
+ - name: DEVOPS_BUILD_NUMBER
17947
+ valueFrom:
17948
+ secretKeyRef:
17949
+ name: mas-devops
17950
+ key: DEVOPS_BUILD_NUMBER
17951
+ optional: true
17952
+ - name: DEVOPS_ENVIRONMENT
17953
+ valueFrom:
17954
+ secretKeyRef:
17955
+ name: mas-devops
17956
+ key: MAS_INSTANCE_ID
17957
+ optional: true
17958
+ - name: DEVOPS_SUITE_NAME
17959
+ value: $(params.devops_suite_name)
17960
+
17961
+
17962
+ # Pre-Release Support
17963
+ - name: ARTIFACTORY_USERNAME
17964
+ value: $(params.artifactory_username)
17965
+ - name: ARTIFACTORY_TOKEN
17966
+ value: $(params.artifactory_token)
17967
+
17968
+ # Entitlement
17969
+ - name: IBM_ENTITLEMENT_KEY
17970
+ value: $(params.ibm_entitlement_key)
17971
+
17972
+ # MAS Details
17973
+ - name: MAS_INSTANCE_ID
17974
+ value: $(params.mas_instance_id)
17975
+
17976
+ - name: MINIO_NAMESPACE
17977
+ value: minio
17978
+
17979
+ - name: MINIO_INSTANCE_NAME
17980
+ value: minio
17981
+
17982
+ - name: MINIO_ROOT_USER
17983
+ value: $(params.minio_root_user)
17984
+
17985
+ - name: MINIO_ROOT_PASSWORD
17986
+ value: $(params.minio_root_password)
17987
+
17988
+ steps:
17989
+ - name: minio
17990
+ command:
17991
+ - /opt/app-root/src/run-role.sh
17992
+ - minio
17993
+ image: quay.io/ibmmas/cli:15.9.0
17994
+ imagePullPolicy: $(params.image_pull_policy)
17995
+ # --------------------------------------------------------------------------------
17811
17996
  # /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
17812
17997
  # --------------------------------------------------------------------------------
17813
17998
  ---
@@ -17983,7 +18168,7 @@ spec:
17983
18168
  command:
17984
18169
  - /opt/app-root/src/run-role.sh
17985
18170
  - mongodb
17986
- image: quay.io/ibmmas/cli:15.7.0
18171
+ image: quay.io/ibmmas/cli:15.9.0
17987
18172
  imagePullPolicy: $(params.image_pull_policy)
17988
18173
  workingDir: /workspace/configs
17989
18174
 
@@ -18026,7 +18211,7 @@ spec:
18026
18211
  - $(params.base_output_dir)
18027
18212
  - --extra-namespaces
18028
18213
  - selenium
18029
- image: quay.io/ibmmas/cli:15.7.0
18214
+ image: quay.io/ibmmas/cli:15.9.0
18030
18215
  imagePullPolicy: $(params.image_pull_policy)
18031
18216
  env:
18032
18217
  - name: DEVOPS_MONGO_URI
@@ -18143,7 +18328,7 @@ spec:
18143
18328
  command:
18144
18329
  - /opt/app-root/src/run-role.sh
18145
18330
  - nvidia_gpu
18146
- image: quay.io/ibmmas/cli:15.7.0
18331
+ image: quay.io/ibmmas/cli:15.9.0
18147
18332
  imagePullPolicy: $(params.image_pull_policy)
18148
18333
  workingDir: /workspace/configs
18149
18334
 
@@ -18179,7 +18364,7 @@ spec:
18179
18364
  # Verify Cluster
18180
18365
  # -------------------------------------------------------------------------
18181
18366
  - name: ocp-verify-cluster
18182
- image: quay.io/ibmmas/cli:15.7.0
18367
+ image: quay.io/ibmmas/cli:15.9.0
18183
18368
  imagePullPolicy: $(params.image_pull_policy)
18184
18369
  command:
18185
18370
  - /opt/app-root/src/run-role.sh
@@ -18221,7 +18406,7 @@ spec:
18221
18406
  # Verify Catalogs
18222
18407
  # -------------------------------------------------------------------------
18223
18408
  - name: ocp-verify-catalogs
18224
- image: quay.io/ibmmas/cli:15.7.0
18409
+ image: quay.io/ibmmas/cli:15.9.0
18225
18410
  imagePullPolicy: $(params.image_pull_policy)
18226
18411
  command:
18227
18412
  - /opt/app-root/src/run-role.sh
@@ -18263,7 +18448,7 @@ spec:
18263
18448
  # Verify Subscriptions
18264
18449
  # -------------------------------------------------------------------------
18265
18450
  - name: ocp-verify-subscriptions
18266
- image: quay.io/ibmmas/cli:15.7.0
18451
+ image: quay.io/ibmmas/cli:15.9.0
18267
18452
  imagePullPolicy: $(params.image_pull_policy)
18268
18453
  command:
18269
18454
  - /opt/app-root/src/run-role.sh
@@ -18305,7 +18490,7 @@ spec:
18305
18490
  # Verify Workloads
18306
18491
  # -------------------------------------------------------------------------
18307
18492
  - name: ocp-verify-workloads
18308
- image: quay.io/ibmmas/cli:15.7.0
18493
+ image: quay.io/ibmmas/cli:15.9.0
18309
18494
  imagePullPolicy: $(params.image_pull_policy)
18310
18495
  command:
18311
18496
  - /opt/app-root/src/run-role.sh
@@ -18347,7 +18532,7 @@ spec:
18347
18532
  # Verify Catalogs - Ingress TLS
18348
18533
  # -------------------------------------------------------------------------
18349
18534
  - name: ocp-verify-ingress
18350
- image: quay.io/ibmmas/cli:15.7.0
18535
+ image: quay.io/ibmmas/cli:15.9.0
18351
18536
  imagePullPolicy: $(params.image_pull_policy)
18352
18537
  command:
18353
18538
  - /opt/app-root/src/run-role.sh
@@ -18473,7 +18658,7 @@ spec:
18473
18658
  command:
18474
18659
  - /opt/app-root/src/run-role.sh
18475
18660
  - ocp_verify
18476
- image: quay.io/ibmmas/cli:15.7.0
18661
+ image: quay.io/ibmmas/cli:15.9.0
18477
18662
  imagePullPolicy: $(params.image_pull_policy)
18478
18663
  workingDir: /workspace/configs
18479
18664
  # --------------------------------------------------------------------------------
@@ -18541,7 +18726,7 @@ spec:
18541
18726
  command:
18542
18727
  - /opt/app-root/src/run-role.sh
18543
18728
  - ocs
18544
- image: quay.io/ibmmas/cli:15.7.0
18729
+ image: quay.io/ibmmas/cli:15.9.0
18545
18730
  imagePullPolicy: $(params.image_pull_policy)
18546
18731
  workingDir: /workspace/configs
18547
18732
 
@@ -18670,7 +18855,7 @@ spec:
18670
18855
  command:
18671
18856
  - /opt/app-root/src/run-role.sh
18672
18857
  - aiservice_odh
18673
- image: quay.io/ibmmas/cli:15.7.0
18858
+ image: quay.io/ibmmas/cli:15.9.0
18674
18859
  imagePullPolicy: $(params.image_pull_policy)
18675
18860
  # --------------------------------------------------------------------------------
18676
18861
  # /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
@@ -18846,7 +19031,7 @@ spec:
18846
19031
  command:
18847
19032
  - /opt/app-root/src/run-role.sh
18848
19033
  - sls
18849
- image: quay.io/ibmmas/cli:15.7.0
19034
+ image: quay.io/ibmmas/cli:15.9.0
18850
19035
  imagePullPolicy: $(params.image_pull_policy)
18851
19036
  workingDir: /workspace/configs
18852
19037
 
@@ -19306,12 +19491,12 @@ spec:
19306
19491
  command:
19307
19492
  - /opt/app-root/src/run-role.sh
19308
19493
  - suite_app_config
19309
- image: quay.io/ibmmas/cli:15.7.0
19494
+ image: quay.io/ibmmas/cli:15.9.0
19310
19495
  imagePullPolicy: $(params.image_pull_policy)
19311
19496
 
19312
19497
  # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set STATUS=pending and wait for it to be changed to "approved"
19313
19498
  - name: app-cfg-post-verify
19314
- image: quay.io/ibmmas/cli:15.7.0
19499
+ image: quay.io/ibmmas/cli:15.9.0
19315
19500
  imagePullPolicy: $(params.image_pull_policy)
19316
19501
  command:
19317
19502
  - /opt/app-root/src/wait-for-configmap.sh
@@ -19506,7 +19691,7 @@ spec:
19506
19691
  command:
19507
19692
  - /opt/app-root/src/run-role.sh
19508
19693
  - suite_app_install
19509
- image: quay.io/ibmmas/cli:15.7.0
19694
+ image: quay.io/ibmmas/cli:15.9.0
19510
19695
  imagePullPolicy: $(params.image_pull_policy)
19511
19696
 
19512
19697
  workspaces:
@@ -19595,7 +19780,7 @@ spec:
19595
19780
  command:
19596
19781
  - /opt/app-root/src/run-role.sh
19597
19782
  - suite_app_rollback
19598
- image: quay.io/ibmmas/cli:15.7.0
19783
+ image: quay.io/ibmmas/cli:15.9.0
19599
19784
  imagePullPolicy: $(params.image_pull_policy)
19600
19785
  # --------------------------------------------------------------------------------
19601
19786
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -19658,7 +19843,7 @@ spec:
19658
19843
  command:
19659
19844
  - /opt/app-root/src/run-role.sh
19660
19845
  - suite_app_uninstall
19661
- image: quay.io/ibmmas/cli:15.7.0
19846
+ image: quay.io/ibmmas/cli:15.9.0
19662
19847
  imagePullPolicy: $(params.image_pull_policy)
19663
19848
  # --------------------------------------------------------------------------------
19664
19849
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -19733,7 +19918,7 @@ spec:
19733
19918
  command:
19734
19919
  - /opt/app-root/src/run-role.sh
19735
19920
  - suite_app_upgrade
19736
- image: quay.io/ibmmas/cli:15.7.0
19921
+ image: quay.io/ibmmas/cli:15.9.0
19737
19922
  imagePullPolicy: $(params.image_pull_policy)
19738
19923
  # --------------------------------------------------------------------------------
19739
19924
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -19834,7 +20019,7 @@ spec:
19834
20019
  command:
19835
20020
  - /opt/app-root/src/run-role.sh
19836
20021
  - suite_app_verify
19837
- image: quay.io/ibmmas/cli:15.7.0
20022
+ image: quay.io/ibmmas/cli:15.9.0
19838
20023
  imagePullPolicy: $(params.image_pull_policy)
19839
20024
  # --------------------------------------------------------------------------------
19840
20025
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -19977,7 +20162,7 @@ spec:
19977
20162
  command:
19978
20163
  - /opt/app-root/src/run-role.sh
19979
20164
  - suite_certs
19980
- image: quay.io/ibmmas/cli:15.7.0
20165
+ image: quay.io/ibmmas/cli:15.9.0
19981
20166
  imagePullPolicy: $(params.image_pull_policy)
19982
20167
 
19983
20168
  workspaces:
@@ -20044,7 +20229,7 @@ spec:
20044
20229
  command:
20045
20230
  - /opt/app-root/src/run-role.sh
20046
20231
  - suite_config
20047
- image: quay.io/ibmmas/cli:15.7.0
20232
+ image: quay.io/ibmmas/cli:15.9.0
20048
20233
  imagePullPolicy: $(params.image_pull_policy)
20049
20234
  workingDir: /workspace/configs
20050
20235
 
@@ -20376,7 +20561,7 @@ spec:
20376
20561
  command:
20377
20562
  - /opt/app-root/src/run-role.sh
20378
20563
  - suite_db2_setup_for_facilities
20379
- image: quay.io/ibmmas/cli:15.7.0
20564
+ image: quay.io/ibmmas/cli:15.9.0
20380
20565
  imagePullPolicy: $(params.image_pull_policy)
20381
20566
  workingDir: /workspace/configs
20382
20567
 
@@ -20448,7 +20633,7 @@ spec:
20448
20633
  command:
20449
20634
  - /opt/app-root/src/run-role.sh
20450
20635
  - suite_db2_setup_for_manage
20451
- image: quay.io/ibmmas/cli:15.7.0
20636
+ image: quay.io/ibmmas/cli:15.9.0
20452
20637
  imagePullPolicy: $(params.image_pull_policy)
20453
20638
  # --------------------------------------------------------------------------------
20454
20639
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -20643,7 +20828,7 @@ spec:
20643
20828
  command:
20644
20829
  - /opt/app-root/src/run-role.sh
20645
20830
  - suite_dns
20646
- image: quay.io/ibmmas/cli:15.7.0
20831
+ image: quay.io/ibmmas/cli:15.9.0
20647
20832
  imagePullPolicy: $(params.image_pull_policy)
20648
20833
  # --------------------------------------------------------------------------------
20649
20834
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -20892,7 +21077,7 @@ spec:
20892
21077
  command:
20893
21078
  - /opt/app-root/src/run-role.sh
20894
21079
  - suite_install
20895
- image: quay.io/ibmmas/cli:15.7.0
21080
+ image: quay.io/ibmmas/cli:15.9.0
20896
21081
  imagePullPolicy: $(params.image_pull_policy)
20897
21082
  workingDir: /workspace/configs
20898
21083
 
@@ -20980,7 +21165,7 @@ spec:
20980
21165
  command:
20981
21166
  - /opt/app-root/src/run-role.sh
20982
21167
  - suite_rollback
20983
- image: quay.io/ibmmas/cli:15.7.0
21168
+ image: quay.io/ibmmas/cli:15.9.0
20984
21169
  imagePullPolicy: $(params.image_pull_policy)
20985
21170
  # --------------------------------------------------------------------------------
20986
21171
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -21045,7 +21230,7 @@ spec:
21045
21230
  command:
21046
21231
  - /opt/app-root/src/run-role.sh
21047
21232
  - suite_uninstall
21048
- image: quay.io/ibmmas/cli:15.7.0
21233
+ image: quay.io/ibmmas/cli:15.9.0
21049
21234
  imagePullPolicy: $(params.image_pull_policy)
21050
21235
  # --------------------------------------------------------------------------------
21051
21236
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -21115,7 +21300,7 @@ spec:
21115
21300
  command:
21116
21301
  - /opt/app-root/src/run-role.sh
21117
21302
  - suite_upgrade
21118
- image: quay.io/ibmmas/cli:15.7.0
21303
+ image: quay.io/ibmmas/cli:15.9.0
21119
21304
  imagePullPolicy: $(params.image_pull_policy)
21120
21305
  # --------------------------------------------------------------------------------
21121
21306
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -21177,12 +21362,12 @@ spec:
21177
21362
  command:
21178
21363
  - /opt/app-root/src/run-role.sh
21179
21364
  - suite_verify
21180
- image: quay.io/ibmmas/cli:15.7.0
21365
+ image: quay.io/ibmmas/cli:15.9.0
21181
21366
  imagePullPolicy: $(params.image_pull_policy)
21182
21367
 
21183
21368
  # If configmap/approval-suite-verify exists then set STATUS=pending and wait for it to be changed to "approved"
21184
21369
  - name: suite-post-verify
21185
- image: quay.io/ibmmas/cli:15.7.0
21370
+ image: quay.io/ibmmas/cli:15.9.0
21186
21371
  imagePullPolicy: $(params.image_pull_policy)
21187
21372
  command:
21188
21373
  - /opt/app-root/src/wait-for-configmap.sh
@@ -21305,7 +21490,7 @@ spec:
21305
21490
  command:
21306
21491
  - /opt/app-root/src/run-role.sh
21307
21492
  - turbonomic
21308
- image: quay.io/ibmmas/cli:15.7.0
21493
+ image: quay.io/ibmmas/cli:15.9.0
21309
21494
  imagePullPolicy: $(params.image_pull_policy)
21310
21495
  # --------------------------------------------------------------------------------
21311
21496
  # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -21386,7 +21571,7 @@ spec:
21386
21571
  # IBM User Data Services (UDS)
21387
21572
  # -------------------------------------------------------------------------
21388
21573
  - name: uds
21389
- image: quay.io/ibmmas/cli:15.7.0
21574
+ image: quay.io/ibmmas/cli:15.9.0
21390
21575
  imagePullPolicy: $(params.image_pull_policy)
21391
21576
  workingDir: /workspace/configs
21392
21577
  command:
@@ -21449,7 +21634,7 @@ spec:
21449
21634
  # IBM Data Reporter Operator (DRO)
21450
21635
  # -------------------------------------------------------------------------
21451
21636
  - name: dro
21452
- image: quay.io/ibmmas/cli:15.7.0
21637
+ image: quay.io/ibmmas/cli:15.9.0
21453
21638
  imagePullPolicy: $(params.image_pull_policy)
21454
21639
  workingDir: /workspace/configs
21455
21640
  command:
@@ -21535,7 +21720,7 @@ spec:
21535
21720
  description: "The value to set"
21536
21721
  steps:
21537
21722
  - name: update-configmap
21538
- image: quay.io/ibmmas/cli:15.7.0
21723
+ image: quay.io/ibmmas/cli:15.9.0
21539
21724
  command:
21540
21725
  - /opt/app-root/src/update-configmap.sh
21541
21726
  env:
@@ -21582,7 +21767,7 @@ spec:
21582
21767
 
21583
21768
  steps:
21584
21769
  - name: wait-for-configmap
21585
- image: quay.io/ibmmas/cli:15.7.0
21770
+ image: quay.io/ibmmas/cli:15.9.0
21586
21771
  command:
21587
21772
  - /opt/app-root/src/wait-for-configmap.sh
21588
21773
  env:
@@ -21663,7 +21848,7 @@ spec:
21663
21848
 
21664
21849
  steps:
21665
21850
  - name: wait-for-configmap
21666
- image: quay.io/ibmmas/cli:15.7.0
21851
+ image: quay.io/ibmmas/cli:15.9.0
21667
21852
  command:
21668
21853
  - /opt/app-root/src/wait-for-configmap.sh
21669
21854
  env:
@@ -21723,7 +21908,7 @@ spec:
21723
21908
 
21724
21909
  steps:
21725
21910
  - name: wait
21726
- image: quay.io/ibmmas/cli:15.7.0
21911
+ image: quay.io/ibmmas/cli:15.9.0
21727
21912
  command:
21728
21913
  - /opt/app-root/src/wait-for-tekton.sh
21729
21914
  env:
@@ -22618,6 +22803,10 @@ spec:
22618
22803
  type: string
22619
22804
  description: watsonx action for IBM Maximo AI Service
22620
22805
  default: ""
22806
+ - name: aiservice_watsonxai_ca_crt
22807
+ type: string
22808
+ description: WatsonX CA certificate for IBM Maximo AI Service
22809
+ default: ""
22621
22810
 
22622
22811
  # MAS Application Configuration - IBM Maximo AI Service - RSL
22623
22812
  # -----------------------------------------------------------------------------
@@ -23152,6 +23341,8 @@ spec:
23152
23341
  value: $(params.aiservice_watsonxai_space_id)
23153
23342
  - name: aiservice_watsonx_action
23154
23343
  value: $(params.aiservice_watsonx_action)
23344
+ - name: aiservice_watsonxai_ca_crt
23345
+ value: $(params.aiservice_watsonxai_ca_crt)
23155
23346
 
23156
23347
  - name: mas_icr_cp
23157
23348
  value: $(params.mas_icr_cp)
@@ -23219,6 +23410,8 @@ spec:
23219
23410
  value: $(params.aiservice_watsonxai_space_id)
23220
23411
  - name: aiservice_watsonx_action
23221
23412
  value: $(params.aiservice_watsonx_action)
23413
+ - name: aiservice_watsonxai_ca_crt
23414
+ value: $(params.aiservice_watsonxai_ca_crt)
23222
23415
 
23223
23416
  - name: tenant_entitlement_type
23224
23417
  value: $(params.tenant_entitlement_type)
@@ -24232,6 +24425,8 @@ spec:
24232
24425
  # JDBC
24233
24426
  - name: jdbc_type_iot
24234
24427
  type: string
24428
+ - name: jdbc_connection_url_additional_params_iot
24429
+ type: string
24235
24430
  - name: jdbc_instance_name_iot
24236
24431
  type: string
24237
24432
  - name: jdbc_route_iot
@@ -24445,6 +24640,8 @@ spec:
24445
24640
  value: $(params.mas_instance_id)
24446
24641
  - name: jdbc_type_iot
24447
24642
  value: $(params.jdbc_type_iot)
24643
+ - name: jdbc_connection_url_additional_params_iot
24644
+ value: $(params.jdbc_connection_url_additional_params_iot)
24448
24645
  - name: jdbc_instance_name_iot
24449
24646
  value: $(params.jdbc_instance_name_iot)
24450
24647
  - name: jdbc_route_iot
@@ -24689,8 +24886,6 @@ spec:
24689
24886
  type: string
24690
24887
  - name: github_host
24691
24888
  type: string
24692
- - name: github_user
24693
- type: string
24694
24889
  - name: git_commit_msg
24695
24890
  type: string
24696
24891
  - name: secrets_path
@@ -25411,6 +25606,8 @@ spec:
25411
25606
 
25412
25607
  - name: jdbc_type_iot
25413
25608
  type: string
25609
+ - name: jdbc_connection_url_additional_params_iot
25610
+ type: string
25414
25611
  - name: jdbc_instance_name_iot
25415
25612
  type: string
25416
25613
  - name: jdbc_connection_url_iot
@@ -26400,6 +26597,8 @@ spec:
26400
26597
  value: system
26401
26598
  - name: jdbc_type
26402
26599
  value: $(params.jdbc_type_iot)
26600
+ - name: jdbc_connection_url_additional_params
26601
+ value: $(params.jdbc_connection_url_additional_params_iot)
26403
26602
  - name: jdbc_instance_name
26404
26603
  value: $(params.jdbc_instance_name_iot)
26405
26604
  - name: jdbc_connection_url
@@ -29786,6 +29985,8 @@ spec:
29786
29985
  value: $(params.mas_workspace_id)
29787
29986
  - name: jdbc_type
29788
29987
  value: $(params.jdbc_type_iot)
29988
+ - name: jdbc_connection_url_additional_params
29989
+ value: $(params.jdbc_connection_url_additional_params_iot)
29789
29990
  - name: jdbc_instance_name
29790
29991
  value: $(params.jdbc_instance_name_iot)
29791
29992
  - name: jdbc_connection_url
@@ -31729,7 +31930,7 @@ spec:
31729
31930
  type: string
31730
31931
  - name: mas_appws_components
31731
31932
  type: string
31732
-
31933
+
31733
31934
  - name: launchfvt_core
31734
31935
  type: string
31735
31936
  default: "true"
@@ -33262,6 +33463,8 @@ metadata:
33262
33463
  spec:
33263
33464
  workspaces:
33264
33465
  - name: shared-entitlement
33466
+ - name: shared-gitops-configs
33467
+ - name: configs
33265
33468
  description: MAS provision Suite License Service for customer subscription
33266
33469
  params:
33267
33470
  - name: cluster_name
@@ -33341,6 +33544,10 @@ spec:
33341
33544
  type: string
33342
33545
  default: ""
33343
33546
 
33547
+ - name: authorized_entitlement_saas_encoded
33548
+ type: string
33549
+ default: ""
33550
+
33344
33551
  - name: mas_slscfg_pod_template_yaml
33345
33552
  type: string
33346
33553
  default: ""
@@ -33381,7 +33588,9 @@ spec:
33381
33588
  value: $(params.sls_license_icn)
33382
33589
  - name: sls_subscription_id
33383
33590
  value: $(params.sls_subscription_id)
33384
-
33591
+
33592
+ - name: authorized_entitlement_saas_encoded
33593
+ value: $(params.authorized_entitlement_saas_encoded)
33385
33594
  workspaces:
33386
33595
  - name: shared-entitlement
33387
33596
  workspace: shared-entitlement
@@ -33389,8 +33598,8 @@ spec:
33389
33598
  kind: Task
33390
33599
  name: gitops-license
33391
33600
  when:
33392
- - input: "$(params.sls_subscription_id)"
33393
- operator: in
33601
+ - input: "$(params.authorized_entitlement_saas_encoded)"
33602
+ operator: notin
33394
33603
  values: [""]
33395
33604
 
33396
33605
  - name: gitops-license-generator
@@ -33418,12 +33627,14 @@ spec:
33418
33627
  value: $(params.sls_license_icn)
33419
33628
  - name: sls_subscription_id
33420
33629
  value: $(params.sls_subscription_id)
33630
+ - name: authorized_entitlement_saas_encoded
33631
+ value: $(params.authorized_entitlement_saas_encoded)
33421
33632
  taskRef:
33422
33633
  kind: Task
33423
33634
  name: gitops-license-generator
33424
33635
  when:
33425
- - input: "$(params.sls_subscription_id)"
33426
- operator: notin
33636
+ - input: "$(params.authorized_entitlement_saas_encoded)"
33637
+ operator: in
33427
33638
  values: [""]
33428
33639
 
33429
33640
  # 2.
@@ -33438,11 +33649,9 @@ spec:
33438
33649
  value: $(params.account)
33439
33650
  - name: secrets_path
33440
33651
  value: $(params.secrets_path)
33441
- - name: mas_instance_id
33442
- value: $(params.mas_instance_id)
33443
33652
  - name: mongo_provider
33444
33653
  value: $(params.mongo_provider)
33445
- - name: user_action
33654
+ - name: docdb_user_action
33446
33655
  value: $(params.docdb_user_action)
33447
33656
 
33448
33657
  - name: github_push
@@ -33481,6 +33690,8 @@ spec:
33481
33690
  value: $(params.sls_license_icn)
33482
33691
  - name: sls_subscription_id
33483
33692
  value: $(params.sls_subscription_id)
33693
+ - name: mas_slscfg_pod_template_yaml
33694
+ value: $(params.mas_slscfg_pod_template_yaml)
33484
33695
 
33485
33696
  taskRef:
33486
33697
  kind: Task
@@ -33488,6 +33699,10 @@ spec:
33488
33699
  workspaces:
33489
33700
  - name: shared-entitlement
33490
33701
  workspace: shared-entitlement
33702
+ - name: configs
33703
+ workspace: configs
33704
+ - name: shared-gitops-configs
33705
+ workspace: shared-gitops-configs
33491
33706
  # --------------------------------------------------------------------------------
33492
33707
  # /home/runner/work/cli/cli/tekton/target/pipelines/mas-fvt-assist.yaml
33493
33708
  # --------------------------------------------------------------------------------
@@ -35543,6 +35758,7 @@ spec:
35543
35758
  # --------------------------------------------------------------------------------
35544
35759
  ---
35545
35760
  # There are various integration points in the install pipeline that we can hang FVT off
35761
+ # 0. config ..................... Performs configuration analysis and environment-specific settings
35546
35762
  # 1. suite-verify ............... Triggered after Core install and configuration is verified
35547
35763
  # 2. app-cfg-assist ............. Triggered after Assist is installed and configured
35548
35764
  # 3. app-cfg-iot ................ Triggered after IoT is installed and configured
@@ -35550,7 +35766,7 @@ spec:
35550
35766
  # 5. app-cfg-monitor ............ Triggered after Monitor is installed and configured
35551
35767
  # 6. app-cfg-optimizer .......... Triggered after Optimizer is installed and configured
35552
35768
  # 7. app-cfg-predict ............ Triggered after Predict is installed and configured
35553
- # 8. app-cft-visualinspection ... Triggered after Visual Inspection is installed and configured
35769
+ # 8. app-cfg-visualinspection ... Triggered after Visual Inspection is installed and configured
35554
35770
 
35555
35771
  apiVersion: tekton.dev/v1beta1
35556
35772
  kind: Pipeline
@@ -35563,6 +35779,11 @@ spec:
35563
35779
 
35564
35780
  - name: mas_instance_id
35565
35781
  type: string
35782
+
35783
+ - name: mas_channel
35784
+ type: string
35785
+ default: ""
35786
+ description: "MAS channel version (e.g., 9.2.0)"
35566
35787
 
35567
35788
  - name: sync_with_install
35568
35789
  type: string
@@ -35673,6 +35894,21 @@ spec:
35673
35894
  default: ""
35674
35895
 
35675
35896
  tasks:
35897
+ # 0. Configuration
35898
+ # -------------------------------------------------------------------------
35899
+ # Performs configuration analysis and sets up environment-specific settings
35900
+ # Currently determines if the MAS channel is >= 9.2.0 and sets the is-post-92 result
35901
+ # This result is used to control the execution order of FVT tasks
35902
+ - name: config
35903
+ taskRef:
35904
+ kind: Task
35905
+ name: mas-config-helper
35906
+ params:
35907
+ - name: image_pull_policy
35908
+ value: $(params.image_pull_policy)
35909
+ - name: mas_channel
35910
+ value: $(params.mas_channel)
35911
+
35676
35912
  # 1. MAS Core FVT
35677
35913
  # -------------------------------------------------------------------------
35678
35914
  - name: waitfor-suite-verify
@@ -35703,6 +35939,8 @@ spec:
35703
35939
  - input: $(params.sync_with_install)
35704
35940
  operator: in
35705
35941
  values: ["true", "True"]
35942
+ runAfter:
35943
+ - config
35706
35944
 
35707
35945
  - name: launchfvt-sls
35708
35946
  timeout: "0"
@@ -35721,7 +35959,7 @@ spec:
35721
35959
  runAfter:
35722
35960
  - waitfor-suite-verify
35723
35961
 
35724
- - name: launchfvt-core
35962
+ - name: launchfvt-core-pre92
35725
35963
  timeout: "0"
35726
35964
  taskRef:
35727
35965
  kind: Task
@@ -35735,8 +35973,34 @@ spec:
35735
35973
  - input: $(params.launchfvt_core)
35736
35974
  operator: in
35737
35975
  values: ["true", "True"]
35976
+ # Run in original position for pre-9.2 installations
35977
+ - input: $(tasks.config.results.is-post-92)
35978
+ operator: in
35979
+ values: ["false", "False"]
35738
35980
  runAfter:
35739
35981
  - waitfor-suite-verify
35982
+
35983
+ # Special case for post-9.2 installations - launchfvt-core runs after manage-setup and before launchfvt-manage
35984
+ - name: launchfvt-core-post92
35985
+ timeout: "0"
35986
+ taskRef:
35987
+ kind: Task
35988
+ name: mas-launchfvt-core
35989
+ params:
35990
+ - name: image_pull_policy
35991
+ value: $(params.image_pull_policy)
35992
+ - name: pipelinerun_name
35993
+ value: "$(params.mas_instance_id)-fvt-core"
35994
+ when:
35995
+ - input: $(params.launchfvt_core)
35996
+ operator: in
35997
+ values: ["true", "True"]
35998
+ # Run in new position for post-9.2 installations
35999
+ - input: $(tasks.config.results.is-post-92)
36000
+ operator: in
36001
+ values: ["true", "True"]
36002
+ runAfter:
36003
+ - manage-setup
35740
36004
 
35741
36005
  - name: approval-suite-verify
35742
36006
  timeout: "0"
@@ -35756,8 +36020,8 @@ spec:
35756
36020
  values: ["true", "True"]
35757
36021
 
35758
36022
  runAfter:
35759
- - launchfvt-core
35760
36023
  - launchfvt-sls
36024
+ - launchfvt-core-pre92
35761
36025
 
35762
36026
 
35763
36027
  # 2. Application FVT - Assist
@@ -35979,7 +36243,7 @@ spec:
35979
36243
  runAfter:
35980
36244
  - waitfor-manage
35981
36245
 
35982
- - name: launchfvt-manage
36246
+ - name: launchfvt-manage-pre92
35983
36247
  timeout: "0"
35984
36248
  params:
35985
36249
  - name: image_pull_policy
@@ -35993,8 +36257,34 @@ spec:
35993
36257
  - input: $(params.launchfvt_manage)
35994
36258
  operator: in
35995
36259
  values: ["true", "True"]
36260
+ # Run in original position for pre-9.2 installations
36261
+ - input: $(tasks.config.results.is-post-92)
36262
+ operator: in
36263
+ values: ["false", "False"]
35996
36264
  runAfter:
35997
36265
  - manage-setup
36266
+
36267
+ # Special case for post-9.2 installations - launchfvt-manage runs after launchfvt-core-post92
36268
+ - name: launchfvt-manage-post92
36269
+ timeout: "0"
36270
+ params:
36271
+ - name: image_pull_policy
36272
+ value: $(params.image_pull_policy)
36273
+ - name: pipelinerun_name
36274
+ value: "$(params.mas_instance_id)-fvt-manage"
36275
+ taskRef:
36276
+ kind: Task
36277
+ name: mas-launchfvt-manage
36278
+ when:
36279
+ - input: $(params.launchfvt_manage)
36280
+ operator: in
36281
+ values: ["true", "True"]
36282
+ # Run in new position for post-9.2 installations
36283
+ - input: $(tasks.config.results.is-post-92)
36284
+ operator: in
36285
+ values: ["true", "True"]
36286
+ runAfter:
36287
+ - launchfvt-core-post92
35998
36288
 
35999
36289
  - name: launchfvt-manage-is
36000
36290
  timeout: "0"
@@ -36012,6 +36302,8 @@ spec:
36012
36302
  values: ["true", "True"]
36013
36303
  runAfter:
36014
36304
  - manage-setup
36305
+ - launchfvt-core-pre92
36306
+ - launchfvt-core-post92
36015
36307
 
36016
36308
  - name: approval-manage
36017
36309
  timeout: "0"
@@ -36030,7 +36322,8 @@ spec:
36030
36322
  operator: in
36031
36323
  values: ["true", "True"]
36032
36324
  runAfter:
36033
- - launchfvt-manage
36325
+ - launchfvt-manage-pre92
36326
+ - launchfvt-manage-post92
36034
36327
  - launchfvt-manage-is
36035
36328
 
36036
36329
  # 6. Application FVT - Mobile