mas-cli 15.6.2__py3-none-any.whl → 15.7.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.6.2
132
+ image: quay.io/ibmmas/cli:15.7.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.6.2
204
+ image: quay.io/ibmmas/cli:15.7.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.6.2
284
+ image: quay.io/ibmmas/cli:15.7.0
285
285
  imagePullPolicy: $(params.image_pull_policy)
286
286
  command:
287
287
  - /opt/app-root/src/wait-for-configmap.sh
@@ -388,6 +388,14 @@ spec:
388
388
  type: string
389
389
  description:
390
390
  default: "This option is mandatory"
391
+ - name: aiservice_watsonxai_deployment_id
392
+ type: string
393
+ description: WatsonX deployment ID for IBM Maximo AI Service
394
+ default: ""
395
+ - name: aiservice_watsonxai_space_id
396
+ type: string
397
+ description: WatsonX space ID for IBM Maximo AI Service
398
+ default: ""
391
399
  - name: aiservice_watsonx_action
392
400
  type: string
393
401
  description:
@@ -471,6 +479,10 @@ spec:
471
479
  value: $(params.aiservice_watsonxai_url)
472
480
  - name: AISERVICE_WATSONXAI_PROJECT_ID
473
481
  value: $(params.aiservice_watsonxai_project_id)
482
+ - name: AISERVICE_WATSONXAI_DEPLOYMENT_ID
483
+ value: $(params.aiservice_watsonxai_deployment_id)
484
+ - name: AISERVICE_WATSONXAI_SPACE_ID
485
+ value: $(params.aiservice_watsonxai_space_id)
474
486
  - name: AISERVICE_WATSONX_ACTION
475
487
  value: $(params.aiservice_watsonx_action)
476
488
 
@@ -495,7 +507,7 @@ spec:
495
507
  command:
496
508
  - /opt/app-root/src/run-role.sh
497
509
  - aiservice_tenant
498
- image: quay.io/ibmmas/cli:15.6.2
510
+ image: quay.io/ibmmas/cli:15.7.0
499
511
  imagePullPolicy: $(params.image_pull_policy)
500
512
  workingDir: /workspace/configs
501
513
 
@@ -575,6 +587,14 @@ spec:
575
587
  type: string
576
588
  description:
577
589
  default: "This option is mandatory"
590
+ - name: aiservice_watsonxai_deployment_id
591
+ type: string
592
+ description: WatsonX deployment ID for IBM Maximo AI Service
593
+ default: ""
594
+ - name: aiservice_watsonxai_space_id
595
+ type: string
596
+ description: WatsonX space ID for IBM Maximo AI Service
597
+ default: ""
578
598
  - name: aiservice_watsonx_action
579
599
  type: string
580
600
  description:
@@ -680,6 +700,10 @@ spec:
680
700
  value: $(params.aiservice_watsonxai_url)
681
701
  - name: AISERVICE_WATSONXAI_PROJECT_ID
682
702
  value: $(params.aiservice_watsonxai_project_id)
703
+ - name: AISERVICE_WATSONXAI_DEPLOYMENT_ID
704
+ value: $(params.aiservice_watsonxai_deployment_id)
705
+ - name: AISERVICE_WATSONXAI_SPACE_ID
706
+ value: $(params.aiservice_watsonxai_space_id)
683
707
  - name: AISERVICE_WATSONX_ACTION
684
708
  value: $(params.aiservice_watsonx_action)
685
709
 
@@ -711,7 +735,7 @@ spec:
711
735
  command:
712
736
  - /opt/app-root/src/run-role.sh
713
737
  - aiservice
714
- image: quay.io/ibmmas/cli:15.6.2
738
+ image: quay.io/ibmmas/cli:15.7.0
715
739
  imagePullPolicy: $(params.image_pull_policy)
716
740
  workingDir: /workspace/configs
717
741
 
@@ -827,7 +851,7 @@ spec:
827
851
  command:
828
852
  - /opt/app-root/src/run-role.sh
829
853
  - appconnect
830
- image: quay.io/ibmmas/cli:15.6.2
854
+ image: quay.io/ibmmas/cli:15.7.0
831
855
  imagePullPolicy: $(params.image_pull_policy)
832
856
  workingDir: /workspace/configs
833
857
 
@@ -945,7 +969,7 @@ spec:
945
969
  command:
946
970
  - /opt/app-root/src/run-role.sh
947
971
  - arcgis
948
- image: quay.io/ibmmas/cli:15.6.2
972
+ image: quay.io/ibmmas/cli:15.7.0
949
973
  imagePullPolicy: $(params.image_pull_policy)
950
974
  # --------------------------------------------------------------------------------
951
975
  # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -1015,7 +1039,7 @@ spec:
1015
1039
  command:
1016
1040
  - /opt/app-root/src/run-role.sh
1017
1041
  - cert_manager
1018
- image: quay.io/ibmmas/cli:15.6.2
1042
+ image: quay.io/ibmmas/cli:15.7.0
1019
1043
  imagePullPolicy: $(params.image_pull_policy)
1020
1044
  workingDir: /workspace/configs
1021
1045
  # --------------------------------------------------------------------------------
@@ -1081,7 +1105,7 @@ spec:
1081
1105
  command:
1082
1106
  - /opt/app-root/src/run-role.sh
1083
1107
  - common_services
1084
- image: quay.io/ibmmas/cli:15.6.2
1108
+ image: quay.io/ibmmas/cli:15.7.0
1085
1109
  imagePullPolicy: $(params.image_pull_policy)
1086
1110
  workingDir: /workspace/configs
1087
1111
  # --------------------------------------------------------------------------------
@@ -1208,7 +1232,7 @@ spec:
1208
1232
  command:
1209
1233
  - /opt/app-root/src/run-role.sh
1210
1234
  - cos
1211
- image: quay.io/ibmmas/cli:15.6.2
1235
+ image: quay.io/ibmmas/cli:15.7.0
1212
1236
  imagePullPolicy: $(params.image_pull_policy)
1213
1237
  workingDir: /workspace/configs
1214
1238
 
@@ -1328,7 +1352,7 @@ spec:
1328
1352
  command:
1329
1353
  - /opt/app-root/src/run-role.sh
1330
1354
  - cp4d_service
1331
- image: quay.io/ibmmas/cli:15.6.2
1355
+ image: quay.io/ibmmas/cli:15.7.0
1332
1356
  imagePullPolicy: $(params.image_pull_policy)
1333
1357
  workingDir: /workspace/configs
1334
1358
  # --------------------------------------------------------------------------------
@@ -1445,7 +1469,7 @@ spec:
1445
1469
  command:
1446
1470
  - /opt/app-root/src/run-role.sh
1447
1471
  - cp4d_service
1448
- image: quay.io/ibmmas/cli:15.6.2
1472
+ image: quay.io/ibmmas/cli:15.7.0
1449
1473
  imagePullPolicy: $(params.image_pull_policy)
1450
1474
  workingDir: /workspace/configs
1451
1475
 
@@ -1551,7 +1575,7 @@ spec:
1551
1575
  command:
1552
1576
  - /opt/app-root/src/run-role.sh
1553
1577
  - cp4d
1554
- image: quay.io/ibmmas/cli:15.6.2
1578
+ image: quay.io/ibmmas/cli:15.7.0
1555
1579
  imagePullPolicy: $(params.image_pull_policy)
1556
1580
  # --------------------------------------------------------------------------------
1557
1581
  # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1873,7 +1897,7 @@ spec:
1873
1897
  command:
1874
1898
  - /opt/app-root/src/run-role.sh
1875
1899
  - db2
1876
- image: quay.io/ibmmas/cli:15.6.2
1900
+ image: quay.io/ibmmas/cli:15.7.0
1877
1901
  imagePullPolicy: $(params.image_pull_policy)
1878
1902
  workingDir: /workspace/configs
1879
1903
 
@@ -1983,7 +2007,7 @@ spec:
1983
2007
  command:
1984
2008
  - /opt/app-root/src/run-role.sh
1985
2009
  - eck
1986
- image: quay.io/ibmmas/cli:15.6.2
2010
+ image: quay.io/ibmmas/cli:15.7.0
1987
2011
  imagePullPolicy: $(params.image_pull_policy)
1988
2012
  # --------------------------------------------------------------------------------
1989
2013
  # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -2072,20 +2096,20 @@ spec:
2072
2096
  command:
2073
2097
  - /opt/app-root/src/run-role.sh
2074
2098
  - gencfg_workspace
2075
- image: quay.io/ibmmas/cli:15.6.2
2099
+ image: quay.io/ibmmas/cli:15.7.0
2076
2100
  imagePullPolicy: $(params.image_pull_policy)
2077
2101
  workingDir: /workspace/configs
2078
2102
 
2079
2103
  workspaces:
2080
2104
  - name: configs
2081
2105
  # --------------------------------------------------------------------------------
2082
- # /home/runner/work/cli/cli/tekton/target/tasks/gitops-aibroker-tenant.yaml
2106
+ # /home/runner/work/cli/cli/tekton/target/tasks/gitops-aiservice-tenant.yaml
2083
2107
  # --------------------------------------------------------------------------------
2084
2108
  ---
2085
2109
  apiVersion: tekton.dev/v1beta1
2086
2110
  kind: Task
2087
2111
  metadata:
2088
- name: gitops-aibroker-tenant
2112
+ name: gitops-aiservice-tenant
2089
2113
  spec:
2090
2114
  params:
2091
2115
  - name: cluster_name
@@ -2106,18 +2130,16 @@ spec:
2106
2130
  type: string
2107
2131
  - name: github_host
2108
2132
  type: string
2109
- - name: aibroker_namespace
2133
+ - name: aiservice_namespace
2110
2134
  type: string
2111
- - name: mas_aibroker_provision_tenant
2135
+ - name: aiservice_provision_tenant
2112
2136
  type: string
2113
- - name: aibroker_instance_id
2137
+ - name: aiservice_instance_id
2114
2138
  type: string
2115
2139
  - name: tenantNamespace
2116
2140
  type: string
2117
2141
  - name: tenant_id
2118
2142
  type: string
2119
- - name: mas_aibroker_tenant_name
2120
- type: string
2121
2143
  - name: cluster_domain
2122
2144
  type: string
2123
2145
  - name: in_saas_env
@@ -2130,27 +2152,29 @@ spec:
2130
2152
  type: string
2131
2153
  - name: slscfg_url
2132
2154
  type: string
2133
- - name: mas_aibroker_sls_subscription_id
2155
+ - name: aiservice_sls_subscription_id
2134
2156
  type: string
2135
- - name: mas_aibroker_watsonxai_url
2157
+ - name: aiservice_watsonxai_url
2158
+ type: string
2159
+ - name: aiservice_watsonx_full
2136
2160
  type: string
2137
- - name: mas_aibroker_watsonxai_project_id
2161
+ - name: aiservice_watsonx_instance_id
2138
2162
  type: string
2139
- - name: mas_aibroker_storage_port
2163
+ - name: aiservice_watsonx_version
2140
2164
  type: string
2141
- - name: mas_aibroker_storage_region
2165
+ - name: aiservice_watsonx_username
2142
2166
  type: string
2143
- - name: mas_aibroker_storage_provider
2167
+ - name: aiservice_operator_log_level
2144
2168
  type: string
2145
- - name: mas_aibroker_storage_pipelines_bucket
2169
+ - name: aiservice_storage_region
2146
2170
  type: string
2147
- - name: mas_aibroker_storage_ssl
2171
+ - name: aiservice_storage_provider
2148
2172
  type: string
2149
- - name: mas_aibroker_s3_endpoint_url
2173
+ - name: aiservice_storage_ssl
2150
2174
  type: string
2151
- - name: mas_aibroker_s3_region
2175
+ - name: aiservice_s3_endpoint_url
2152
2176
  type: string
2153
- - name: mas_aibroker_s3_bucket_prefix
2177
+ - name: aiservice_s3_bucket_prefix
2154
2178
  type: string
2155
2179
  - name: rsl_url
2156
2180
  type: string
@@ -2161,7 +2185,7 @@ spec:
2161
2185
  - name: tenant_entitlement_end_date
2162
2186
  type: string
2163
2187
  stepTemplate:
2164
- name: gitops-aibroker-tenant
2188
+ name: gitops-aiservice-tenant
2165
2189
  env:
2166
2190
  - name: CLUSTER_NAME
2167
2191
  value: $(params.cluster_name)
@@ -2181,18 +2205,16 @@ spec:
2181
2205
  value: $(params.github_host)
2182
2206
  - name: GITHUB_REPO
2183
2207
  value: $(params.github_repo)
2184
- - name: AIBROKER_NAMESPACE
2185
- value: $(params.aibroker_namespace)
2186
- - name: MAS_AIBROKER_PROVISION_TENANT
2187
- value: $(params.mas_aibroker_provision_tenant)
2188
- - name: AIBROKER_INSTANCE_ID
2189
- value: $(params.aibroker_instance_id)
2208
+ - name: AISERVICE_NAMESPACE
2209
+ value: $(params.aiservice_namespace)
2210
+ - name: AISERVICE_PROVISION_TENANT
2211
+ value: $(params.aiservice_provision_tenant)
2212
+ - name: AISERVICE_INSTANCE_ID
2213
+ value: $(params.aiservice_instance_id)
2190
2214
  - name: TENANT_NAMESPACE
2191
2215
  value: $(params.tenantNamespace)
2192
2216
  - name: TENANT_ID
2193
2217
  value: $(params.tenant_id)
2194
- - name: MAS_AIBROKER_TENANT_NAME
2195
- value: $(params.mas_aibroker_tenant_name)
2196
2218
  - name: CLUSTER_DOMAIN
2197
2219
  value: $(params.cluster_domain)
2198
2220
  - name: IN_SAAS_ENV
@@ -2205,29 +2227,30 @@ spec:
2205
2227
  value: $(params.drocfg_url)
2206
2228
  - name: SLSCFG_URL
2207
2229
  value: $(params.slscfg_url)
2208
-
2209
- - name: MAS_AIBROKER_SLS_SUBSCRIPTION_ID
2210
- value: $(params.mas_aibroker_sls_subscription_id)
2211
- - name: MAS_AIBROKER_WATSONXAI_URL
2212
- value: $(params.mas_aibroker_watsonxai_url)
2213
- - name: MAS_AIBROKER_WATSONXAI_PROJECT_ID
2214
- value: $(params.mas_aibroker_watsonxai_project_id)
2215
- - name: MAS_AIBROKER_STORAGE_PORT
2216
- value: $(params.mas_aibroker_storage_port)
2217
- - name: MAS_AIBROKER_STORAGE_REGION
2218
- value: $(params.mas_aibroker_storage_region)
2219
- - name: MAS_AIBROKER_STORAGE_PROVIDER
2220
- value: $(params.mas_aibroker_storage_provider)
2221
- - name: MAS_AIBROKER_STORAGE_PIPELINES_BUCKET
2222
- value: $(params.mas_aibroker_storage_pipelines_bucket)
2223
- - name: MAS_AIBROKER_STORAGE_SSL
2224
- value: $(params.mas_aibroker_storage_ssl)
2225
- - name: MAS_AIBROKER_S3_ENDPOINT_URL
2226
- value: $(params.mas_aibroker_s3_endpoint_url)
2227
- - name: MAS_AIBROKER_S3_REGION
2228
- value: $(params.mas_aibroker_s3_region)
2229
- - name: MAS_AIBROKER_S3_BUCKET_PREFIX
2230
- value: $(params.mas_aibroker_s3_bucket_prefix)
2230
+ - name: AISERVICE_SLS_SUBSCRIPTION_ID
2231
+ value: $(params.aiservice_sls_subscription_id)
2232
+ - name: AISERVICE_WATSONXAI_URL
2233
+ value: $(params.aiservice_watsonxai_url)
2234
+ - name: AISERVICE_WATSONX_FULL
2235
+ value: $(params.aiservice_watsonx_full)
2236
+ - name: AISERVICE_WATSONX_INSTANCE_ID
2237
+ value: $(params.aiservice_watsonx_instance_id)
2238
+ - name: AISERVICE_WATSONX_VERSION
2239
+ value: $(params.aiservice_watsonx_version)
2240
+ - name: AISERVICE_WATSONX_USERNAME
2241
+ value: $(params.aiservice_watsonx_username)
2242
+ - name: AISERVICE_OPERATOR_LOG_LEVEL
2243
+ value: $(params.aiservice_operator_log_level)
2244
+ - name: AISERVICE_STORAGE_REGION
2245
+ value: $(params.aiservice_storage_region)
2246
+ - name: AISERVICE_STORAGE_PROVIDER
2247
+ value: $(params.aiservice_storage_provider)
2248
+ - name: AISERVICE_STORAGE_SSL
2249
+ value: $(params.aiservice_storage_ssl)
2250
+ - name: AISERVICE_S3_ENDPOINT_URL
2251
+ value: $(params.aiservice_s3_endpoint_url)
2252
+ - name: AISERVICE_S3_BUCKET_PREFIX
2253
+ value: $(params.aiservice_s3_bucket_prefix)
2231
2254
  - name: RSL_URL
2232
2255
  value: $(params.rsl_url)
2233
2256
  - name: TENANT_ENTITLEMENT_TYPE
@@ -2249,11 +2272,11 @@ spec:
2249
2272
  git config --global user.email "you@example.com"
2250
2273
  git config --global user.password $GITHUB_PAT
2251
2274
 
2252
- mkdir -p /tmp/init-aibroker-tenant
2275
+ mkdir -p /tmp/init-aiservice-tenant
2253
2276
 
2254
- mas gitops-aibroker-tenant -a $ACCOUNT -c $CLUSTER_NAME \
2277
+ mas gitops-aiservice-tenant -a $ACCOUNT -c $CLUSTER_NAME \
2255
2278
  --secrets-path $SECRET_PATH \
2256
- --dir /tmp/init-aibroker-tenant \
2279
+ --dir /tmp/init-aiservice-tenant \
2257
2280
  --github-push \
2258
2281
  --github-host "$GITHUB_HOST" \
2259
2282
  --github-org "$GITHUB_ORG" \
@@ -2265,19 +2288,19 @@ spec:
2265
2288
  command:
2266
2289
  - /bin/sh
2267
2290
  - -c
2268
- name: gitops-aibroker-tenant
2291
+ name: gitops-aiservice-tenant
2269
2292
  imagePullPolicy: IfNotPresent
2270
- image: quay.io/ibmmas/cli:15.6.2
2293
+ image: quay.io/ibmmas/cli:15.7.0
2271
2294
  workspaces:
2272
2295
  - name: configs
2273
2296
  # --------------------------------------------------------------------------------
2274
- # /home/runner/work/cli/cli/tekton/target/tasks/gitops-aibroker.yaml
2297
+ # /home/runner/work/cli/cli/tekton/target/tasks/gitops-aiservice.yaml
2275
2298
  # --------------------------------------------------------------------------------
2276
2299
  ---
2277
2300
  apiVersion: tekton.dev/v1beta1
2278
2301
  kind: Task
2279
2302
  metadata:
2280
- name: gitops-aibroker
2303
+ name: gitops-aiservice
2281
2304
  spec:
2282
2305
  params:
2283
2306
  - name: cluster_name
@@ -2299,39 +2322,25 @@ spec:
2299
2322
  type: string
2300
2323
  - name: github_host
2301
2324
  type: string
2302
- - name: aibroker_instance_id
2325
+ - name: aiservice_instance_id
2303
2326
  type: string
2304
- - name: aibroker_namespace
2327
+ - name: aiservice_namespace
2305
2328
  type: string
2306
- - name: mas_aibroker_watsonx_secret
2329
+ - name: aiservice_watsonx_secret
2307
2330
  type: string
2308
2331
  - name: pull_secret_name
2309
2332
  type: string
2310
- - name: mas_aibroker_storage_provider
2311
- type: string
2312
- - name: mas_aibroker_storage_secret
2313
- type: string
2314
- - name: mas_aibroker_storage_host
2315
- type: string
2316
- - name: mas_aibroker_storage_port
2333
+ - name: aiservice_storage_provider
2317
2334
  type: string
2318
- - name: mas_aibroker_storage_ssl
2335
+ - name: aiservice_storage_ssl
2319
2336
  type: string
2320
- - name: mas_aibroker_storage_region
2321
- type: string
2322
- - name: mas_aibroker_storage_pipelines_bucket
2323
- type: string
2324
- - name: mas_aibroker_storage_tenants_bucket
2325
- type: string
2326
- - name: mas_aibroker_storage_templates_bucket
2327
- type: string
2328
- - name: mas_aibroker_mariadb_secret
2337
+ - name: aiservice_storage_region
2329
2338
  type: string
2330
2339
  - name: primary_storage_class
2331
2340
  type: string
2332
2341
  - name: artifactory_username
2333
2342
  type: string
2334
- - name: mas_app_channel
2343
+ - name: aiservice_channel
2335
2344
  type: string
2336
2345
  - name: mas_catalog_source
2337
2346
  type: string
@@ -2347,15 +2356,29 @@ spec:
2347
2356
  type: string
2348
2357
  - name: environment_type
2349
2358
  type: string
2350
- - name: mas_aibroker_s3_endpoint_url
2359
+ - name: aiservice_s3_endpoint_url
2360
+ type: string
2361
+ - name: aiservice_s3_bucket_prefix
2362
+ type: string
2363
+ - name: sls_registration_key_secret
2364
+ type: string
2365
+ - name: dro_token_secret
2351
2366
  type: string
2352
- - name: mas_aibroker_s3_region
2367
+ - name: dro_cacert_secret
2368
+ type: string
2369
+ - name: aiservice_s3_templates_bucket
2370
+ type: string
2371
+ - name: aiservice_s3_tenants_bucket
2353
2372
  type: string
2354
- - name: mas_aibroker_s3_bucket_prefix
2373
+ - name: aiservice_s3_secret
2374
+ type: string
2375
+ - name: jdbc_secret
2376
+ type: string
2377
+ - name: use_aws_db2
2355
2378
  type: string
2356
2379
 
2357
2380
  stepTemplate:
2358
- name: gitops-aibroker
2381
+ name: gitops-aiservice
2359
2382
  env:
2360
2383
  - name: CLUSTER_NAME
2361
2384
  value: $(params.cluster_name)
@@ -2375,40 +2398,26 @@ spec:
2375
2398
  value: $(params.github_host)
2376
2399
  - name: GITHUB_REPO
2377
2400
  value: $(params.github_repo)
2378
- - name: AIBROKER_INSTANCE_ID
2379
- value: $(params.aibroker_instance_id)
2380
- - name: AIBROKER_NAMESPACE
2381
- value: $(params.aibroker_namespace)
2382
- - name: MAS_AIBROKER_WATSONX_SECRET
2383
- value: $(params.mas_aibroker_watsonx_secret)
2401
+ - name: AISERVICE_INSTANCE_ID
2402
+ value: $(params.aiservice_instance_id)
2403
+ - name: AISERVICE_NAMESPACE
2404
+ value: $(params.aiservice_namespace)
2405
+ - name: AISERVICE_WATSONX_SECRET
2406
+ value: $(params.aiservice_watsonx_secret)
2384
2407
  - name: PULL_SECRET_NAME
2385
2408
  value: $(params.pull_secret_name)
2386
- - name: MAS_AIBROKER_STORAGE_PROVIDER
2387
- value: $(params.mas_aibroker_storage_provider)
2388
- - name: MAS_AIBROKER_STORAGE_SECRET
2389
- value: $(params.mas_aibroker_storage_secret)
2390
- - name: MAS_AIBROKER_STORAGE_HOST
2391
- value: $(params.mas_aibroker_storage_host)
2392
- - name: MAS_AIBROKER_STORAGE_PORT
2393
- value: $(params.mas_aibroker_storage_port)
2394
- - name: MAS_AIBROKER_STORAGE_SSL
2395
- value: $(params.mas_aibroker_storage_ssl)
2396
- - name: MAS_AIBROKER_STORAGE_REGION
2397
- value: $(params.mas_aibroker_storage_region)
2398
- - name: MAS_AIBROKER_STORAGE_PIPELINES_BUCKET
2399
- value: $(params.mas_aibroker_storage_pipelines_bucket)
2400
- - name: MAS_AIBROKER_STORAGE_TENANTS_BUCKET
2401
- value: $(params.mas_aibroker_storage_tenants_bucket)
2402
- - name: MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET
2403
- value: $(params.mas_aibroker_storage_templates_bucket)
2404
- - name: MAS_AIBROKER_MARIADB_SECRET
2405
- value: $(params.mas_aibroker_mariadb_secret)
2409
+ - name: AISERVICE_STORAGE_PROVIDER
2410
+ value: $(params.aiservice_storage_provider)
2411
+ - name: AISERVICE_STORAGE_SSL
2412
+ value: $(params.aiservice_storage_ssl)
2413
+ - name: AISERVICE_STORAGE_REGION
2414
+ value: $(params.aiservice_storage_region)
2406
2415
  - name: PRIMARY_STORAGE_CLASS
2407
2416
  value: $(params.primary_storage_class)
2408
2417
  - name: ARTIFACTORY_USERNAME
2409
2418
  value: $(params.artifactory_username)
2410
- - name: MAS_APP_CHANNEL
2411
- value: $(params.mas_app_channel)
2419
+ - name: AISERVICE_CHANNEL
2420
+ value: $(params.aiservice_channel)
2412
2421
  - name: MAS_CATALOG_SOURCE
2413
2422
  value: $(params.mas_catalog_source)
2414
2423
  - name: MAS_ICR_CP
@@ -2423,12 +2432,27 @@ spec:
2423
2432
  value: $(params.is_external_route)
2424
2433
  - name: ENVIRONMENT_TYPE
2425
2434
  value: $(params.environment_type)
2426
- - name: MAS_AIBROKER_S3_ENDPOINT_URL
2427
- value: $(params.mas_aibroker_s3_endpoint_url)
2428
- - name: MAS_AIBROKER_S3_REGION
2429
- value: $(params.mas_aibroker_s3_region)
2430
- - name: MAS_AIBROKER_S3_BUCKET_PREFIX
2431
- value: $(params.mas_aibroker_s3_bucket_prefix)
2435
+ - name: AISERVICE_S3_ENDPOINT_URL
2436
+ value: $(params.aiservice_s3_endpoint_url)
2437
+ - name: AISERVICE_S3_BUCKET_PREFIX
2438
+ value: $(params.aiservice_s3_bucket_prefix)
2439
+ - name: SLS_REGISTRATION_KEY_SECRET
2440
+ value: $(params.sls_registration_key_secret)
2441
+ - name: DRO_TOKEN_SECRET
2442
+ value: $(params.dro_token_secret)
2443
+ - name: DRO_CACERT_SECRET
2444
+ value: $(params.dro_cacert_secret)
2445
+ - name: AISERVICE_S3_TEMPLATES_BUCKET
2446
+ value: $(params.aiservice_s3_templates_bucket)
2447
+ - name: AISERVICE_S3_TENANTS_BUCKET
2448
+ value: $(params.aiservice_s3_tenants_bucket)
2449
+ - name: AISERVICE_S3_SECRET
2450
+ value: $(params.aiservice_s3_secret)
2451
+ - name: JDBC_SECRET
2452
+ value: $(params.jdbc_secret)
2453
+ - name: USE_AWS_DB2
2454
+ value: $(params.use_aws_db2)
2455
+
2432
2456
  envFrom:
2433
2457
  - configMapRef:
2434
2458
  name: environment-properties
@@ -2444,10 +2468,10 @@ spec:
2444
2468
  git config --global user.email "you@example.com"
2445
2469
  git config --global user.password $GITHUB_PAT
2446
2470
 
2447
- mkdir -p /tmp/init-aibroker
2448
- mas gitops-aibroker -a $ACCOUNT -c $CLUSTER_NAME \
2471
+ mkdir -p /tmp/init-aiservice
2472
+ mas gitops-aiservice -a $ACCOUNT -c $CLUSTER_NAME \
2449
2473
  --secrets-path $SECRET_PATH \
2450
- --dir /tmp/init-aibroker \
2474
+ --dir /tmp/init-aiservice \
2451
2475
  --github-push \
2452
2476
  --github-host $GITHUB_HOST \
2453
2477
  --github-org $GITHUB_ORG \
@@ -2458,9 +2482,9 @@ spec:
2458
2482
  command:
2459
2483
  - /bin/sh
2460
2484
  - -c
2461
- name: gitops-aibroker
2485
+ name: gitops-aiservice
2462
2486
  imagePullPolicy: IfNotPresent
2463
- image: quay.io/ibmmas/cli:15.6.2
2487
+ image: quay.io/ibmmas/cli:15.7.0
2464
2488
  workspaces:
2465
2489
  - name: configs
2466
2490
  # --------------------------------------------------------------------------------
@@ -2561,7 +2585,7 @@ spec:
2561
2585
  - -c
2562
2586
  name: gitops-bootstrap
2563
2587
  imagePullPolicy: IfNotPresent
2564
- image: quay.io/ibmmas/cli:15.6.2
2588
+ image: quay.io/ibmmas/cli:15.7.0
2565
2589
  workspaces:
2566
2590
  - name: configs
2567
2591
  # --------------------------------------------------------------------------------
@@ -2643,7 +2667,7 @@ spec:
2643
2667
  - -c
2644
2668
  name: gitops-cis-compliance
2645
2669
  imagePullPolicy: IfNotPresent
2646
- image: quay.io/ibmmas/cli:15.6.2
2670
+ image: quay.io/ibmmas/cli:15.7.0
2647
2671
  workspaces:
2648
2672
  - name: configs
2649
2673
  # --------------------------------------------------------------------------------
@@ -2983,7 +3007,7 @@ spec:
2983
3007
  - -c
2984
3008
  name: gitops-cluster
2985
3009
  imagePullPolicy: Always
2986
- image: quay.io/ibmmas/cli:15.6.2
3010
+ image: quay.io/ibmmas/cli:15.7.0
2987
3011
  workspaces:
2988
3012
  - name: configs
2989
3013
  - name: gitops-cluster-configs
@@ -3092,7 +3116,7 @@ spec:
3092
3116
  - -c
3093
3117
  name: gitops-cos
3094
3118
  imagePullPolicy: IfNotPresent
3095
- image: quay.io/ibmmas/cli:15.6.2
3119
+ image: quay.io/ibmmas/cli:15.7.0
3096
3120
  workspaces:
3097
3121
  - name: configs
3098
3122
  # --------------------------------------------------------------------------------
@@ -3240,7 +3264,7 @@ spec:
3240
3264
  - -c
3241
3265
  name: gitops-cp4d-service
3242
3266
  imagePullPolicy: IfNotPresent
3243
- image: quay.io/ibmmas/cli:15.6.2
3267
+ image: quay.io/ibmmas/cli:15.7.0
3244
3268
  workspaces:
3245
3269
  - name: configs
3246
3270
  - name: shared-gitops-configs
@@ -3369,7 +3393,7 @@ spec:
3369
3393
  - -c
3370
3394
  name: gitops-cp4d
3371
3395
  imagePullPolicy: IfNotPresent
3372
- image: quay.io/ibmmas/cli:15.6.2
3396
+ image: quay.io/ibmmas/cli:15.7.0
3373
3397
  workspaces:
3374
3398
  - name: configs
3375
3399
  - name: shared-gitops-configs
@@ -3660,7 +3684,7 @@ spec:
3660
3684
  - -c
3661
3685
  name: gitops-db2u-database
3662
3686
  imagePullPolicy: Always
3663
- image: quay.io/ibmmas/cli:15.6.2
3687
+ image: quay.io/ibmmas/cli:15.7.0
3664
3688
  workspaces:
3665
3689
  - name: configs
3666
3690
  - name: shared-gitops-configs
@@ -3758,7 +3782,7 @@ spec:
3758
3782
  - -c
3759
3783
  name: gitops-db2u
3760
3784
  imagePullPolicy: IfNotPresent
3761
- image: quay.io/ibmmas/cli:15.6.2
3785
+ image: quay.io/ibmmas/cli:15.7.0
3762
3786
  workspaces:
3763
3787
  - name: configs
3764
3788
  # --------------------------------------------------------------------------------
@@ -3885,7 +3909,7 @@ spec:
3885
3909
  - -c
3886
3910
  name: gitops-delete-jdbc-config
3887
3911
  imagePullPolicy: IfNotPresent
3888
- image: quay.io/ibmmas/cli:15.6.2
3912
+ image: quay.io/ibmmas/cli:15.7.0
3889
3913
  workspaces:
3890
3914
  - name: configs
3891
3915
  # --------------------------------------------------------------------------------
@@ -3983,13 +4007,193 @@ spec:
3983
4007
  - -c
3984
4008
  name: gitops-delete-kafka-config
3985
4009
  imagePullPolicy: Always
3986
- image: quay.io/ibmmas/cli:15.6.2
4010
+ image: quay.io/ibmmas/cli:15.7.0
3987
4011
  workspaces:
3988
4012
  - name: configs
3989
4013
 
3990
4014
 
3991
4015
 
3992
4016
 
4017
+ # --------------------------------------------------------------------------------
4018
+ # /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-aiservice-tenant.yaml
4019
+ # --------------------------------------------------------------------------------
4020
+ ---
4021
+ apiVersion: tekton.dev/v1beta1
4022
+ kind: Task
4023
+ metadata:
4024
+ name: gitops-deprovision-aiservice-tenant
4025
+ spec:
4026
+ params:
4027
+ - name: cluster_name
4028
+ type: string
4029
+ - name: account
4030
+ type: string
4031
+ - name: cluster_url
4032
+ type: string
4033
+ - name: secrets_path
4034
+ type: string
4035
+ - name: avp_aws_secret_region
4036
+ type: string
4037
+ - name: git_branch
4038
+ type: string
4039
+ - name: github_org
4040
+ type: string
4041
+ - name: github_repo
4042
+ type: string
4043
+ - name: github_host
4044
+ type: string
4045
+ - name: aiservice_instance_id
4046
+ type: string
4047
+ - name: tenant_id
4048
+ type: string
4049
+
4050
+ stepTemplate:
4051
+ name: gitops-deprovision-aiservice-tenant
4052
+ env:
4053
+ - name: CLUSTER_NAME
4054
+ value: $(params.cluster_name)
4055
+ - name: ACCOUNT
4056
+ value: $(params.account)
4057
+ - name: CLUSTER_URL
4058
+ value: $(params.cluster_url)
4059
+ - name: SECRET_PATH
4060
+ value: $(params.secrets_path)
4061
+ - name: SM_AWS_REGION
4062
+ value: $(params.avp_aws_secret_region)
4063
+ - name: GIT_BRANCH
4064
+ value: $(params.git_branch)
4065
+ - name: GITHUB_ORG
4066
+ value: $(params.github_org)
4067
+ - name: GITHUB_HOST
4068
+ value: $(params.github_host)
4069
+ - name: GITHUB_REPO
4070
+ value: $(params.github_repo)
4071
+ - name: AISERVICE_INSTANCE_ID
4072
+ value: $(params.aiservice_instance_id)
4073
+ - name: TENANT_ID
4074
+ value: $(params.tenant_id)
4075
+ envFrom:
4076
+ - configMapRef:
4077
+ name: environment-properties
4078
+ optional: true
4079
+ - secretRef:
4080
+ name: secure-properties
4081
+ steps:
4082
+ - args:
4083
+ - |-
4084
+ git config --global user.name "MAS Automation"
4085
+ git config --global user.email "you@example.com"
4086
+ git config --global user.password $GITHUB_PAT
4087
+
4088
+ mkdir -p /tmp/init-aiservice-tenant
4089
+
4090
+ mas gitops-deprovision-aiservice-tenant -a $ACCOUNT -c $CLUSTER_NAME \
4091
+ --secrets-path $SECRET_PATH \
4092
+ --dir /tmp/init-aiservice-tenant \
4093
+ --github-push \
4094
+ --github-host "$GITHUB_HOST" \
4095
+ --github-org "$GITHUB_ORG" \
4096
+ --github-repo "$GITHUB_REPO" \
4097
+ --git-branch "$GIT_BRANCH" \
4098
+
4099
+
4100
+ exit $?
4101
+ command:
4102
+ - /bin/sh
4103
+ - -c
4104
+ name: gitops-deprovision-aiservice-tenant
4105
+ imagePullPolicy: IfNotPresent
4106
+ image: quay.io/ibmmas/cli:15.7.0
4107
+ workspaces:
4108
+ - name: configs
4109
+ # --------------------------------------------------------------------------------
4110
+ # /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-aiservice.yaml
4111
+ # --------------------------------------------------------------------------------
4112
+ ---
4113
+ apiVersion: tekton.dev/v1beta1
4114
+ kind: Task
4115
+ metadata:
4116
+ name: gitops-deprovision-aiservice
4117
+ spec:
4118
+ params:
4119
+ - name: cluster_name
4120
+ type: string
4121
+ - name: account
4122
+ type: string
4123
+ - name: cluster_url
4124
+ type: string
4125
+ - name: secrets_path
4126
+ type: string
4127
+ - name: avp_aws_secret_region
4128
+ type: string
4129
+ - name: git_branch
4130
+ type: string
4131
+ - name: github_org
4132
+ type: string
4133
+ - name: github_repo
4134
+ type: string
4135
+ - name: github_host
4136
+ type: string
4137
+ - name: aiservice_instance_id
4138
+ type: string
4139
+
4140
+ stepTemplate:
4141
+ name: gitops-deprovision-aiservice
4142
+ env:
4143
+ - name: CLUSTER_NAME
4144
+ value: $(params.cluster_name)
4145
+ - name: ACCOUNT
4146
+ value: $(params.account)
4147
+ - name: CLUSTER_URL
4148
+ value: $(params.cluster_url)
4149
+ - name: SECRET_PATH
4150
+ value: $(params.secrets_path)
4151
+ - name: SM_AWS_REGION
4152
+ value: $(params.avp_aws_secret_region)
4153
+ - name: GIT_BRANCH
4154
+ value: $(params.git_branch)
4155
+ - name: GITHUB_ORG
4156
+ value: $(params.github_org)
4157
+ - name: GITHUB_HOST
4158
+ value: $(params.github_host)
4159
+ - name: GITHUB_REPO
4160
+ value: $(params.github_repo)
4161
+ - name: AISERVICE_INSTANCE_ID
4162
+ value: $(params.aiservice_instance_id)
4163
+ envFrom:
4164
+ - configMapRef:
4165
+ name: environment-properties
4166
+ optional: true
4167
+ - secretRef:
4168
+ name: secure-properties
4169
+ steps:
4170
+ - args:
4171
+ - |-
4172
+ git config --global user.name "MAS Automation"
4173
+ git config --global user.email "you@example.com"
4174
+ git config --global user.password $GITHUB_PAT
4175
+
4176
+ mkdir -p /tmp/init-aiservice
4177
+
4178
+ mas gitops-deprovision-aiservice -a $ACCOUNT -c $CLUSTER_NAME \
4179
+ --secrets-path $SECRET_PATH \
4180
+ --dir /tmp/init-aiservice \
4181
+ --github-push \
4182
+ --github-host "$GITHUB_HOST" \
4183
+ --github-org "$GITHUB_ORG" \
4184
+ --github-repo "$GITHUB_REPO" \
4185
+ --git-branch "$GIT_BRANCH" \
4186
+
4187
+
4188
+ exit $?
4189
+ command:
4190
+ - /bin/sh
4191
+ - -c
4192
+ name: gitops-deprovision-aiservice
4193
+ imagePullPolicy: IfNotPresent
4194
+ image: quay.io/ibmmas/cli:15.7.0
4195
+ workspaces:
4196
+ - name: configs
3993
4197
  # --------------------------------------------------------------------------------
3994
4198
  # /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-app-config.yaml
3995
4199
  # --------------------------------------------------------------------------------
@@ -4075,7 +4279,7 @@ spec:
4075
4279
  - -c
4076
4280
  name: gitops-deprovision-app-config
4077
4281
  imagePullPolicy: IfNotPresent
4078
- image: quay.io/ibmmas/cli:15.6.2
4282
+ image: quay.io/ibmmas/cli:15.7.0
4079
4283
  workspaces:
4080
4284
  - name: configs
4081
4285
  # --------------------------------------------------------------------------------
@@ -4160,7 +4364,7 @@ spec:
4160
4364
  - -c
4161
4365
  name: gitops-deprovision-app-install
4162
4366
  imagePullPolicy: IfNotPresent
4163
- image: quay.io/ibmmas/cli:15.6.2
4367
+ image: quay.io/ibmmas/cli:15.7.0
4164
4368
  workspaces:
4165
4369
  - name: configs
4166
4370
  # --------------------------------------------------------------------------------
@@ -4245,7 +4449,7 @@ spec:
4245
4449
  - -c
4246
4450
  name: gitops-deprovision-cluster
4247
4451
  imagePullPolicy: IfNotPresent
4248
- image: quay.io/ibmmas/cli:15.6.2
4452
+ image: quay.io/ibmmas/cli:15.7.0
4249
4453
  workspaces:
4250
4454
  - name: configs
4251
4455
  # --------------------------------------------------------------------------------
@@ -4364,7 +4568,7 @@ spec:
4364
4568
  - -c
4365
4569
  name: gitops-deprovision-cos
4366
4570
  imagePullPolicy: IfNotPresent
4367
- image: quay.io/ibmmas/cli:15.6.2
4571
+ image: quay.io/ibmmas/cli:15.7.0
4368
4572
  workspaces:
4369
4573
  - name: configs
4370
4574
  # --------------------------------------------------------------------------------
@@ -4469,10 +4673,9 @@ spec:
4469
4673
  - -c
4470
4674
  name: gitops-deprovision-cp4d-service
4471
4675
  imagePullPolicy: IfNotPresent
4472
- image: quay.io/ibmmas/cli:15.6.2
4676
+ image: quay.io/ibmmas/cli:15.7.0
4473
4677
  workspaces:
4474
- - name: configs
4475
- # --------------------------------------------------------------------------------
4678
+ - name: configs# --------------------------------------------------------------------------------
4476
4679
  # /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-cp4d.yaml
4477
4680
  # --------------------------------------------------------------------------------
4478
4681
  ---
@@ -4557,7 +4760,7 @@ spec:
4557
4760
  - -c
4558
4761
  name: gitops-deprovision-cp4d
4559
4762
  imagePullPolicy: IfNotPresent
4560
- image: quay.io/ibmmas/cli:15.6.2
4763
+ image: quay.io/ibmmas/cli:15.7.0
4561
4764
  workspaces:
4562
4765
  - name: configs
4563
4766
  # --------------------------------------------------------------------------------
@@ -4642,7 +4845,7 @@ spec:
4642
4845
  - -c
4643
4846
  name: gitops-deprovision-customer-subscription
4644
4847
  imagePullPolicy: IfNotPresent
4645
- image: quay.io/ibmmas/cli:15.6.2
4848
+ image: quay.io/ibmmas/cli:15.7.0
4646
4849
  workspaces:
4647
4850
  - name: shared-entitlement
4648
4851
  # --------------------------------------------------------------------------------
@@ -4735,7 +4938,7 @@ spec:
4735
4938
  - -c
4736
4939
  name: gitops-deprovision-db2u-database
4737
4940
  imagePullPolicy: IfNotPresent
4738
- image: quay.io/ibmmas/cli:15.6.2
4941
+ image: quay.io/ibmmas/cli:15.7.0
4739
4942
  workspaces:
4740
4943
  - name: configs
4741
4944
 
@@ -4818,7 +5021,7 @@ spec:
4818
5021
  - -c
4819
5022
  name: gitops-deprovision-db2u
4820
5023
  imagePullPolicy: IfNotPresent
4821
- image: quay.io/ibmmas/cli:15.6.2
5024
+ image: quay.io/ibmmas/cli:15.7.0
4822
5025
  workspaces:
4823
5026
  - name: configs
4824
5027
 
@@ -4935,7 +5138,7 @@ spec:
4935
5138
  - -c
4936
5139
  name: gitops-deprovision-efs
4937
5140
  imagePullPolicy: IfNotPresent
4938
- image: quay.io/ibmmas/cli:15.6.2
5141
+ image: quay.io/ibmmas/cli:15.7.0
4939
5142
  workspaces:
4940
5143
  - name: configs
4941
5144
 
@@ -5045,7 +5248,7 @@ spec:
5045
5248
  - -c
5046
5249
  name: gitops-deprovision-kafka
5047
5250
  imagePullPolicy: IfNotPresent
5048
- image: quay.io/ibmmas/cli:15.6.2
5251
+ image: quay.io/ibmmas/cli:15.7.0
5049
5252
  workspaces:
5050
5253
  - name: configs
5051
5254
  # --------------------------------------------------------------------------------
@@ -5148,12 +5351,100 @@ spec:
5148
5351
  - -c
5149
5352
  name: gitops-deprovision-mongo
5150
5353
  imagePullPolicy: IfNotPresent
5151
- image: quay.io/ibmmas/cli:15.6.2
5354
+ image: quay.io/ibmmas/cli:15.7.0
5152
5355
  workspaces:
5153
5356
  - name: configs
5154
5357
 
5155
5358
 
5156
5359
 
5360
+ # --------------------------------------------------------------------------------
5361
+ # /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-odh.yaml
5362
+ # --------------------------------------------------------------------------------
5363
+
5364
+ apiVersion: tekton.dev/v1beta1
5365
+ kind: Task
5366
+ metadata:
5367
+ name: gitops-deprovision-odh
5368
+ spec:
5369
+ params:
5370
+ - name: cluster_name
5371
+ type: string
5372
+ - name: account
5373
+ type: string
5374
+ - name: cluster_id
5375
+ type: string
5376
+ - name: cluster_url
5377
+ type: string
5378
+ default: ""
5379
+ - name: secrets_path
5380
+ type: string
5381
+ - name: avp_aws_secret_region
5382
+ type: string
5383
+ - name: git_branch
5384
+ type: string
5385
+ - name: github_org
5386
+ type: string
5387
+ - name: github_repo
5388
+ type: string
5389
+ - name: github_host
5390
+ type: string
5391
+ - name: aiservice_instance_id
5392
+ type: string
5393
+ stepTemplate:
5394
+ name: gitops-deprovision-odh
5395
+ env:
5396
+ - name: CLUSTER_NAME
5397
+ value: $(params.cluster_name)
5398
+ - name: ACCOUNT
5399
+ value: $(params.account)
5400
+ - name: CLUSTER_URL
5401
+ value: $(params.cluster_url)
5402
+ - name: SECRET_PATH
5403
+ value: $(params.secrets_path)
5404
+ - name: SM_AWS_REGION
5405
+ value: $(params.avp_aws_secret_region)
5406
+ - name: GIT_BRANCH
5407
+ value: $(params.git_branch)
5408
+ - name: GITHUB_ORG
5409
+ value: $(params.github_org)
5410
+ - name: GITHUB_HOST
5411
+ value: $(params.github_host)
5412
+ - name: GITHUB_REPO
5413
+ value: $(params.github_repo)
5414
+ - name: AISERVICE_INSTANCE_ID
5415
+ value: $(params.aiservice_instance_id)
5416
+ envFrom:
5417
+ - configMapRef:
5418
+ name: environment-properties
5419
+ optional: true
5420
+ - secretRef:
5421
+ name: secure-properties
5422
+ steps:
5423
+ - args:
5424
+ - |-
5425
+ git config --global user.name "MAS Automation"
5426
+ git config --global user.email "you@example.com"
5427
+ git config --global user.password $GITHUB_PAT
5428
+
5429
+ mkdir -p /tmp/deprovision-odh
5430
+ mas gitops-deprovision-odh -a $ACCOUNT -c $CLUSTER_NAME \
5431
+ --dir /tmp/deprovision-odh \
5432
+ --secrets-path $SECRET_PATH \
5433
+ --github-push \
5434
+ --github-host $GITHUB_HOST \
5435
+ --github-org $GITHUB_ORG \
5436
+ --github-repo $GITHUB_REPO \
5437
+ --git-branch $GIT_BRANCH \
5438
+
5439
+ exit $?
5440
+ command:
5441
+ - /bin/sh
5442
+ - -c
5443
+ name: gitops-deprovision-odh
5444
+ imagePullPolicy: IfNotPresent
5445
+ image: quay.io/ibmmas/cli:15.7.0
5446
+ workspaces:
5447
+ - name: configs
5157
5448
  # --------------------------------------------------------------------------------
5158
5449
  # /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-rosa.yaml
5159
5450
  # --------------------------------------------------------------------------------
@@ -5205,7 +5496,7 @@ spec:
5205
5496
  - -c
5206
5497
  name: gitops-deprovision-rosa
5207
5498
  imagePullPolicy: IfNotPresent
5208
- image: quay.io/ibmmas/cli:15.6.2
5499
+ image: quay.io/ibmmas/cli:15.7.0
5209
5500
  workspaces:
5210
5501
  - name: configs
5211
5502
  # --------------------------------------------------------------------------------
@@ -5410,7 +5701,7 @@ spec:
5410
5701
  - -c
5411
5702
  name: gitops-deprovision-suite-config
5412
5703
  imagePullPolicy: IfNotPresent
5413
- image: quay.io/ibmmas/cli:15.6.2
5704
+ image: quay.io/ibmmas/cli:15.7.0
5414
5705
  workspaces:
5415
5706
  - name: configs
5416
5707
 
@@ -5508,7 +5799,7 @@ spec:
5508
5799
  - -c
5509
5800
  name: gitops-deprovision-suite-idp-config
5510
5801
  imagePullPolicy: IfNotPresent
5511
- image: quay.io/ibmmas/cli:15.6.2
5802
+ image: quay.io/ibmmas/cli:15.7.0
5512
5803
  workspaces:
5513
5804
  - name: configs
5514
5805
  # --------------------------------------------------------------------------------
@@ -5600,7 +5891,7 @@ spec:
5600
5891
  - -c
5601
5892
  name: gitops-deprovision-suite-objectstorage-config
5602
5893
  imagePullPolicy: IfNotPresent
5603
- image: quay.io/ibmmas/cli:15.6.2
5894
+ image: quay.io/ibmmas/cli:15.7.0
5604
5895
  workspaces:
5605
5896
  - name: configs
5606
5897
  # --------------------------------------------------------------------------------
@@ -5812,7 +6103,7 @@ spec:
5812
6103
  - -c
5813
6104
  name: gitops-deprovision-suite-smtp-config
5814
6105
  imagePullPolicy: IfNotPresent
5815
- image: quay.io/ibmmas/cli:15.6.2
6106
+ image: quay.io/ibmmas/cli:15.7.0
5816
6107
  workspaces:
5817
6108
  - name: configs
5818
6109
  # --------------------------------------------------------------------------------
@@ -5905,7 +6196,7 @@ spec:
5905
6196
  - -c
5906
6197
  name: gitops-deprovision-suite-watson-studio-config
5907
6198
  imagePullPolicy: IfNotPresent
5908
- image: quay.io/ibmmas/cli:15.6.2
6199
+ image: quay.io/ibmmas/cli:15.7.0
5909
6200
  workspaces:
5910
6201
  - name: configs
5911
6202
  # --------------------------------------------------------------------------------
@@ -5996,7 +6287,7 @@ spec:
5996
6287
  - -c
5997
6288
  name: gitops-deprovision-suite-workspace
5998
6289
  imagePullPolicy: Always
5999
- image: quay.io/ibmmas/cli:15.6.2
6290
+ image: quay.io/ibmmas/cli:15.7.0
6000
6291
  workspaces:
6001
6292
  - name: configs
6002
6293
  # --------------------------------------------------------------------------------
@@ -6089,7 +6380,7 @@ spec:
6089
6380
  - -c
6090
6381
  name: gitops-deprovision-suite
6091
6382
  imagePullPolicy: IfNotPresent
6092
- image: quay.io/ibmmas/cli:15.6.2
6383
+ image: quay.io/ibmmas/cli:15.7.0
6093
6384
  workspaces:
6094
6385
  - name: configs
6095
6386
 
@@ -6202,7 +6493,7 @@ spec:
6202
6493
  - -c
6203
6494
  name: gitops-dro
6204
6495
  imagePullPolicy: IfNotPresent
6205
- image: quay.io/ibmmas/cli:15.6.2
6496
+ image: quay.io/ibmmas/cli:15.7.0
6206
6497
  workspaces:
6207
6498
  - name: configs
6208
6499
  # --------------------------------------------------------------------------------
@@ -6329,7 +6620,7 @@ spec:
6329
6620
  - -c
6330
6621
  name: gitops-efs
6331
6622
  imagePullPolicy: IfNotPresent
6332
- image: quay.io/ibmmas/cli:15.6.2
6623
+ image: quay.io/ibmmas/cli:15.7.0
6333
6624
  workspaces:
6334
6625
  - name: configs
6335
6626
 
@@ -6464,7 +6755,7 @@ spec:
6464
6755
  - -c
6465
6756
  name: gitops-jdbc-config
6466
6757
  imagePullPolicy: Always
6467
- image: quay.io/ibmmas/cli:15.6.2
6758
+ image: quay.io/ibmmas/cli:15.7.0
6468
6759
  workspaces:
6469
6760
  - name: configs
6470
6761
  - name: shared-gitops-configs
@@ -6560,7 +6851,7 @@ spec:
6560
6851
  - -c
6561
6852
  name: gitops-kafka-config
6562
6853
  imagePullPolicy: Always
6563
- image: quay.io/ibmmas/cli:15.6.2
6854
+ image: quay.io/ibmmas/cli:15.7.0
6564
6855
  workspaces:
6565
6856
  - name: configs
6566
6857
 
@@ -6682,201 +6973,7 @@ spec:
6682
6973
  - -c
6683
6974
  name: gitops-kafka
6684
6975
  imagePullPolicy: IfNotPresent
6685
- image: quay.io/ibmmas/cli:15.6.2
6686
- workspaces:
6687
- - name: configs
6688
- # --------------------------------------------------------------------------------
6689
- # /home/runner/work/cli/cli/tekton/target/tasks/gitops-kmodel.yaml
6690
- # --------------------------------------------------------------------------------
6691
-
6692
- apiVersion: tekton.dev/v1beta1
6693
- kind: Task
6694
- metadata:
6695
- name: gitops-kmodel
6696
- spec:
6697
- params:
6698
- - name: cluster_name
6699
- type: string
6700
- - name: account
6701
- type: string
6702
- - name: cluster_id
6703
- type: string
6704
- - name: cluster_url
6705
- type: string
6706
- default: ""
6707
- - name: secrets_path
6708
- type: string
6709
- - name: avp_aws_secret_region
6710
- type: string
6711
- - name: git_branch
6712
- type: string
6713
- - name: github_org
6714
- type: string
6715
- - name: github_repo
6716
- type: string
6717
- - name: github_host
6718
- type: string
6719
-
6720
- - name: aibroker_instance_id
6721
- type: string
6722
- - name: aibroker_internal_tls
6723
- type: string
6724
- - name: aibroker_namespace
6725
- type: string
6726
- - name: pull_secret_name
6727
- type: string
6728
- - name: mas_aibroker_storage_provider
6729
- type: string
6730
- - name: mas_aibroker_storage_ssl
6731
- type: string
6732
- - name: mas_aibroker_storage_host
6733
- type: string
6734
- - name: mas_aibroker_storage_port
6735
- type: string
6736
- - name: mas_aibroker_storage_region
6737
- type: string
6738
- - name: mas_aibroker_storage_templates_bucket
6739
- type: string
6740
- - name: mas_aibroker_storage_tenants_bucket
6741
- type: string
6742
- - name: mas_aibroker_storage_pipelines_bucket
6743
- type: string
6744
- - name: ssh_secret_name
6745
- type: string
6746
- - name: docker_server
6747
- type: string
6748
- - name: tenantNamespace
6749
- type: string
6750
- - name: mas_aibroker_provision_tenant
6751
- type: string
6752
- - name: primary_storage_class
6753
- type: string
6754
- - name: image_store
6755
- type: string
6756
- - name: image_watcher
6757
- type: string
6758
- - name: image_controller
6759
- type: string
6760
- - name: mas_aibroker_connector_tag
6761
- type: string
6762
- - name: mas_aibroker_saas
6763
- type: string
6764
- - name: model_id_unique_length
6765
- type: string
6766
- - name: model_id_prefix
6767
- type: string
6768
-
6769
- - name: mas_app_channel
6770
- type: string
6771
- - name: mas_icr_cp
6772
- type: string
6773
-
6774
- stepTemplate:
6775
- name: gitops-kmodel
6776
- env:
6777
- - name: CLUSTER_NAME
6778
- value: $(params.cluster_name)
6779
- - name: ACCOUNT
6780
- value: $(params.account)
6781
- #- name: CLUSTER_ID
6782
- # value: $(params.cluster_id)
6783
- - name: CLUSTER_URL
6784
- value: $(params.cluster_url)
6785
- - name: SECRET_PATH
6786
- value: $(params.secrets_path)
6787
- - name: SM_AWS_REGION
6788
- value: $(params.avp_aws_secret_region)
6789
- - name: GIT_BRANCH
6790
- value: $(params.git_branch)
6791
- - name: GITHUB_ORG
6792
- value: $(params.github_org)
6793
- - name: GITHUB_HOST
6794
- value: $(params.github_host)
6795
- - name: GITHUB_REPO
6796
- value: $(params.github_repo)
6797
- - name: AIBROKER_INSTANCE_ID
6798
- value: $(params.aibroker_instance_id)
6799
- - name: AIBROKER_INTERNAL_TLS
6800
- value: $(params.aibroker_internal_tls)
6801
- - name: AIBROKER_NAMESPACE
6802
- value: $(params.aibroker_namespace)
6803
- - name: PULL_SECRET_NAME
6804
- value: $(params.pull_secret_name)
6805
- - name: MAS_AIBROKER_STORAGE_PROVIDER
6806
- value: $(params.mas_aibroker_storage_provider)
6807
- - name: MAS_AIBROKER_STORAGE_SSL
6808
- value: $(params.mas_aibroker_storage_ssl)
6809
- - name: MAS_AIBROKER_STORAGE_HOST
6810
- value: $(params.mas_aibroker_storage_host)
6811
- - name: MAS_AIBROKER_STORAGE_PORT
6812
- value: $(params.mas_aibroker_storage_port)
6813
- - name: MAS_AIBROKER_STORAGE_REGION
6814
- value: $(params.mas_aibroker_storage_region)
6815
- - name: MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET
6816
- value: $(params.mas_aibroker_storage_templates_bucket)
6817
- - name: MAS_AIBROKER_STORAGE_TENANTS_BUCKET
6818
- value: $(params.mas_aibroker_storage_tenants_bucket)
6819
- - name: MAS_AIBROKER_STORAGE_PIPELINES_BUCKET
6820
- value: $(params.mas_aibroker_storage_pipelines_bucket)
6821
- - name: SSH_SECRET_NAME
6822
- value: $(params.ssh_secret_name)
6823
- - name: DOCKER_SERVER
6824
- value: $(params.docker_server)
6825
- - name: TENANT_NAMESPACE
6826
- value: $(params.tenantNamespace)
6827
- - name: MAS_AIBROKER_PROVISION_TENANT
6828
- value: $(params.mas_aibroker_provision_tenant)
6829
- - name: PRIMARY_STORAGE_CLASS
6830
- value: $(params.primary_storage_class)
6831
- - name: IMAGE_STORE
6832
- value: $(params.image_store)
6833
- - name: IMAGE_WATCHER
6834
- value: $(params.image_watcher)
6835
- - name: IMAGE_CONTROLLER
6836
- value: $(params.image_controller)
6837
- - name: MAS_AIBROKER_CONNECTOR_TAG
6838
- value: $(params.mas_aibroker_connector_tag)
6839
- - name: MAS_AIBROKER_SAAS
6840
- value: $(params.mas_aibroker_saas)
6841
- - name: MODEL_ID_UNIQUE_LENGTH
6842
- value: $(params.model_id_unique_length)
6843
- - name: MODEL_ID_PREFIX
6844
- value: $(params.model_id_prefix)
6845
- - name: MAS_APP_CHANNEL
6846
- value: $(params.mas_app_channel)
6847
- - name: MAS_ICR_CP
6848
- value: $(params.mas_icr_cp)
6849
-
6850
- envFrom:
6851
- - configMapRef:
6852
- name: environment-properties
6853
- optional: true
6854
- - secretRef:
6855
- name: secure-properties
6856
- steps:
6857
- - args:
6858
- - |-
6859
- git config --global user.name "MAS Automation"
6860
- git config --global user.email "you@example.com"
6861
- git config --global user.password $GITHUB_PAT
6862
-
6863
- mkdir -p /tmp/init-kmodel
6864
- mas gitops-kmodel -a $ACCOUNT -c $CLUSTER_NAME \
6865
- --dir /tmp/init-kmodel \
6866
- --secrets-path $SECRET_PATH \
6867
- --github-push \
6868
- --github-host $GITHUB_HOST \
6869
- --github-org $GITHUB_ORG \
6870
- --github-repo $GITHUB_REPO \
6871
- --git-branch $GIT_BRANCH \
6872
-
6873
- exit $?
6874
- command:
6875
- - /bin/sh
6876
- - -c
6877
- name: gitops-kmodel
6878
- imagePullPolicy: IfNotPresent
6879
- image: quay.io/ibmmas/cli:15.6.2
6976
+ image: quay.io/ibmmas/cli:15.7.0
6880
6977
  workspaces:
6881
6978
  - name: configs
6882
6979
  # --------------------------------------------------------------------------------
@@ -7032,7 +7129,7 @@ spec:
7032
7129
  - -c
7033
7130
  name: gitops-license
7034
7131
  imagePullPolicy: Always
7035
- image: quay.io/ibmmas/cli:15.6.2
7132
+ image: quay.io/ibmmas/cli:15.7.0
7036
7133
  workspaces:
7037
7134
  - name: shared-entitlement
7038
7135
 
@@ -7756,7 +7853,7 @@ spec:
7756
7853
  - -c
7757
7854
  name: gitops-mas-fvt-preparer
7758
7855
  imagePullPolicy: Always
7759
- image: quay.io/ibmmas/cli:15.6.2
7856
+ image: quay.io/ibmmas/cli:15.7.0
7760
7857
  workspaces:
7761
7858
  - name: configs
7762
7859
  - name: shared-additional-configs
@@ -8256,7 +8353,7 @@ spec:
8256
8353
  - -c
8257
8354
  name: gitops-mas-initiator
8258
8355
  imagePullPolicy: IfNotPresent
8259
- image: quay.io/ibmmas/cli:15.6.2
8356
+ image: quay.io/ibmmas/cli:15.7.0
8260
8357
  workspaces:
8261
8358
  - name: configs
8262
8359
  # --------------------------------------------------------------------------------
@@ -8314,6 +8411,8 @@ spec:
8314
8411
  type: string
8315
8412
  - name: csb_ca_certificate_file
8316
8413
  type: string
8414
+ - name: recommend_cluster
8415
+ type: string
8317
8416
 
8318
8417
  stepTemplate:
8319
8418
  name: gitops-mas-provisioner
@@ -8364,6 +8463,8 @@ spec:
8364
8463
  value: $(params.async_poll_max)
8365
8464
  - name: CSB_CA_CERTIFICATE_FILE
8366
8465
  value: $(params.csb_ca_certificate_file)
8466
+ - name: RECOMMEND_CLUSTER
8467
+ value: $(params.recommend_cluster)
8367
8468
  envFrom:
8368
8469
  - configMapRef:
8369
8470
  name: environment-properties
@@ -8393,7 +8494,7 @@ spec:
8393
8494
  - -c
8394
8495
  name: gitops-mas-provisioner
8395
8496
  imagePullPolicy: IfNotPresent
8396
- image: quay.io/ibmmas/cli:15.6.2
8497
+ image: quay.io/ibmmas/cli:15.7.0
8397
8498
  workspaces:
8398
8499
  - name: configs
8399
8500
  - name: gitops-cluster-configs
@@ -8502,7 +8603,7 @@ spec:
8502
8603
  - -c
8503
8604
  name: gitops-mongo
8504
8605
  imagePullPolicy: IfNotPresent
8505
- image: quay.io/ibmmas/cli:15.6.2
8606
+ image: quay.io/ibmmas/cli:15.7.0
8506
8607
  workspaces:
8507
8608
  - name: configs
8508
8609
 
@@ -8628,7 +8729,7 @@ spec:
8628
8729
  - -c
8629
8730
  name: gitops-nvidia-gpu
8630
8731
  imagePullPolicy: IfNotPresent
8631
- image: quay.io/ibmmas/cli:15.6.2
8732
+ image: quay.io/ibmmas/cli:15.7.0
8632
8733
  workspaces:
8633
8734
  - name: configs
8634
8735
  # --------------------------------------------------------------------------------
@@ -8644,7 +8745,7 @@ spec:
8644
8745
  type: string
8645
8746
  - name: account
8646
8747
  type: string
8647
- - name: aibroker_instance_id
8748
+ - name: aiservice_instance_id
8648
8749
  type: string
8649
8750
  - name: cluster_url
8650
8751
  type: string
@@ -8659,6 +8760,8 @@ spec:
8659
8760
  type: string
8660
8761
  - name: secrets_path
8661
8762
  type: string
8763
+ - name: aiservice_namespace
8764
+ type: string
8662
8765
  - name: avp_aws_secret_region
8663
8766
  type: string
8664
8767
  - name: odh_channel
@@ -8674,11 +8777,16 @@ spec:
8674
8777
  type: string
8675
8778
  - name: odh_operator_version
8676
8779
  type: string
8677
- - name: mas_aibroker_storage_ssl
8780
+ - name: aiservice_storage_ssl
8678
8781
  type: string
8679
8782
  default: "true"
8680
- - name: mas_aibroker_storage_region
8783
+ - name: aiservice_storage_region
8784
+ type: string
8785
+ - name: opendatahub_source
8786
+ type: string
8787
+ - name: aiservice_odh_model_deployment_type
8681
8788
  type: string
8789
+
8682
8790
  stepTemplate:
8683
8791
  name: gitops-odh
8684
8792
  env:
@@ -8686,8 +8794,8 @@ spec:
8686
8794
  value: $(params.cluster_name)
8687
8795
  - name: ACCOUNT
8688
8796
  value: $(params.account)
8689
- - name: AIBROKER_INSTANCE_ID
8690
- value: $(params.aibroker_instance_id)
8797
+ - name: AISERVICE_INSTANCE_ID
8798
+ value: $(params.aiservice_instance_id)
8691
8799
  - name: CLUSTER_URL
8692
8800
  value: $(params.cluster_url)
8693
8801
  - name: GITHUB_REPO
@@ -8704,6 +8812,8 @@ spec:
8704
8812
  value: $(params.github_repo)
8705
8813
  - name: SM_AWS_REGION
8706
8814
  value: $(params.avp_aws_secret_region)
8815
+ - name: AISERVICE_NAMESPACE
8816
+ value: $(params.aiservice_namespace)
8707
8817
  - name: ODH_CHANNEL
8708
8818
  value: $(params.odh_channel)
8709
8819
  - name: ODH_INSTALL_PLAN
@@ -8716,10 +8826,14 @@ spec:
8716
8826
  value: $(params.opendatahub_namespace)
8717
8827
  - name: ODH_OPERATOR_VERSION
8718
8828
  value: $(params.odh_operator_version)
8719
- - name: MAS_AIBROKER_STORAGE_SSL
8720
- value: $(params.mas_aibroker_storage_ssl)
8721
- - name: MAS_AIBROKER_STORAGE_REGION
8722
- value: $(params.mas_aibroker_storage_region)
8829
+ - name: AISERVICE_STORAGE_SSL
8830
+ value: $(params.aiservice_storage_ssl)
8831
+ - name: AISERVICE_STORAGE_REGION
8832
+ value: $(params.aiservice_storage_region)
8833
+ - name: OPENDATAHUB_SOURCE
8834
+ value: $(params.opendatahub_source)
8835
+ - name: AISERVICE_ODH_MODEL_DEPLOYMENT_TYPE
8836
+ value: $(params.aiservice_odh_model_deployment_type)
8723
8837
  envFrom:
8724
8838
  - configMapRef:
8725
8839
  name: environment-properties
@@ -8749,7 +8863,7 @@ spec:
8749
8863
  - -c
8750
8864
  name: gitops-odh
8751
8865
  imagePullPolicy: IfNotPresent
8752
- image: quay.io/ibmmas/cli:15.6.2
8866
+ image: quay.io/ibmmas/cli:15.7.0
8753
8867
  workspaces:
8754
8868
  - name: configs
8755
8869
  # --------------------------------------------------------------------------------
@@ -8867,7 +8981,7 @@ spec:
8867
8981
  - -c
8868
8982
  name: gitops-process-mongo-user
8869
8983
  imagePullPolicy: IfNotPresent
8870
- image: quay.io/ibmmas/cli:15.6.2
8984
+ image: quay.io/ibmmas/cli:15.7.0
8871
8985
  workspaces:
8872
8986
  - name: configs
8873
8987
  # --------------------------------------------------------------------------------
@@ -8923,7 +9037,7 @@ spec:
8923
9037
  - -c
8924
9038
  name: gitops-rosa
8925
9039
  imagePullPolicy: IfNotPresent
8926
- image: quay.io/ibmmas/cli:15.6.2
9040
+ image: quay.io/ibmmas/cli:15.7.0
8927
9041
  workspaces:
8928
9042
  - name: configs
8929
9043
  # --------------------------------------------------------------------------------
@@ -9052,7 +9166,7 @@ spec:
9052
9166
  - -c
9053
9167
  name: gitops-sls
9054
9168
  imagePullPolicy: Always
9055
- image: quay.io/ibmmas/cli:15.6.2
9169
+ image: quay.io/ibmmas/cli:15.7.0
9056
9170
  workspaces:
9057
9171
  - name: shared-entitlement
9058
9172
 
@@ -9235,7 +9349,7 @@ spec:
9235
9349
  - -c
9236
9350
  name: gitops-suite-app-config
9237
9351
  imagePullPolicy: IfNotPresent
9238
- image: quay.io/ibmmas/cli:15.6.2
9352
+ image: quay.io/ibmmas/cli:15.7.0
9239
9353
  workspaces:
9240
9354
  - name: configs
9241
9355
  - name: shared-gitops-configs
@@ -9393,7 +9507,7 @@ spec:
9393
9507
  - -c
9394
9508
  name: gitops-suite-app-install
9395
9509
  imagePullPolicy: Always
9396
- image: quay.io/ibmmas/cli:15.6.2
9510
+ image: quay.io/ibmmas/cli:15.7.0
9397
9511
  workspaces:
9398
9512
  - name: configs
9399
9513
  - name: shared-gitops-configs
@@ -9499,7 +9613,7 @@ spec:
9499
9613
  - -c
9500
9614
  name: gitops-suite-certs
9501
9615
  imagePullPolicy: IfNotPresent
9502
- image: quay.io/ibmmas/cli:15.6.2
9616
+ image: quay.io/ibmmas/cli:15.7.0
9503
9617
  workspaces:
9504
9618
  - name: configs
9505
9619
  - name: certificates
@@ -9674,7 +9788,7 @@ spec:
9674
9788
  - -c
9675
9789
  name: gitops-suite-config
9676
9790
  imagePullPolicy: IfNotPresent
9677
- image: quay.io/ibmmas/cli:15.6.2
9791
+ image: quay.io/ibmmas/cli:15.7.0
9678
9792
  workspaces:
9679
9793
  - name: configs
9680
9794
  - name: shared-additional-configs
@@ -9774,7 +9888,7 @@ spec:
9774
9888
  - -c
9775
9889
  name: gitops-suite-dns
9776
9890
  imagePullPolicy: IfNotPresent
9777
- image: quay.io/ibmmas/cli:15.6.2
9891
+ image: quay.io/ibmmas/cli:15.7.0
9778
9892
  workspaces:
9779
9893
  - name: configs
9780
9894
 
@@ -9898,7 +10012,7 @@ spec:
9898
10012
  - -c
9899
10013
  name: gitops-suite-idp-config
9900
10014
  imagePullPolicy: IfNotPresent
9901
- image: quay.io/ibmmas/cli:15.6.2
10015
+ image: quay.io/ibmmas/cli:15.7.0
9902
10016
  workspaces:
9903
10017
  - name: configs
9904
10018
  - name: shared-additional-configs
@@ -9999,7 +10113,7 @@ spec:
9999
10113
  - -c
10000
10114
  name: gitops-suite-objectstorage-config
10001
10115
  imagePullPolicy: IfNotPresent
10002
- image: quay.io/ibmmas/cli:15.6.2
10116
+ image: quay.io/ibmmas/cli:15.7.0
10003
10117
  workspaces:
10004
10118
  - name: configs
10005
10119
  - name: shared-gitops-configs
@@ -10421,7 +10535,7 @@ spec:
10421
10535
  - -c
10422
10536
  name: gitops-suite-smtp-config
10423
10537
  imagePullPolicy: IfNotPresent
10424
- image: quay.io/ibmmas/cli:15.6.2
10538
+ image: quay.io/ibmmas/cli:15.7.0
10425
10539
  workspaces:
10426
10540
  - name: configs
10427
10541
  - name: shared-gitops-configs
@@ -10541,7 +10655,7 @@ spec:
10541
10655
  - -c
10542
10656
  name: gitops-suite-watson-studio-config
10543
10657
  imagePullPolicy: IfNotPresent
10544
- image: quay.io/ibmmas/cli:15.6.2
10658
+ image: quay.io/ibmmas/cli:15.7.0
10545
10659
  workspaces:
10546
10660
  - name: configs
10547
10661
  - name: shared-gitops-configs
@@ -10643,7 +10757,7 @@ spec:
10643
10757
  - -c
10644
10758
  name: gitops-suite-workspace
10645
10759
  imagePullPolicy: IfNotPresent
10646
- image: quay.io/ibmmas/cli:15.6.2
10760
+ image: quay.io/ibmmas/cli:15.7.0
10647
10761
  workspaces:
10648
10762
  - name: configs
10649
10763
  # --------------------------------------------------------------------------------
@@ -10981,7 +11095,7 @@ spec:
10981
11095
  - -c
10982
11096
  name: gitops-suite
10983
11097
  imagePullPolicy: IfNotPresent
10984
- image: quay.io/ibmmas/cli:15.6.2
11098
+ image: quay.io/ibmmas/cli:15.7.0
10985
11099
  workspaces:
10986
11100
  - name: configs
10987
11101
  - name: shared-gitops-configs
@@ -11031,7 +11145,7 @@ spec:
11031
11145
 
11032
11146
  steps:
11033
11147
  - name: grafana
11034
- image: quay.io/ibmmas/cli:15.6.2
11148
+ image: quay.io/ibmmas/cli:15.7.0
11035
11149
  imagePullPolicy: $(params.image_pull_policy)
11036
11150
  command:
11037
11151
  - /opt/app-root/src/run-role.sh
@@ -11165,7 +11279,7 @@ spec:
11165
11279
  command:
11166
11280
  - /opt/app-root/src/run-role.sh
11167
11281
  - ibm_catalogs
11168
- image: quay.io/ibmmas/cli:15.6.2
11282
+ image: quay.io/ibmmas/cli:15.7.0
11169
11283
  imagePullPolicy: $(params.image_pull_policy)
11170
11284
  workingDir: /workspace/configs
11171
11285
  # --------------------------------------------------------------------------------
@@ -11407,7 +11521,7 @@ spec:
11407
11521
  command:
11408
11522
  - /opt/app-root/src/run-role.sh
11409
11523
  - kafka
11410
- image: quay.io/ibmmas/cli:15.6.2
11524
+ image: quay.io/ibmmas/cli:15.7.0
11411
11525
  imagePullPolicy: $(params.image_pull_policy)
11412
11526
  workingDir: /workspace/configs
11413
11527
 
@@ -11875,7 +11989,7 @@ spec:
11875
11989
  description: Extracted component names as a JSON array
11876
11990
  steps:
11877
11991
  - name: extract
11878
- image: quay.io/ibmmas/cli:15.6.2
11992
+ image: quay.io/ibmmas/cli:15.7.0
11879
11993
  script: |
11880
11994
  #!/bin/sh
11881
11995
  echo "Hello.. Start extraction for $(params.mas_appws_components)"
@@ -12228,7 +12342,7 @@ spec:
12228
12342
  echo "No IBM COS instance to delete"
12229
12343
  fi
12230
12344
  exit 0
12231
- image: quay.io/ibmmas/cli:15.6.2
12345
+ image: quay.io/ibmmas/cli:15.7.0
12232
12346
  imagePullPolicy: $(params.image_pull_policy)
12233
12347
  workingDir: /workspace/configs
12234
12348
  env:
@@ -12328,7 +12442,7 @@ spec:
12328
12442
  echo "No EventStreams instance to delete"
12329
12443
  fi
12330
12444
  exit 0
12331
- image: quay.io/ibmmas/cli:15.6.2
12445
+ image: quay.io/ibmmas/cli:15.7.0
12332
12446
  imagePullPolicy: $(params.image_pull_policy)
12333
12447
  workingDir: /workspace/configs
12334
12448
  env:
@@ -12429,7 +12543,7 @@ spec:
12429
12543
  command:
12430
12544
  - /opt/app-root/src/run-role.sh
12431
12545
  - ocp_deprovision
12432
- image: quay.io/ibmmas/cli:15.6.2
12546
+ image: quay.io/ibmmas/cli:15.7.0
12433
12547
  imagePullPolicy: $(params.image_pull_policy)
12434
12548
  env:
12435
12549
  - name: DEVOPS_MONGO_URI
@@ -12586,7 +12700,7 @@ spec:
12586
12700
  command:
12587
12701
  - python3
12588
12702
  - /opt/app-root/src/finalizer.py
12589
- image: quay.io/ibmmas/cli:15.6.2
12703
+ image: quay.io/ibmmas/cli:15.7.0
12590
12704
  imagePullPolicy: $(params.image_pull_policy)
12591
12705
  env:
12592
12706
  - name: DEVOPS_MONGO_URI
@@ -14290,7 +14404,7 @@ spec:
14290
14404
  command:
14291
14405
  - python3
14292
14406
  - /opt/app-root/src/mobilever.py
14293
- image: quay.io/ibmmas/cli:15.6.2
14407
+ image: quay.io/ibmmas/cli:15.7.0
14294
14408
  imagePullPolicy: $(params.image_pull_policy)
14295
14409
  onError: continue
14296
14410
 
@@ -14653,7 +14767,7 @@ spec:
14653
14767
 
14654
14768
  steps:
14655
14769
  - name: post-update-verify
14656
- image: quay.io/ibmmas/cli:15.6.2
14770
+ image: quay.io/ibmmas/cli:15.7.0
14657
14771
  imagePullPolicy: $(params.image_pull_policy)
14658
14772
  command:
14659
14773
  - ansible-playbook
@@ -14709,7 +14823,7 @@ spec:
14709
14823
 
14710
14824
  steps:
14711
14825
  - name: create-offline-upgrade-cron
14712
- image: quay.io/ibmmas/cli:15.6.2
14826
+ image: quay.io/ibmmas/cli:15.7.0
14713
14827
  imagePullPolicy: $(params.image_pull_policy)
14714
14828
  command:
14715
14829
  - ansible-playbook
@@ -14765,7 +14879,7 @@ spec:
14765
14879
 
14766
14880
  steps:
14767
14881
  - name: create-offline-upgrade-cron
14768
- image: quay.io/ibmmas/cli:15.6.2
14882
+ image: quay.io/ibmmas/cli:15.7.0
14769
14883
  imagePullPolicy: $(params.image_pull_policy)
14770
14884
  command:
14771
14885
  - ansible-playbook
@@ -15199,7 +15313,7 @@ spec:
15199
15313
  echo '--------------------------------------------------------------------------------'
15200
15314
  exit $RESULT
15201
15315
  timeout: "0"
15202
- image: quay.io/ibmmas/cli:15.6.2
15316
+ image: quay.io/ibmmas/cli:15.7.0
15203
15317
  imagePullPolicy: $(params.image_pull_policy)
15204
15318
  env:
15205
15319
  - name: DEVOPS_MONGO_URI
@@ -15259,7 +15373,7 @@ spec:
15259
15373
  echo '--------------------------------------------------------------------------------'
15260
15374
  exit $RESULT
15261
15375
  timeout: "0"
15262
- image: quay.io/ibmmas/cli:15.6.2
15376
+ image: quay.io/ibmmas/cli:15.7.0
15263
15377
  imagePullPolicy: $(params.image_pull_policy)
15264
15378
  env:
15265
15379
  - name: DEVOPS_MONGO_URI
@@ -15332,7 +15446,7 @@ spec:
15332
15446
  echo '--------------------------------------------------------------------------------'
15333
15447
  exit $RESULT
15334
15448
  timeout: "0"
15335
- image: quay.io/ibmmas/cli:15.6.2
15449
+ image: quay.io/ibmmas/cli:15.7.0
15336
15450
  imagePullPolicy: $(params.image_pull_policy)
15337
15451
  env:
15338
15452
  - name: DEVOPS_MONGO_URI
@@ -15378,7 +15492,7 @@ spec:
15378
15492
 
15379
15493
  steps:
15380
15494
  - name: start-pipelinerun
15381
- image: quay.io/ibmmas/cli:15.6.2
15495
+ image: quay.io/ibmmas/cli:15.7.0
15382
15496
  imagePullPolicy: $(params.image_pull_policy)
15383
15497
  command:
15384
15498
  - ansible-playbook
@@ -15475,7 +15589,7 @@ spec:
15475
15589
  optional: false
15476
15590
 
15477
15591
  - name: wait-for-pipelinerun
15478
- image: quay.io/ibmmas/cli:15.6.2
15592
+ image: quay.io/ibmmas/cli:15.7.0
15479
15593
  imagePullPolicy: $(params.image_pull_policy)
15480
15594
  # 50 retries at 5 minute intervals = just over 4 hours
15481
15595
  command:
@@ -15519,7 +15633,7 @@ spec:
15519
15633
 
15520
15634
  steps:
15521
15635
  - name: start-pipelinerun
15522
- image: quay.io/ibmmas/cli:15.6.2
15636
+ image: quay.io/ibmmas/cli:15.7.0
15523
15637
  imagePullPolicy: $(params.image_pull_policy)
15524
15638
  command:
15525
15639
  - ansible-playbook
@@ -15672,7 +15786,7 @@ spec:
15672
15786
  optional: false
15673
15787
 
15674
15788
  - name: wait-for-pipelinerun
15675
- image: quay.io/ibmmas/cli:15.6.2
15789
+ image: quay.io/ibmmas/cli:15.7.0
15676
15790
  imagePullPolicy: $(params.image_pull_policy)
15677
15791
  # 50 retries at 10 minute intervals = just over 8 hours
15678
15792
  command:
@@ -15721,7 +15835,7 @@ spec:
15721
15835
 
15722
15836
  steps:
15723
15837
  - name: start-pipelinerun
15724
- image: quay.io/ibmmas/cli:15.6.2
15838
+ image: quay.io/ibmmas/cli:15.7.0
15725
15839
  imagePullPolicy: $(params.image_pull_policy)
15726
15840
  command:
15727
15841
  - ansible-playbook
@@ -15771,7 +15885,7 @@ spec:
15771
15885
 
15772
15886
  steps:
15773
15887
  - name: start-pipelinerun
15774
- image: quay.io/ibmmas/cli:15.6.2
15888
+ image: quay.io/ibmmas/cli:15.7.0
15775
15889
  imagePullPolicy: $(params.image_pull_policy)
15776
15890
  command:
15777
15891
  - ansible-playbook
@@ -15850,7 +15964,7 @@ spec:
15850
15964
  optional: false
15851
15965
 
15852
15966
  - name: wait-for-pipelinerun
15853
- image: quay.io/ibmmas/cli:15.6.2
15967
+ image: quay.io/ibmmas/cli:15.7.0
15854
15968
  imagePullPolicy: $(params.image_pull_policy)
15855
15969
  # 15 retries at 5 minute intervals = just over 1 hour
15856
15970
  command:
@@ -15895,7 +16009,7 @@ spec:
15895
16009
 
15896
16010
  steps:
15897
16011
  - name: start-pipelinerun
15898
- image: quay.io/ibmmas/cli:15.6.2
16012
+ image: quay.io/ibmmas/cli:15.7.0
15899
16013
  imagePullPolicy: $(params.image_pull_policy)
15900
16014
  command:
15901
16015
  - ansible-playbook
@@ -16023,7 +16137,7 @@ spec:
16023
16137
  optional: false
16024
16138
 
16025
16139
  - name: wait-for-pipelinerun
16026
- image: quay.io/ibmmas/cli:15.6.2
16140
+ image: quay.io/ibmmas/cli:15.7.0
16027
16141
  imagePullPolicy: $(params.image_pull_policy)
16028
16142
  # 50 retries at 10 minute intervals = just over 8 hours
16029
16143
  command:
@@ -16067,7 +16181,7 @@ spec:
16067
16181
 
16068
16182
  steps:
16069
16183
  - name: start-pipelinerun
16070
- image: quay.io/ibmmas/cli:15.6.2
16184
+ image: quay.io/ibmmas/cli:15.7.0
16071
16185
  imagePullPolicy: $(params.image_pull_policy)
16072
16186
  command:
16073
16187
  - ansible-playbook
@@ -16220,7 +16334,7 @@ spec:
16220
16334
  optional: false
16221
16335
 
16222
16336
  - name: wait-for-pipelinerun
16223
- image: quay.io/ibmmas/cli:15.6.2
16337
+ image: quay.io/ibmmas/cli:15.7.0
16224
16338
  imagePullPolicy: $(params.image_pull_policy)
16225
16339
  # 50 retries at 10 minute intervals = just over 8 hours
16226
16340
  command:
@@ -16245,13 +16359,13 @@ spec:
16245
16359
  - name: IGNORE_FAILURE
16246
16360
  value: "True"
16247
16361
  # --------------------------------------------------------------------------------
16248
- # /home/runner/work/cli/cli/tekton/target/tasks/mas-launchfvt-mobile-upgrade-post.yaml
16362
+ # /home/runner/work/cli/cli/tekton/target/tasks/mas-launchfvt-mobile.yaml
16249
16363
  # --------------------------------------------------------------------------------
16250
16364
  ---
16251
16365
  apiVersion: tekton.dev/v1beta1
16252
16366
  kind: Task
16253
16367
  metadata:
16254
- name: mas-launchfvt-mobile-upgrade-post
16368
+ name: mas-launchfvt-mobile
16255
16369
  spec:
16256
16370
  params:
16257
16371
  # Control the image pull policy for the FVT container image
@@ -16261,25 +16375,29 @@ spec:
16261
16375
 
16262
16376
  - name: pipelinerun_name_testng
16263
16377
  type: string
16264
-
16265
- - name: launchfvt_manage
16378
+ - name: pipelinerun_name_pytest
16379
+ type: string
16380
+ - name: pipelinerun_name_requests
16381
+ type: string
16382
+ - name: launchfvt_mobile_requests
16266
16383
  type: string
16267
16384
 
16268
16385
  steps:
16269
- - name: start-testng-pipelinerun
16270
- image: quay.io/ibmmas/cli:15.6.2
16386
+ - name: start-pytest-pipelinerun
16387
+ image: quay.io/ibmmas/cli:15.7.0
16271
16388
  imagePullPolicy: $(params.image_pull_policy)
16272
16389
  command:
16273
16390
  - ansible-playbook
16274
- - /masfvt/fvt-mobile-testng.yml
16391
+ - /masfvt/fvt-mobile-pytest.yml
16275
16392
  env:
16276
16393
  - name: IMAGE_PULL_POLICY
16277
16394
  value: $(params.image_pull_policy)
16278
16395
  - name: PIPELINERUN_NAME
16279
- value: $(params.pipelinerun_name_testng)
16396
+ value: $(params.pipelinerun_name_pytest)
16280
16397
  - name: PIPELINERUN_NAMESPACE
16281
16398
  value: $(context.taskRun.namespace)
16282
16399
 
16400
+
16283
16401
  # Lookups from mas-devops
16284
16402
  # -----------------------------------------------------------------------
16285
16403
  - name: DEVOPS_BUILD_NUMBER
@@ -16337,7 +16455,6 @@ spec:
16337
16455
  name: mas-fvt-mobile
16338
16456
  key: MAS_WORKSPACE_ID
16339
16457
  optional: false
16340
-
16341
16458
  # Digests
16342
16459
  - name: FVT_DIGEST_MOBILE_PYTEST
16343
16460
  valueFrom:
@@ -16345,21 +16462,9 @@ spec:
16345
16462
  name: mas-fvt-mobile
16346
16463
  key: FVT_DIGEST_MOBILE_PYTEST
16347
16464
  optional: false
16348
- - name: FVT_DIGEST_MOBILE_TESTNG
16349
- valueFrom:
16350
- secretKeyRef:
16351
- name: mas-fvt-mobile
16352
- key: FVT_DIGEST_MOBILE_TESTNG
16353
- optional: false
16354
- - name: FVT_DIGEST_MANAGE
16355
- valueFrom:
16356
- secretKeyRef:
16357
- name: mas-fvt-mobile
16358
- key: FVT_DIGEST_MANAGE
16359
- optional: false
16360
16465
 
16361
- - name: wait-for-testng-pipelinerun
16362
- image: quay.io/ibmmas/cli:15.6.2
16466
+ - name: wait-for-pytest-pipelinerun
16467
+ image: quay.io/ibmmas/cli:15.7.0
16363
16468
  imagePullPolicy: $(params.image_pull_policy)
16364
16469
  # 50 retries at 10 minute intervals = just over 8 hours
16365
16470
  command:
@@ -16368,7 +16473,7 @@ spec:
16368
16473
  - name: TYPE
16369
16474
  value: pipelinerun
16370
16475
  - name: NAME
16371
- value: $(params.pipelinerun_name_testng)
16476
+ value: $(params.pipelinerun_name_pytest)
16372
16477
  - name: SUFFIX
16373
16478
  valueFrom:
16374
16479
  secretKeyRef:
@@ -16382,46 +16487,22 @@ spec:
16382
16487
  - name: MAX_RETRIES
16383
16488
  value: "50"
16384
16489
  - name: IGNORE_FAILURE
16385
- value: "True"# --------------------------------------------------------------------------------
16386
- # /home/runner/work/cli/cli/tekton/target/tasks/mas-launchfvt-mobile-upgrade-pre.yaml
16387
- # --------------------------------------------------------------------------------
16388
- ---
16389
- apiVersion: tekton.dev/v1beta1
16390
- kind: Task
16391
- metadata:
16392
- name: mas-launchfvt-mobile-upgrade-pre
16393
- spec:
16394
- params:
16395
- # Control the image pull policy for the FVT container image
16396
- - name: image_pull_policy
16397
- type: string
16398
- default: IfNotPresent
16399
-
16400
- - name: pipelinerun_name_pytest
16401
- type: string
16402
-
16403
- - name: launchfvt_manage
16404
- type: string
16405
- default: ""
16490
+ value: "True"
16406
16491
 
16407
- steps:
16408
- - name: start-pytest-pipelinerun
16409
- image: quay.io/ibmmas/cli:15.6.2
16492
+ - name: start-testng-pipelinerun
16493
+ image: quay.io/ibmmas/cli:15.7.0
16410
16494
  imagePullPolicy: $(params.image_pull_policy)
16411
16495
  command:
16412
16496
  - ansible-playbook
16413
- - /masfvt/fvt-mobile-pytest.yml
16497
+ - /masfvt/fvt-mobile-testng.yml
16414
16498
  env:
16415
16499
  - name: IMAGE_PULL_POLICY
16416
16500
  value: $(params.image_pull_policy)
16417
16501
  - name: PIPELINERUN_NAME
16418
- value: $(params.pipelinerun_name_pytest)
16419
- - name: LAUNCHFVT_MANAGE
16420
- value: $(params.launchfvt_manage)
16502
+ value: $(params.pipelinerun_name_testng)
16421
16503
  - name: PIPELINERUN_NAMESPACE
16422
16504
  value: $(context.taskRun.namespace)
16423
16505
 
16424
-
16425
16506
  # Lookups from mas-devops
16426
16507
  # -----------------------------------------------------------------------
16427
16508
  - name: DEVOPS_BUILD_NUMBER
@@ -16479,6 +16560,13 @@ spec:
16479
16560
  name: mas-fvt-mobile
16480
16561
  key: MAS_WORKSPACE_ID
16481
16562
  optional: false
16563
+
16564
+ - name: MANAGE_COMPONENTS
16565
+ valueFrom:
16566
+ secretKeyRef:
16567
+ name: mas-fvt-mobile
16568
+ key: MANAGE_COMPONENTS
16569
+ optional: false
16482
16570
 
16483
16571
  # Digests
16484
16572
  - name: FVT_DIGEST_MOBILE_PYTEST
@@ -16487,9 +16575,21 @@ spec:
16487
16575
  name: mas-fvt-mobile
16488
16576
  key: FVT_DIGEST_MOBILE_PYTEST
16489
16577
  optional: false
16578
+ - name: FVT_DIGEST_MOBILE_TESTNG
16579
+ valueFrom:
16580
+ secretKeyRef:
16581
+ name: mas-fvt-mobile
16582
+ key: FVT_DIGEST_MOBILE_TESTNG
16583
+ optional: false
16584
+ - name: FVT_DIGEST_MANAGE
16585
+ valueFrom:
16586
+ secretKeyRef:
16587
+ name: mas-fvt-mobile
16588
+ key: FVT_DIGEST_MANAGE
16589
+ optional: false
16490
16590
 
16491
- - name: wait-for-pytest-pipelinerun
16492
- image: quay.io/ibmmas/cli:15.6.2
16591
+ - name: wait-for-testng-pipelinerun
16592
+ image: quay.io/ibmmas/cli:15.7.0
16493
16593
  imagePullPolicy: $(params.image_pull_policy)
16494
16594
  # 50 retries at 10 minute intervals = just over 8 hours
16495
16595
  command:
@@ -16498,7 +16598,7 @@ spec:
16498
16598
  - name: TYPE
16499
16599
  value: pipelinerun
16500
16600
  - name: NAME
16501
- value: $(params.pipelinerun_name_pytest)
16601
+ value: $(params.pipelinerun_name_testng)
16502
16602
  - name: SUFFIX
16503
16603
  valueFrom:
16504
16604
  secretKeyRef:
@@ -16513,43 +16613,22 @@ spec:
16513
16613
  value: "50"
16514
16614
  - name: IGNORE_FAILURE
16515
16615
  value: "True"
16516
-
16517
- # --------------------------------------------------------------------------------
16518
- # /home/runner/work/cli/cli/tekton/target/tasks/mas-launchfvt-mobile.yaml
16519
- # --------------------------------------------------------------------------------
16520
- ---
16521
- apiVersion: tekton.dev/v1beta1
16522
- kind: Task
16523
- metadata:
16524
- name: mas-launchfvt-mobile
16525
- spec:
16526
- params:
16527
- # Control the image pull policy for the FVT container image
16528
- - name: image_pull_policy
16529
- type: string
16530
- default: IfNotPresent
16531
-
16532
- - name: pipelinerun_name_testng
16533
- type: string
16534
16616
 
16535
- - name: pipelinerun_name_pytest
16536
- type: string
16537
-
16538
- steps:
16539
- - name: start-pytest-pipelinerun
16540
- image: quay.io/ibmmas/cli:15.6.2
16617
+ - name: start-requests-pipelinerun
16618
+ image: quay.io/ibmmas/cli:15.7.0
16541
16619
  imagePullPolicy: $(params.image_pull_policy)
16542
16620
  command:
16543
16621
  - ansible-playbook
16544
- - /masfvt/fvt-mobile-pytest.yml
16622
+ - /masfvt/fvt-mobile-requests.yml
16545
16623
  env:
16546
16624
  - name: IMAGE_PULL_POLICY
16547
16625
  value: $(params.image_pull_policy)
16548
16626
  - name: PIPELINERUN_NAME
16549
- value: $(params.pipelinerun_name_pytest)
16627
+ value: $(params.pipelinerun_name_requests)
16550
16628
  - name: PIPELINERUN_NAMESPACE
16551
16629
  value: $(context.taskRun.namespace)
16552
-
16630
+ - name: LAUNCHFVT_MOBILE_REQUESTS
16631
+ value: $(params.launchfvt_mobile_requests)
16553
16632
 
16554
16633
  # Lookups from mas-devops
16555
16634
  # -----------------------------------------------------------------------
@@ -16608,6 +16687,7 @@ spec:
16608
16687
  name: mas-fvt-mobile
16609
16688
  key: MAS_WORKSPACE_ID
16610
16689
  optional: false
16690
+
16611
16691
  # Digests
16612
16692
  - name: FVT_DIGEST_MOBILE_PYTEST
16613
16693
  valueFrom:
@@ -16615,9 +16695,9 @@ spec:
16615
16695
  name: mas-fvt-mobile
16616
16696
  key: FVT_DIGEST_MOBILE_PYTEST
16617
16697
  optional: false
16618
-
16619
- - name: wait-for-pytest-pipelinerun
16620
- image: quay.io/ibmmas/cli:15.6.2
16698
+
16699
+ - name: wait-for-requests-pipelinerun
16700
+ image: quay.io/ibmmas/cli:15.7.0
16621
16701
  imagePullPolicy: $(params.image_pull_policy)
16622
16702
  # 50 retries at 10 minute intervals = just over 8 hours
16623
16703
  command:
@@ -16626,7 +16706,7 @@ spec:
16626
16706
  - name: TYPE
16627
16707
  value: pipelinerun
16628
16708
  - name: NAME
16629
- value: $(params.pipelinerun_name_pytest)
16709
+ value: $(params.pipelinerun_name_requests)
16630
16710
  - name: SUFFIX
16631
16711
  valueFrom:
16632
16712
  secretKeyRef:
@@ -16641,160 +16721,36 @@ spec:
16641
16721
  value: "50"
16642
16722
  - name: IGNORE_FAILURE
16643
16723
  value: "True"
16724
+ # --------------------------------------------------------------------------------
16725
+ # /home/runner/work/cli/cli/tekton/target/tasks/mas-launchfvt-monitor.yaml
16726
+ # --------------------------------------------------------------------------------
16727
+ ---
16728
+ apiVersion: tekton.dev/v1beta1
16729
+ kind: Task
16730
+ metadata:
16731
+ name: mas-launchfvt-monitor
16732
+ spec:
16733
+ params:
16734
+ # Control the image pull policy for the FVT container image
16735
+ - name: image_pull_policy
16736
+ type: string
16737
+ default: IfNotPresent
16644
16738
 
16645
- - name: start-testng-pipelinerun
16646
- image: quay.io/ibmmas/cli:15.6.2
16739
+ - name: pipelinerun_name
16740
+ type: string
16741
+
16742
+ steps:
16743
+ - name: start-pipelinerun
16744
+ image: quay.io/ibmmas/cli:15.7.0
16647
16745
  imagePullPolicy: $(params.image_pull_policy)
16648
16746
  command:
16649
16747
  - ansible-playbook
16650
- - /masfvt/fvt-mobile-testng.yml
16748
+ - /masfvt/fvt-monitor.yml
16651
16749
  env:
16652
16750
  - name: IMAGE_PULL_POLICY
16653
16751
  value: $(params.image_pull_policy)
16654
16752
  - name: PIPELINERUN_NAME
16655
- value: $(params.pipelinerun_name_testng)
16656
- - name: PIPELINERUN_NAMESPACE
16657
- value: $(context.taskRun.namespace)
16658
-
16659
- # Lookups from mas-devops
16660
- # -----------------------------------------------------------------------
16661
- - name: DEVOPS_BUILD_NUMBER
16662
- valueFrom:
16663
- secretKeyRef:
16664
- name: mas-devops
16665
- key: DEVOPS_BUILD_NUMBER
16666
- optional: true
16667
- - name: MAS_INSTANCE_ID
16668
- valueFrom:
16669
- secretKeyRef:
16670
- name: mas-devops
16671
- key: MAS_INSTANCE_ID
16672
- optional: false
16673
-
16674
- # Lookups from mas-fvt
16675
- # -----------------------------------------------------------------------
16676
- - name: FVT_IMAGE_REGISTRY
16677
- valueFrom:
16678
- secretKeyRef:
16679
- name: mas-fvt
16680
- key: FVT_IMAGE_REGISTRY
16681
- optional: false
16682
- - name: FVT_ARTIFACTORY_USERNAME
16683
- valueFrom:
16684
- secretKeyRef:
16685
- name: mas-fvt
16686
- key: FVT_ARTIFACTORY_USERNAME
16687
- optional: false
16688
- - name: FVT_ARTIFACTORY_TOKEN
16689
- valueFrom:
16690
- secretKeyRef:
16691
- name: mas-fvt
16692
- key: FVT_ARTIFACTORY_TOKEN
16693
- optional: false
16694
-
16695
- # Lookups from mas-fvt-mobile
16696
- # -----------------------------------------------------------------------
16697
- # Framework Information
16698
- - name: MAS_CHANNEL
16699
- valueFrom:
16700
- secretKeyRef:
16701
- name: mas-fvt-mobile
16702
- key: MAS_CHANNEL
16703
- optional: false
16704
- - name: MAS_APP_CHANNEL_MANAGE
16705
- valueFrom:
16706
- secretKeyRef:
16707
- name: mas-fvt-mobile
16708
- key: MAS_APP_CHANNEL_MANAGE
16709
- optional: false
16710
- - name: MAS_WORKSPACE_ID
16711
- valueFrom:
16712
- secretKeyRef:
16713
- name: mas-fvt-mobile
16714
- key: MAS_WORKSPACE_ID
16715
- optional: false
16716
-
16717
- - name: MANAGE_COMPONENTS
16718
- valueFrom:
16719
- secretKeyRef:
16720
- name: mas-fvt-mobile
16721
- key: MANAGE_COMPONENTS
16722
- optional: false
16723
-
16724
- # Digests
16725
- - name: FVT_DIGEST_MOBILE_PYTEST
16726
- valueFrom:
16727
- secretKeyRef:
16728
- name: mas-fvt-mobile
16729
- key: FVT_DIGEST_MOBILE_PYTEST
16730
- optional: false
16731
- - name: FVT_DIGEST_MOBILE_TESTNG
16732
- valueFrom:
16733
- secretKeyRef:
16734
- name: mas-fvt-mobile
16735
- key: FVT_DIGEST_MOBILE_TESTNG
16736
- optional: false
16737
- - name: FVT_DIGEST_MANAGE
16738
- valueFrom:
16739
- secretKeyRef:
16740
- name: mas-fvt-mobile
16741
- key: FVT_DIGEST_MANAGE
16742
- optional: false
16743
-
16744
- - name: wait-for-testng-pipelinerun
16745
- image: quay.io/ibmmas/cli:15.6.2
16746
- imagePullPolicy: $(params.image_pull_policy)
16747
- # 50 retries at 10 minute intervals = just over 8 hours
16748
- command:
16749
- - /opt/app-root/src/wait-for-tekton.sh
16750
- env:
16751
- - name: TYPE
16752
- value: pipelinerun
16753
- - name: NAME
16754
- value: $(params.pipelinerun_name_testng)
16755
- - name: SUFFIX
16756
- valueFrom:
16757
- secretKeyRef:
16758
- name: mas-devops
16759
- key: DEVOPS_BUILD_NUMBER
16760
- optional: true
16761
- - name: NAMESPACE
16762
- value: $(context.taskRun.namespace)
16763
- - name: DELAY
16764
- value: "600"
16765
- - name: MAX_RETRIES
16766
- value: "50"
16767
- - name: IGNORE_FAILURE
16768
- value: "True"# --------------------------------------------------------------------------------
16769
- # /home/runner/work/cli/cli/tekton/target/tasks/mas-launchfvt-monitor.yaml
16770
- # --------------------------------------------------------------------------------
16771
- ---
16772
- apiVersion: tekton.dev/v1beta1
16773
- kind: Task
16774
- metadata:
16775
- name: mas-launchfvt-monitor
16776
- spec:
16777
- params:
16778
- # Control the image pull policy for the FVT container image
16779
- - name: image_pull_policy
16780
- type: string
16781
- default: IfNotPresent
16782
-
16783
- - name: pipelinerun_name
16784
- type: string
16785
-
16786
- steps:
16787
- - name: start-pipelinerun
16788
- image: quay.io/ibmmas/cli:15.6.2
16789
- imagePullPolicy: $(params.image_pull_policy)
16790
- command:
16791
- - ansible-playbook
16792
- - /masfvt/fvt-monitor.yml
16793
- env:
16794
- - name: IMAGE_PULL_POLICY
16795
- value: $(params.image_pull_policy)
16796
- - name: PIPELINERUN_NAME
16797
- value: $(params.pipelinerun_name)
16753
+ value: $(params.pipelinerun_name)
16798
16754
  - name: PIPELINERUN_NAMESPACE
16799
16755
  value: $(context.taskRun.namespace)
16800
16756
 
@@ -16876,7 +16832,7 @@ spec:
16876
16832
  optional: false
16877
16833
 
16878
16834
  - name: wait-for-pipelinerun
16879
- image: quay.io/ibmmas/cli:15.6.2
16835
+ image: quay.io/ibmmas/cli:15.7.0
16880
16836
  imagePullPolicy: $(params.image_pull_policy)
16881
16837
  # 50 retries at 5 minute intervals = 4 hours
16882
16838
  command:
@@ -16920,7 +16876,7 @@ spec:
16920
16876
 
16921
16877
  steps:
16922
16878
  - name: start-pipelinerun
16923
- image: quay.io/ibmmas/cli:15.6.2
16879
+ image: quay.io/ibmmas/cli:15.7.0
16924
16880
  imagePullPolicy: $(params.image_pull_policy)
16925
16881
  command:
16926
16882
  - ansible-playbook
@@ -17011,7 +16967,7 @@ spec:
17011
16967
  optional: false
17012
16968
 
17013
16969
  - name: wait-for-pipelinerun
17014
- image: quay.io/ibmmas/cli:15.6.2
16970
+ image: quay.io/ibmmas/cli:15.7.0
17015
16971
  imagePullPolicy: $(params.image_pull_policy)
17016
16972
  # 50 retries at 5 minute intervals = 4 hours
17017
16973
  command:
@@ -17055,7 +17011,7 @@ spec:
17055
17011
 
17056
17012
  steps:
17057
17013
  - name: start-pipelinerun
17058
- image: quay.io/ibmmas/cli:15.6.2
17014
+ image: quay.io/ibmmas/cli:15.7.0
17059
17015
  imagePullPolicy: $(params.image_pull_policy)
17060
17016
  command:
17061
17017
  - ansible-playbook
@@ -17134,7 +17090,7 @@ spec:
17134
17090
  optional: false
17135
17091
 
17136
17092
  - name: wait-for-pipelinerun
17137
- image: quay.io/ibmmas/cli:15.6.2
17093
+ image: quay.io/ibmmas/cli:15.7.0
17138
17094
  imagePullPolicy: $(params.image_pull_policy)
17139
17095
  # 50 retries at 5 minute intervals = 4 hours
17140
17096
  command:
@@ -17178,7 +17134,7 @@ spec:
17178
17134
 
17179
17135
  steps:
17180
17136
  - name: start-pipelinerun
17181
- image: quay.io/ibmmas/cli:15.6.2
17137
+ image: quay.io/ibmmas/cli:15.7.0
17182
17138
  imagePullPolicy: $(params.image_pull_policy)
17183
17139
  command:
17184
17140
  - ansible-playbook
@@ -17263,7 +17219,7 @@ spec:
17263
17219
  optional: false
17264
17220
 
17265
17221
  - name: wait-for-pipelinerun
17266
- image: quay.io/ibmmas/cli:15.6.2
17222
+ image: quay.io/ibmmas/cli:15.7.0
17267
17223
  imagePullPolicy: $(params.image_pull_policy)
17268
17224
  # 15 retries at 5 minute intervals = just over 1 hour
17269
17225
  command:
@@ -17307,7 +17263,7 @@ spec:
17307
17263
 
17308
17264
  steps:
17309
17265
  - name: start-pipelinerun
17310
- image: quay.io/ibmmas/cli:15.6.2
17266
+ image: quay.io/ibmmas/cli:15.7.0
17311
17267
  imagePullPolicy: $(params.image_pull_policy)
17312
17268
  command:
17313
17269
  - ansible-playbook
@@ -17403,7 +17359,7 @@ spec:
17403
17359
  optional: false
17404
17360
 
17405
17361
  - name: wait-for-pipelinerun
17406
- image: quay.io/ibmmas/cli:15.6.2
17362
+ image: quay.io/ibmmas/cli:15.7.0
17407
17363
  imagePullPolicy: $(params.image_pull_policy)
17408
17364
  # 10 retries at 5 minute intervals = 50 min
17409
17365
  command:
@@ -17451,7 +17407,7 @@ spec:
17451
17407
 
17452
17408
  steps:
17453
17409
  - name: start-pipelinerun
17454
- image: quay.io/ibmmas/cli:15.6.2
17410
+ image: quay.io/ibmmas/cli:15.7.0
17455
17411
  imagePullPolicy: $(params.image_pull_policy)
17456
17412
  command:
17457
17413
  - ansible-playbook
@@ -17555,7 +17511,7 @@ spec:
17555
17511
  optional: false
17556
17512
 
17557
17513
  - name: wait-for-pipelinerun
17558
- image: quay.io/ibmmas/cli:15.6.2
17514
+ image: quay.io/ibmmas/cli:15.7.0
17559
17515
  imagePullPolicy: $(params.image_pull_policy)
17560
17516
  # 10 retries at 5 minute intervals = 50 min
17561
17517
  command:
@@ -17599,7 +17555,7 @@ spec:
17599
17555
 
17600
17556
  steps:
17601
17557
  - name: start-pipelinerun
17602
- image: quay.io/ibmmas/cli:15.6.2
17558
+ image: quay.io/ibmmas/cli:15.7.0
17603
17559
  imagePullPolicy: $(params.image_pull_policy)
17604
17560
  command:
17605
17561
  - ansible-playbook
@@ -17678,7 +17634,7 @@ spec:
17678
17634
  optional: false
17679
17635
 
17680
17636
  - name: wait-for-pipelinerun
17681
- image: quay.io/ibmmas/cli:15.6.2
17637
+ image: quay.io/ibmmas/cli:15.7.0
17682
17638
  imagePullPolicy: $(params.image_pull_policy)
17683
17639
  # 50 retries at 10 minute intervals = just over 8 hours
17684
17640
  command:
@@ -17722,7 +17678,7 @@ spec:
17722
17678
 
17723
17679
  steps:
17724
17680
  - name: start-pipelinerun
17725
- image: quay.io/ibmmas/cli:15.6.2
17681
+ image: quay.io/ibmmas/cli:15.7.0
17726
17682
  imagePullPolicy: $(params.image_pull_policy)
17727
17683
  command:
17728
17684
  - ansible-playbook
@@ -17827,7 +17783,7 @@ spec:
17827
17783
  optional: false
17828
17784
 
17829
17785
  - name: wait-for-pipelinerun
17830
- image: quay.io/ibmmas/cli:15.6.2
17786
+ image: quay.io/ibmmas/cli:15.7.0
17831
17787
  imagePullPolicy: $(params.image_pull_policy)
17832
17788
  # 50 retries at 10 minute intervals = just over 8 hours
17833
17789
  command:
@@ -17852,112 +17808,6 @@ spec:
17852
17808
  - name: IGNORE_FAILURE
17853
17809
  value: "True"
17854
17810
  # --------------------------------------------------------------------------------
17855
- # /home/runner/work/cli/cli/tekton/target/tasks/minio.yaml
17856
- # --------------------------------------------------------------------------------
17857
- ---
17858
- apiVersion: tekton.dev/v1beta1
17859
- kind: Task
17860
- metadata:
17861
- name: mas-devops-minio
17862
- spec:
17863
- params:
17864
- # Common: Control the image pull policy for the CLI container image
17865
- - name: image_pull_policy
17866
- type: string
17867
- default: IfNotPresent
17868
-
17869
- # Common: Support for saving task execution results to a MongoDb instance
17870
- - name: devops_suite_name
17871
- type: string
17872
- description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
17873
- default: ""
17874
-
17875
-
17876
- # Pre-Release Support
17877
- - name: artifactory_username
17878
- default: ''
17879
- type: string
17880
- description: Required to use development MAS builds
17881
- - name: artifactory_token
17882
- default: ''
17883
- type: string
17884
- description: Required to use development MAS builds
17885
-
17886
- # Entitlement
17887
- - name: ibm_entitlement_key
17888
- type: string
17889
-
17890
- # MAS Details
17891
- - name: mas_instance_id
17892
- type: string
17893
- description: Instance ID
17894
-
17895
- # Minio credentials
17896
- - name: minio_root_user
17897
- type: string
17898
- description: root user for minio
17899
- default: ""
17900
- - name: minio_root_password
17901
- type: string
17902
-
17903
- stepTemplate:
17904
- env:
17905
- - name: DEVOPS_MONGO_URI
17906
- valueFrom:
17907
- secretKeyRef:
17908
- name: mas-devops
17909
- key: DEVOPS_MONGO_URI
17910
- optional: true
17911
- - name: DEVOPS_BUILD_NUMBER
17912
- valueFrom:
17913
- secretKeyRef:
17914
- name: mas-devops
17915
- key: DEVOPS_BUILD_NUMBER
17916
- optional: true
17917
- - name: DEVOPS_ENVIRONMENT
17918
- valueFrom:
17919
- secretKeyRef:
17920
- name: mas-devops
17921
- key: MAS_INSTANCE_ID
17922
- optional: true
17923
- - name: DEVOPS_SUITE_NAME
17924
- value: $(params.devops_suite_name)
17925
-
17926
-
17927
- # Pre-Release Support
17928
- - name: ARTIFACTORY_USERNAME
17929
- value: $(params.artifactory_username)
17930
- - name: ARTIFACTORY_TOKEN
17931
- value: $(params.artifactory_token)
17932
-
17933
- # Entitlement
17934
- - name: IBM_ENTITLEMENT_KEY
17935
- value: $(params.ibm_entitlement_key)
17936
-
17937
- # MAS Details
17938
- - name: MAS_INSTANCE_ID
17939
- value: $(params.mas_instance_id)
17940
-
17941
- - name: MINIO_NAMESPACE
17942
- value: minio
17943
-
17944
- - name: MINIO_INSTANCE_NAME
17945
- value: minio
17946
-
17947
- - name: MINIO_ROOT_USER
17948
- value: $(params.minio_root_user)
17949
-
17950
- - name: MINIO_ROOT_PASSWORD
17951
- value: $(params.minio_root_password)
17952
-
17953
- steps:
17954
- - name: minio
17955
- command:
17956
- - /opt/app-root/src/run-role.sh
17957
- - minio
17958
- image: quay.io/ibmmas/cli:15.6.2
17959
- imagePullPolicy: $(params.image_pull_policy)
17960
- # --------------------------------------------------------------------------------
17961
17811
  # /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
17962
17812
  # --------------------------------------------------------------------------------
17963
17813
  ---
@@ -18133,7 +17983,7 @@ spec:
18133
17983
  command:
18134
17984
  - /opt/app-root/src/run-role.sh
18135
17985
  - mongodb
18136
- image: quay.io/ibmmas/cli:15.6.2
17986
+ image: quay.io/ibmmas/cli:15.7.0
18137
17987
  imagePullPolicy: $(params.image_pull_policy)
18138
17988
  workingDir: /workspace/configs
18139
17989
 
@@ -18176,7 +18026,7 @@ spec:
18176
18026
  - $(params.base_output_dir)
18177
18027
  - --extra-namespaces
18178
18028
  - selenium
18179
- image: quay.io/ibmmas/cli:15.6.2
18029
+ image: quay.io/ibmmas/cli:15.7.0
18180
18030
  imagePullPolicy: $(params.image_pull_policy)
18181
18031
  env:
18182
18032
  - name: DEVOPS_MONGO_URI
@@ -18293,7 +18143,7 @@ spec:
18293
18143
  command:
18294
18144
  - /opt/app-root/src/run-role.sh
18295
18145
  - nvidia_gpu
18296
- image: quay.io/ibmmas/cli:15.6.2
18146
+ image: quay.io/ibmmas/cli:15.7.0
18297
18147
  imagePullPolicy: $(params.image_pull_policy)
18298
18148
  workingDir: /workspace/configs
18299
18149
 
@@ -18329,7 +18179,7 @@ spec:
18329
18179
  # Verify Cluster
18330
18180
  # -------------------------------------------------------------------------
18331
18181
  - name: ocp-verify-cluster
18332
- image: quay.io/ibmmas/cli:15.6.2
18182
+ image: quay.io/ibmmas/cli:15.7.0
18333
18183
  imagePullPolicy: $(params.image_pull_policy)
18334
18184
  command:
18335
18185
  - /opt/app-root/src/run-role.sh
@@ -18371,7 +18221,7 @@ spec:
18371
18221
  # Verify Catalogs
18372
18222
  # -------------------------------------------------------------------------
18373
18223
  - name: ocp-verify-catalogs
18374
- image: quay.io/ibmmas/cli:15.6.2
18224
+ image: quay.io/ibmmas/cli:15.7.0
18375
18225
  imagePullPolicy: $(params.image_pull_policy)
18376
18226
  command:
18377
18227
  - /opt/app-root/src/run-role.sh
@@ -18413,7 +18263,7 @@ spec:
18413
18263
  # Verify Subscriptions
18414
18264
  # -------------------------------------------------------------------------
18415
18265
  - name: ocp-verify-subscriptions
18416
- image: quay.io/ibmmas/cli:15.6.2
18266
+ image: quay.io/ibmmas/cli:15.7.0
18417
18267
  imagePullPolicy: $(params.image_pull_policy)
18418
18268
  command:
18419
18269
  - /opt/app-root/src/run-role.sh
@@ -18455,7 +18305,7 @@ spec:
18455
18305
  # Verify Workloads
18456
18306
  # -------------------------------------------------------------------------
18457
18307
  - name: ocp-verify-workloads
18458
- image: quay.io/ibmmas/cli:15.6.2
18308
+ image: quay.io/ibmmas/cli:15.7.0
18459
18309
  imagePullPolicy: $(params.image_pull_policy)
18460
18310
  command:
18461
18311
  - /opt/app-root/src/run-role.sh
@@ -18497,7 +18347,7 @@ spec:
18497
18347
  # Verify Catalogs - Ingress TLS
18498
18348
  # -------------------------------------------------------------------------
18499
18349
  - name: ocp-verify-ingress
18500
- image: quay.io/ibmmas/cli:15.6.2
18350
+ image: quay.io/ibmmas/cli:15.7.0
18501
18351
  imagePullPolicy: $(params.image_pull_policy)
18502
18352
  command:
18503
18353
  - /opt/app-root/src/run-role.sh
@@ -18623,7 +18473,7 @@ spec:
18623
18473
  command:
18624
18474
  - /opt/app-root/src/run-role.sh
18625
18475
  - ocp_verify
18626
- image: quay.io/ibmmas/cli:15.6.2
18476
+ image: quay.io/ibmmas/cli:15.7.0
18627
18477
  imagePullPolicy: $(params.image_pull_policy)
18628
18478
  workingDir: /workspace/configs
18629
18479
  # --------------------------------------------------------------------------------
@@ -18691,7 +18541,7 @@ spec:
18691
18541
  command:
18692
18542
  - /opt/app-root/src/run-role.sh
18693
18543
  - ocs
18694
- image: quay.io/ibmmas/cli:15.6.2
18544
+ image: quay.io/ibmmas/cli:15.7.0
18695
18545
  imagePullPolicy: $(params.image_pull_policy)
18696
18546
  workingDir: /workspace/configs
18697
18547
 
@@ -18820,7 +18670,7 @@ spec:
18820
18670
  command:
18821
18671
  - /opt/app-root/src/run-role.sh
18822
18672
  - aiservice_odh
18823
- image: quay.io/ibmmas/cli:15.6.2
18673
+ image: quay.io/ibmmas/cli:15.7.0
18824
18674
  imagePullPolicy: $(params.image_pull_policy)
18825
18675
  # --------------------------------------------------------------------------------
18826
18676
  # /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
@@ -18996,7 +18846,7 @@ spec:
18996
18846
  command:
18997
18847
  - /opt/app-root/src/run-role.sh
18998
18848
  - sls
18999
- image: quay.io/ibmmas/cli:15.6.2
18849
+ image: quay.io/ibmmas/cli:15.7.0
19000
18850
  imagePullPolicy: $(params.image_pull_policy)
19001
18851
  workingDir: /workspace/configs
19002
18852
 
@@ -19456,12 +19306,12 @@ spec:
19456
19306
  command:
19457
19307
  - /opt/app-root/src/run-role.sh
19458
19308
  - suite_app_config
19459
- image: quay.io/ibmmas/cli:15.6.2
19309
+ image: quay.io/ibmmas/cli:15.7.0
19460
19310
  imagePullPolicy: $(params.image_pull_policy)
19461
19311
 
19462
19312
  # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set STATUS=pending and wait for it to be changed to "approved"
19463
19313
  - name: app-cfg-post-verify
19464
- image: quay.io/ibmmas/cli:15.6.2
19314
+ image: quay.io/ibmmas/cli:15.7.0
19465
19315
  imagePullPolicy: $(params.image_pull_policy)
19466
19316
  command:
19467
19317
  - /opt/app-root/src/wait-for-configmap.sh
@@ -19656,7 +19506,7 @@ spec:
19656
19506
  command:
19657
19507
  - /opt/app-root/src/run-role.sh
19658
19508
  - suite_app_install
19659
- image: quay.io/ibmmas/cli:15.6.2
19509
+ image: quay.io/ibmmas/cli:15.7.0
19660
19510
  imagePullPolicy: $(params.image_pull_policy)
19661
19511
 
19662
19512
  workspaces:
@@ -19745,7 +19595,7 @@ spec:
19745
19595
  command:
19746
19596
  - /opt/app-root/src/run-role.sh
19747
19597
  - suite_app_rollback
19748
- image: quay.io/ibmmas/cli:15.6.2
19598
+ image: quay.io/ibmmas/cli:15.7.0
19749
19599
  imagePullPolicy: $(params.image_pull_policy)
19750
19600
  # --------------------------------------------------------------------------------
19751
19601
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -19808,7 +19658,7 @@ spec:
19808
19658
  command:
19809
19659
  - /opt/app-root/src/run-role.sh
19810
19660
  - suite_app_uninstall
19811
- image: quay.io/ibmmas/cli:15.6.2
19661
+ image: quay.io/ibmmas/cli:15.7.0
19812
19662
  imagePullPolicy: $(params.image_pull_policy)
19813
19663
  # --------------------------------------------------------------------------------
19814
19664
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -19883,7 +19733,7 @@ spec:
19883
19733
  command:
19884
19734
  - /opt/app-root/src/run-role.sh
19885
19735
  - suite_app_upgrade
19886
- image: quay.io/ibmmas/cli:15.6.2
19736
+ image: quay.io/ibmmas/cli:15.7.0
19887
19737
  imagePullPolicy: $(params.image_pull_policy)
19888
19738
  # --------------------------------------------------------------------------------
19889
19739
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -19984,7 +19834,7 @@ spec:
19984
19834
  command:
19985
19835
  - /opt/app-root/src/run-role.sh
19986
19836
  - suite_app_verify
19987
- image: quay.io/ibmmas/cli:15.6.2
19837
+ image: quay.io/ibmmas/cli:15.7.0
19988
19838
  imagePullPolicy: $(params.image_pull_policy)
19989
19839
  # --------------------------------------------------------------------------------
19990
19840
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -20127,7 +19977,7 @@ spec:
20127
19977
  command:
20128
19978
  - /opt/app-root/src/run-role.sh
20129
19979
  - suite_certs
20130
- image: quay.io/ibmmas/cli:15.6.2
19980
+ image: quay.io/ibmmas/cli:15.7.0
20131
19981
  imagePullPolicy: $(params.image_pull_policy)
20132
19982
 
20133
19983
  workspaces:
@@ -20194,7 +20044,7 @@ spec:
20194
20044
  command:
20195
20045
  - /opt/app-root/src/run-role.sh
20196
20046
  - suite_config
20197
- image: quay.io/ibmmas/cli:15.6.2
20047
+ image: quay.io/ibmmas/cli:15.7.0
20198
20048
  imagePullPolicy: $(params.image_pull_policy)
20199
20049
  workingDir: /workspace/configs
20200
20050
 
@@ -20526,7 +20376,7 @@ spec:
20526
20376
  command:
20527
20377
  - /opt/app-root/src/run-role.sh
20528
20378
  - suite_db2_setup_for_facilities
20529
- image: quay.io/ibmmas/cli:15.6.2
20379
+ image: quay.io/ibmmas/cli:15.7.0
20530
20380
  imagePullPolicy: $(params.image_pull_policy)
20531
20381
  workingDir: /workspace/configs
20532
20382
 
@@ -20598,7 +20448,7 @@ spec:
20598
20448
  command:
20599
20449
  - /opt/app-root/src/run-role.sh
20600
20450
  - suite_db2_setup_for_manage
20601
- image: quay.io/ibmmas/cli:15.6.2
20451
+ image: quay.io/ibmmas/cli:15.7.0
20602
20452
  imagePullPolicy: $(params.image_pull_policy)
20603
20453
  # --------------------------------------------------------------------------------
20604
20454
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -20793,7 +20643,7 @@ spec:
20793
20643
  command:
20794
20644
  - /opt/app-root/src/run-role.sh
20795
20645
  - suite_dns
20796
- image: quay.io/ibmmas/cli:15.6.2
20646
+ image: quay.io/ibmmas/cli:15.7.0
20797
20647
  imagePullPolicy: $(params.image_pull_policy)
20798
20648
  # --------------------------------------------------------------------------------
20799
20649
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -21042,7 +20892,7 @@ spec:
21042
20892
  command:
21043
20893
  - /opt/app-root/src/run-role.sh
21044
20894
  - suite_install
21045
- image: quay.io/ibmmas/cli:15.6.2
20895
+ image: quay.io/ibmmas/cli:15.7.0
21046
20896
  imagePullPolicy: $(params.image_pull_policy)
21047
20897
  workingDir: /workspace/configs
21048
20898
 
@@ -21130,7 +20980,7 @@ spec:
21130
20980
  command:
21131
20981
  - /opt/app-root/src/run-role.sh
21132
20982
  - suite_rollback
21133
- image: quay.io/ibmmas/cli:15.6.2
20983
+ image: quay.io/ibmmas/cli:15.7.0
21134
20984
  imagePullPolicy: $(params.image_pull_policy)
21135
20985
  # --------------------------------------------------------------------------------
21136
20986
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -21195,7 +21045,7 @@ spec:
21195
21045
  command:
21196
21046
  - /opt/app-root/src/run-role.sh
21197
21047
  - suite_uninstall
21198
- image: quay.io/ibmmas/cli:15.6.2
21048
+ image: quay.io/ibmmas/cli:15.7.0
21199
21049
  imagePullPolicy: $(params.image_pull_policy)
21200
21050
  # --------------------------------------------------------------------------------
21201
21051
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -21265,7 +21115,7 @@ spec:
21265
21115
  command:
21266
21116
  - /opt/app-root/src/run-role.sh
21267
21117
  - suite_upgrade
21268
- image: quay.io/ibmmas/cli:15.6.2
21118
+ image: quay.io/ibmmas/cli:15.7.0
21269
21119
  imagePullPolicy: $(params.image_pull_policy)
21270
21120
  # --------------------------------------------------------------------------------
21271
21121
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -21327,12 +21177,12 @@ spec:
21327
21177
  command:
21328
21178
  - /opt/app-root/src/run-role.sh
21329
21179
  - suite_verify
21330
- image: quay.io/ibmmas/cli:15.6.2
21180
+ image: quay.io/ibmmas/cli:15.7.0
21331
21181
  imagePullPolicy: $(params.image_pull_policy)
21332
21182
 
21333
21183
  # If configmap/approval-suite-verify exists then set STATUS=pending and wait for it to be changed to "approved"
21334
21184
  - name: suite-post-verify
21335
- image: quay.io/ibmmas/cli:15.6.2
21185
+ image: quay.io/ibmmas/cli:15.7.0
21336
21186
  imagePullPolicy: $(params.image_pull_policy)
21337
21187
  command:
21338
21188
  - /opt/app-root/src/wait-for-configmap.sh
@@ -21455,7 +21305,7 @@ spec:
21455
21305
  command:
21456
21306
  - /opt/app-root/src/run-role.sh
21457
21307
  - turbonomic
21458
- image: quay.io/ibmmas/cli:15.6.2
21308
+ image: quay.io/ibmmas/cli:15.7.0
21459
21309
  imagePullPolicy: $(params.image_pull_policy)
21460
21310
  # --------------------------------------------------------------------------------
21461
21311
  # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -21536,7 +21386,7 @@ spec:
21536
21386
  # IBM User Data Services (UDS)
21537
21387
  # -------------------------------------------------------------------------
21538
21388
  - name: uds
21539
- image: quay.io/ibmmas/cli:15.6.2
21389
+ image: quay.io/ibmmas/cli:15.7.0
21540
21390
  imagePullPolicy: $(params.image_pull_policy)
21541
21391
  workingDir: /workspace/configs
21542
21392
  command:
@@ -21599,7 +21449,7 @@ spec:
21599
21449
  # IBM Data Reporter Operator (DRO)
21600
21450
  # -------------------------------------------------------------------------
21601
21451
  - name: dro
21602
- image: quay.io/ibmmas/cli:15.6.2
21452
+ image: quay.io/ibmmas/cli:15.7.0
21603
21453
  imagePullPolicy: $(params.image_pull_policy)
21604
21454
  workingDir: /workspace/configs
21605
21455
  command:
@@ -21685,7 +21535,7 @@ spec:
21685
21535
  description: "The value to set"
21686
21536
  steps:
21687
21537
  - name: update-configmap
21688
- image: quay.io/ibmmas/cli:15.6.2
21538
+ image: quay.io/ibmmas/cli:15.7.0
21689
21539
  command:
21690
21540
  - /opt/app-root/src/update-configmap.sh
21691
21541
  env:
@@ -21732,7 +21582,7 @@ spec:
21732
21582
 
21733
21583
  steps:
21734
21584
  - name: wait-for-configmap
21735
- image: quay.io/ibmmas/cli:15.6.2
21585
+ image: quay.io/ibmmas/cli:15.7.0
21736
21586
  command:
21737
21587
  - /opt/app-root/src/wait-for-configmap.sh
21738
21588
  env:
@@ -21813,7 +21663,7 @@ spec:
21813
21663
 
21814
21664
  steps:
21815
21665
  - name: wait-for-configmap
21816
- image: quay.io/ibmmas/cli:15.6.2
21666
+ image: quay.io/ibmmas/cli:15.7.0
21817
21667
  command:
21818
21668
  - /opt/app-root/src/wait-for-configmap.sh
21819
21669
  env:
@@ -21873,7 +21723,7 @@ spec:
21873
21723
 
21874
21724
  steps:
21875
21725
  - name: wait
21876
- image: quay.io/ibmmas/cli:15.6.2
21726
+ image: quay.io/ibmmas/cli:15.7.0
21877
21727
  command:
21878
21728
  - /opt/app-root/src/wait-for-tekton.sh
21879
21729
  env:
@@ -21918,7 +21768,7 @@ spec:
21918
21768
  - name: launchfvt_aiservice
21919
21769
  type: string
21920
21770
  default: "false"
21921
- description: "Set this to 'true' to enable launch of the AIBroker FVT pipeline after the ai service has been installed"
21771
+ description: "Set this to 'true' to enable launch of the AIService FVT pipeline after the ai service has been installed"
21922
21772
 
21923
21773
  # Finalize
21924
21774
  # -------------------------------------------------------------------------
@@ -22756,6 +22606,14 @@ spec:
22756
22606
  type: string
22757
22607
  description: WatsonX project ID for IBM Maximo AI Service
22758
22608
  default: ""
22609
+ - name: aiservice_watsonxai_deployment_id
22610
+ type: string
22611
+ description: WatsonX deployment ID for IBM Maximo AI Service
22612
+ default: ""
22613
+ - name: aiservice_watsonxai_space_id
22614
+ type: string
22615
+ description: WatsonX space ID for IBM Maximo AI Service
22616
+ default: ""
22759
22617
  - name: aiservice_watsonx_action
22760
22618
  type: string
22761
22619
  description: watsonx action for IBM Maximo AI Service
@@ -23288,6 +23146,10 @@ spec:
23288
23146
  value: $(params.aiservice_watsonxai_url)
23289
23147
  - name: aiservice_watsonxai_project_id
23290
23148
  value: $(params.aiservice_watsonxai_project_id)
23149
+ - name: aiservice_watsonxai_deployment_id
23150
+ value: $(params.aiservice_watsonxai_deployment_id)
23151
+ - name: aiservice_watsonxai_space_id
23152
+ value: $(params.aiservice_watsonxai_space_id)
23291
23153
  - name: aiservice_watsonx_action
23292
23154
  value: $(params.aiservice_watsonx_action)
23293
23155
 
@@ -23351,6 +23213,10 @@ spec:
23351
23213
  value: $(params.aiservice_watsonxai_url)
23352
23214
  - name: aiservice_watsonxai_project_id
23353
23215
  value: $(params.aiservice_watsonxai_project_id)
23216
+ - name: aiservice_watsonxai_deployment_id
23217
+ value: $(params.aiservice_watsonxai_deployment_id)
23218
+ - name: aiservice_watsonxai_space_id
23219
+ value: $(params.aiservice_watsonxai_space_id)
23354
23220
  - name: aiservice_watsonx_action
23355
23221
  value: $(params.aiservice_watsonx_action)
23356
23222
 
@@ -24863,19 +24729,21 @@ spec:
24863
24729
  - name: shared-entitlement
24864
24730
  workspace: shared-entitlement
24865
24731
  # --------------------------------------------------------------------------------
24866
- # /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-aibroker-tenant.yaml
24732
+ # /home/runner/work/cli/cli/tekton/target/pipelines/gitops-aiservice-pipeline.yaml
24867
24733
  # --------------------------------------------------------------------------------
24868
24734
  apiVersion: tekton.dev/v1beta1
24869
24735
  kind: Pipeline
24870
24736
  metadata:
24871
- name: gitops-mas-aibroker-tenant
24737
+ name: gitops-aiservice-pipeline
24872
24738
  spec:
24873
24739
  params:
24874
24740
  - name: cluster_name
24875
24741
  type: string
24742
+ - name: cluster_id
24743
+ type: string
24876
24744
  - name: account
24877
24745
  type: string
24878
- - name: cluster_id
24746
+ - name: aiservice_instance_id
24879
24747
  type: string
24880
24748
  - name: cluster_url
24881
24749
  type: string
@@ -24891,67 +24759,89 @@ spec:
24891
24759
  type: string
24892
24760
  - name: github_host
24893
24761
  type: string
24894
- - name: aibroker_namespace
24762
+
24763
+ # aiservice-specific
24764
+ - name: aiservice_namespace
24765
+ type: string
24766
+ - name: aiservice_watsonx_secret
24895
24767
  type: string
24896
- - name: mas_aibroker_provision_tenant
24768
+ - name: pull_secret_name
24897
24769
  type: string
24898
- - name: aibroker_instance_id
24770
+ - name: aiservice_storage_provider
24899
24771
  type: string
24900
- - name: tenantNamespace
24772
+ - name: aiservice_storage_ssl
24901
24773
  type: string
24902
- - name: tenant_id
24774
+ - name: primary_storage_class
24903
24775
  type: string
24904
- - name: mas_aibroker_tenant_name
24776
+ - name: artifactory_username
24905
24777
  type: string
24906
- - name: cluster_domain
24778
+ - name: aiservice_channel
24907
24779
  type: string
24908
- - name: in_saas_env
24780
+ - name: mas_catalog_source
24909
24781
  type: string
24910
24782
  - name: mas_icr_cp
24911
24783
  type: string
24912
24784
  - name: mas_icr_cpopen
24913
24785
  type: string
24914
- - name: drocfg_url
24786
+ - name: cluster_domain
24915
24787
  type: string
24916
- - name: slscfg_url
24788
+ - name: in_saas_env
24917
24789
  type: string
24918
- - name: mas_aibroker_sls_subscription_id
24790
+ - name: is_external_route
24919
24791
  type: string
24920
- - name: mas_aibroker_watsonxai_url
24792
+ - name: jdbc_secret
24921
24793
  type: string
24922
- - name: mas_aibroker_watsonxai_project_id
24794
+ - name: use_aws_db2
24923
24795
  type: string
24924
- - name: mas_aibroker_storage_port
24796
+
24797
+ # ODH-specific
24798
+ - name: odh_channel
24925
24799
  type: string
24926
- - name: mas_aibroker_storage_region
24800
+ - name: odh_subscription_install_plan
24927
24801
  type: string
24928
- - name: mas_aibroker_storage_provider
24802
+ - name: opendatahub_name
24929
24803
  type: string
24930
- - name: mas_aibroker_storage_pipelines_bucket
24804
+ - name: opendatahub_operator_group
24931
24805
  type: string
24932
- - name: mas_aibroker_storage_ssl
24806
+ - name: opendatahub_namespace
24933
24807
  type: string
24934
- - name: mas_aibroker_s3_endpoint_url
24808
+ - name: odh_operator_version
24935
24809
  type: string
24936
- - name: mas_aibroker_s3_region
24810
+ - name: environment_type
24937
24811
  type: string
24938
- - name: mas_aibroker_s3_bucket_prefix
24812
+ - name: aiservice_s3_endpoint_url
24939
24813
  type: string
24940
- - name: rsl_url
24814
+ - name: aiservice_storage_region
24941
24815
  type: string
24942
- - name: tenant_entitlement_type
24816
+ - name: aiservice_s3_bucket_prefix
24943
24817
  type: string
24944
- - name: tenant_entitlement_start_date
24818
+ - name: opendatahub_source
24945
24819
  type: string
24946
- - name: tenant_entitlement_end_date
24820
+ - name: aiservice_odh_model_deployment_type
24821
+ type: string
24822
+ - name: sls_registration_key_secret
24823
+ type: string
24824
+ - name: dro_token_secret
24825
+ type: string
24826
+ - name: dro_cacert_secret
24827
+ type: string
24828
+ - name: aiservice_s3_templates_bucket
24829
+ type: string
24830
+ - name: aiservice_s3_tenants_bucket
24831
+ type: string
24832
+ - name: aiservice_s3_secret
24947
24833
  type: string
24948
24834
 
24949
24835
  workspaces:
24950
24836
  - name: configs
24837
+
24951
24838
  tasks:
24952
- - name: run-gitops-aibroker-tenant
24839
+
24840
+ # 2.gitops-odh
24841
+ # -------------------------------------------------------------------------
24842
+ - name: gitops-odh
24953
24843
  taskRef:
24954
- name: gitops-aibroker-tenant
24844
+ name: gitops-odh
24955
24845
  workspaces:
24956
24846
  - name: configs
24957
24847
  workspace: configs
@@ -24960,8 +24850,62 @@ spec:
24960
24850
  value: $(params.cluster_name)
24961
24851
  - name: account
24962
24852
  value: $(params.account)
24963
- - name: cluster_id
24964
- value: $(params.cluster_id)
24853
+ - name: aiservice_instance_id
24854
+ value: $(params.aiservice_instance_id)
24855
+ - name: cluster_url
24856
+ value: $(params.cluster_url)
24857
+ - name: git_branch
24858
+ value: $(params.git_branch)
24859
+ - name: github_org
24860
+ value: $(params.github_org)
24861
+ - name: github_repo
24862
+ value: $(params.github_repo)
24863
+ - name: github_host
24864
+ value: $(params.github_host)
24865
+ - name: secrets_path
24866
+ value: $(params.secrets_path)
24867
+ - name: avp_aws_secret_region
24868
+ value: $(params.avp_aws_secret_region)
24869
+ - name: aiservice_namespace
24870
+ value: $(params.aiservice_namespace)
24871
+ - name: odh_channel
24872
+ value: $(params.odh_channel)
24873
+ - name: odh_subscription_install_plan
24874
+ value: $(params.odh_subscription_install_plan)
24875
+ - name: opendatahub_name
24876
+ value: $(params.opendatahub_name)
24877
+ - name: opendatahub_operator_group
24878
+ value: $(params.opendatahub_operator_group)
24879
+ - name: opendatahub_namespace
24880
+ value: $(params.opendatahub_namespace)
24881
+ - name: odh_operator_version
24882
+ value: $(params.odh_operator_version)
24883
+ - name: aiservice_storage_ssl
24884
+ value: $(params.aiservice_storage_ssl)
24885
+ - name: aiservice_storage_region
24886
+ value: $(params.aiservice_storage_region)
24887
+ - name: opendatahub_source
24888
+ value: $(params.opendatahub_source)
24889
+ - name: aiservice_odh_model_deployment_type
24890
+ value: $(params.aiservice_odh_model_deployment_type)
24891
+
24892
+ # 3.gitops-aiservice
24893
+ # -------------------------------------------------------------------------
24894
+
24895
+ - name: gitops-aiservice
24896
+ taskRef:
24897
+ name: gitops-aiservice
24898
+ runAfter:
24899
+ - gitops-odh
24900
+ workspaces:
24901
+ - name: configs
24902
+ workspace: configs
24903
+ params:
24904
+ # aiservice shared and specific params
24905
+ - name: cluster_name
24906
+ value: $(params.cluster_name)
24907
+ - name: account
24908
+ value: $(params.account)
24965
24909
  - name: cluster_url
24966
24910
  value: $(params.cluster_url)
24967
24911
  - name: secrets_path
@@ -24976,80 +24920,76 @@ spec:
24976
24920
  value: $(params.github_repo)
24977
24921
  - name: github_host
24978
24922
  value: $(params.github_host)
24979
- - name: aibroker_namespace
24980
- value: $(params.aibroker_namespace)
24981
- - name: mas_aibroker_provision_tenant
24982
- value: $(params.mas_aibroker_provision_tenant)
24983
- - name: aibroker_instance_id
24984
- value: $(params.aibroker_instance_id)
24985
- - name: tenantNamespace
24986
- value: $(params.tenantNamespace)
24987
- - name: tenant_id
24988
- value: $(params.tenant_id)
24989
- - name: mas_aibroker_tenant_name
24990
- value: $(params.mas_aibroker_tenant_name)
24991
- - name: cluster_domain
24992
- value: $(params.cluster_domain)
24993
- - name: in_saas_env
24994
- value: $(params.in_saas_env)
24923
+ - name: aiservice_instance_id
24924
+ value: $(params.aiservice_instance_id)
24925
+ - name: aiservice_namespace
24926
+ value: $(params.aiservice_namespace)
24927
+ - name: aiservice_watsonx_secret
24928
+ value: $(params.aiservice_watsonx_secret)
24929
+ - name: pull_secret_name
24930
+ value: $(params.pull_secret_name)
24931
+ - name: aiservice_storage_provider
24932
+ value: $(params.aiservice_storage_provider)
24933
+ - name: aiservice_storage_ssl
24934
+ value: $(params.aiservice_storage_ssl)
24935
+ - name: aiservice_storage_region
24936
+ value: $(params.aiservice_storage_region)
24937
+ - name: primary_storage_class
24938
+ value: $(params.primary_storage_class)
24939
+ - name: artifactory_username
24940
+ value: $(params.artifactory_username)
24941
+ - name: aiservice_channel
24942
+ value: $(params.aiservice_channel)
24943
+ - name: mas_catalog_source
24944
+ value: $(params.mas_catalog_source)
24995
24945
  - name: mas_icr_cp
24996
24946
  value: $(params.mas_icr_cp)
24997
24947
  - name: mas_icr_cpopen
24998
24948
  value: $(params.mas_icr_cpopen)
24999
- - name: drocfg_url
25000
- value: $(params.drocfg_url)
25001
- - name: slscfg_url
25002
- value: $(params.slscfg_url)
25003
- - name: mas_aibroker_sls_subscription_id
25004
- value: $(params.mas_aibroker_sls_subscription_id)
25005
- - name: mas_aibroker_watsonxai_url
25006
- value: $(params.mas_aibroker_watsonxai_url)
25007
- - name: mas_aibroker_watsonxai_project_id
25008
- value: $(params.mas_aibroker_watsonxai_project_id)
25009
- - name: mas_aibroker_storage_port
25010
- value: $(params.mas_aibroker_storage_port)
25011
- - name: mas_aibroker_storage_region
25012
- value: $(params.mas_aibroker_storage_region)
25013
- - name: mas_aibroker_storage_provider
25014
- value: $(params.mas_aibroker_storage_provider)
25015
- - name: mas_aibroker_storage_pipelines_bucket
25016
- value: $(params.mas_aibroker_storage_pipelines_bucket)
25017
- - name: mas_aibroker_storage_ssl
25018
- value: $(params.mas_aibroker_storage_ssl)
25019
- - name: mas_aibroker_s3_endpoint_url
25020
- value: $(params.mas_aibroker_s3_endpoint_url)
25021
- - name: mas_aibroker_s3_region
25022
- value: $(params.mas_aibroker_s3_region)
25023
- - name: mas_aibroker_s3_bucket_prefix
25024
- value: $(params.mas_aibroker_s3_bucket_prefix)
25025
- - name: rsl_url
25026
- value: $(params.rsl_url)
25027
- - name: tenant_entitlement_type
25028
- value: $(params.tenant_entitlement_type)
25029
- - name: tenant_entitlement_start_date
25030
- value: $(params.tenant_entitlement_start_date)
25031
- - name: tenant_entitlement_end_date
25032
- value: $(params.tenant_entitlement_end_date)
25033
- # --------------------------------------------------------------------------------
25034
- # /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-aibroker.yaml
24949
+ - name: cluster_domain
24950
+ value: $(params.cluster_domain)
24951
+ - name: in_saas_env
24952
+ value: $(params.in_saas_env)
24953
+ - name: is_external_route
24954
+ value: $(params.is_external_route)
24955
+ - name: environment_type
24956
+ value: $(params.environment_type)
24957
+ - name: aiservice_s3_endpoint_url
24958
+ value: $(params.aiservice_s3_endpoint_url)
24959
+ - name: aiservice_s3_bucket_prefix
24960
+ value: $(params.aiservice_s3_bucket_prefix)
24961
+ - name: sls_registration_key_secret
24962
+ value: $(params.sls_registration_key_secret)
24963
+ - name: dro_token_secret
24964
+ value: $(params.dro_token_secret)
24965
+ - name: dro_cacert_secret
24966
+ value: $(params.dro_cacert_secret)
24967
+ - name: aiservice_s3_templates_bucket
24968
+ value: $(params.aiservice_s3_templates_bucket)
24969
+ - name: aiservice_s3_tenants_bucket
24970
+ value: $(params.aiservice_s3_tenants_bucket)
24971
+ - name: aiservice_s3_secret
24972
+ value: $(params.aiservice_s3_secret)
24973
+ - name: jdbc_secret
24974
+ value: $(params.jdbc_secret)
24975
+ - name: use_aws_db2
24976
+ value: $(params.use_aws_db2)# --------------------------------------------------------------------------------
24977
+ # /home/runner/work/cli/cli/tekton/target/pipelines/gitops-aiservice-tenant-pipeline.yaml
25035
24978
  # --------------------------------------------------------------------------------
25036
24979
  apiVersion: tekton.dev/v1beta1
25037
24980
  kind: Pipeline
25038
24981
  metadata:
25039
- name: gitops-mas-aibroker
24982
+ name: gitops-aiservice-tenant-pipeline
25040
24983
  spec:
25041
24984
  params:
25042
24985
  - name: cluster_name
25043
24986
  type: string
25044
- - name: cluster_id
25045
- type: string
25046
24987
  - name: account
25047
24988
  type: string
25048
- - name: aibroker_instance_id
24989
+ - name: cluster_id
25049
24990
  type: string
25050
24991
  - name: cluster_url
25051
24992
  type: string
25052
- default: ""
25053
24993
  - name: secrets_path
25054
24994
  type: string
25055
24995
  - name: avp_aws_secret_region
@@ -25062,111 +25002,188 @@ spec:
25062
25002
  type: string
25063
25003
  - name: github_host
25064
25004
  type: string
25065
-
25066
- # AIBROKER-specific
25067
- - name: aibroker_namespace
25068
- type: string
25069
- - name: mas_aibroker_watsonx_secret
25070
- type: string
25071
- - name: pull_secret_name
25005
+ - name: aiservice_namespace
25072
25006
  type: string
25073
- - name: mas_aibroker_storage_provider
25007
+ - name: aiservice_provision_tenant
25074
25008
  type: string
25075
- - name: mas_aibroker_storage_secret
25076
- type: string
25077
- - name: mas_aibroker_storage_host
25009
+ - name: aiservice_instance_id
25078
25010
  type: string
25079
- - name: mas_aibroker_storage_port
25011
+ - name: tenantNamespace
25080
25012
  type: string
25081
- - name: mas_aibroker_storage_ssl
25013
+ - name: tenant_id
25082
25014
  type: string
25083
- - name: mas_aibroker_storage_region
25015
+ - name: cluster_domain
25084
25016
  type: string
25085
- - name: mas_aibroker_storage_pipelines_bucket
25017
+ - name: in_saas_env
25086
25018
  type: string
25087
- - name: mas_aibroker_storage_tenants_bucket
25019
+ - name: mas_icr_cp
25088
25020
  type: string
25089
- - name: mas_aibroker_storage_templates_bucket
25021
+ - name: mas_icr_cpopen
25090
25022
  type: string
25091
- - name: mas_aibroker_mariadb_secret
25023
+ - name: drocfg_url
25092
25024
  type: string
25093
- - name: primary_storage_class
25025
+ - name: slscfg_url
25094
25026
  type: string
25095
- - name: artifactory_username
25027
+ - name: aiservice_sls_subscription_id
25096
25028
  type: string
25097
- - name: mas_app_channel
25029
+ - name: aiservice_watsonxai_url
25098
25030
  type: string
25099
- - name: mas_catalog_source
25031
+ - name: aiservice_watsonx_full
25100
25032
  type: string
25101
- - name: mas_icr_cp
25033
+ - name: aiservice_watsonx_instance_id
25102
25034
  type: string
25103
- - name: mas_icr_cpopen
25035
+ - name: aiservice_watsonx_version
25104
25036
  type: string
25105
- - name: cluster_domain
25037
+ - name: aiservice_watsonx_username
25106
25038
  type: string
25107
- - name: in_saas_env
25108
- type: string
25109
- - name: is_external_route
25039
+ - name: aiservice_operator_log_level
25110
25040
  type: string
25111
25041
 
25112
- # ODH-specific
25113
- - name: odh_channel
25114
- type: string
25115
- - name: odh_subscription_install_plan
25042
+ - name: aiservice_storage_region
25116
25043
  type: string
25117
- - name: opendatahub_name
25044
+ - name: aiservice_storage_provider
25118
25045
  type: string
25119
- - name: opendatahub_operator_group
25046
+ - name: aiservice_storage_ssl
25120
25047
  type: string
25121
- - name: opendatahub_namespace
25048
+ - name: aiservice_s3_endpoint_url
25122
25049
  type: string
25123
- - name: odh_operator_version
25050
+ - name: aiservice_s3_bucket_prefix
25124
25051
  type: string
25125
-
25126
- # KMODEL-specific
25127
- - name: aibroker_internal_tls
25052
+ - name: rsl_url
25128
25053
  type: string
25129
- - name: docker_server
25054
+ - name: tenant_entitlement_type
25130
25055
  type: string
25131
- - name: image_controller
25056
+ - name: tenant_entitlement_start_date
25132
25057
  type: string
25133
- - name: image_store
25058
+ - name: tenant_entitlement_end_date
25134
25059
  type: string
25135
- - name: image_watcher
25060
+
25061
+ workspaces:
25062
+ - name: configs
25063
+ tasks:
25064
+ - name: run-gitops-aiservice-tenant
25065
+ taskRef:
25066
+ name: gitops-aiservice-tenant
25067
+ workspaces:
25068
+ - name: configs
25069
+ workspace: configs
25070
+ params:
25071
+ - name: cluster_name
25072
+ value: $(params.cluster_name)
25073
+ - name: account
25074
+ value: $(params.account)
25075
+ - name: cluster_id
25076
+ value: $(params.cluster_id)
25077
+ - name: cluster_url
25078
+ value: $(params.cluster_url)
25079
+ - name: secrets_path
25080
+ value: $(params.secrets_path)
25081
+ - name: avp_aws_secret_region
25082
+ value: $(params.avp_aws_secret_region)
25083
+ - name: git_branch
25084
+ value: $(params.git_branch)
25085
+ - name: github_org
25086
+ value: $(params.github_org)
25087
+ - name: github_repo
25088
+ value: $(params.github_repo)
25089
+ - name: github_host
25090
+ value: $(params.github_host)
25091
+ - name: aiservice_namespace
25092
+ value: $(params.aiservice_namespace)
25093
+ - name: aiservice_provision_tenant
25094
+ value: $(params.aiservice_provision_tenant)
25095
+ - name: aiservice_instance_id
25096
+ value: $(params.aiservice_instance_id)
25097
+ - name: tenantNamespace
25098
+ value: $(params.tenantNamespace)
25099
+ - name: tenant_id
25100
+ value: $(params.tenant_id)
25101
+ - name: cluster_domain
25102
+ value: $(params.cluster_domain)
25103
+ - name: in_saas_env
25104
+ value: $(params.in_saas_env)
25105
+ - name: mas_icr_cp
25106
+ value: $(params.mas_icr_cp)
25107
+ - name: mas_icr_cpopen
25108
+ value: $(params.mas_icr_cpopen)
25109
+ - name: drocfg_url
25110
+ value: $(params.drocfg_url)
25111
+ - name: slscfg_url
25112
+ value: $(params.slscfg_url)
25113
+ - name: aiservice_sls_subscription_id
25114
+ value: $(params.aiservice_sls_subscription_id)
25115
+ - name: aiservice_watsonxai_url
25116
+ value: $(params.aiservice_watsonxai_url)
25117
+ - name: aiservice_watsonx_full
25118
+ value: $(params.aiservice_watsonx_full)
25119
+ - name: aiservice_watsonx_instance_id
25120
+ value: $(params.aiservice_watsonx_instance_id)
25121
+ - name: aiservice_watsonx_version
25122
+ value: $(params.aiservice_watsonx_version)
25123
+ - name: aiservice_watsonx_username
25124
+ value: $(params.aiservice_watsonx_username)
25125
+ - name: aiservice_operator_log_level
25126
+ value: $(params.aiservice_operator_log_level)
25127
+ - name: aiservice_storage_region
25128
+ value: $(params.aiservice_storage_region)
25129
+ - name: aiservice_storage_provider
25130
+ value: $(params.aiservice_storage_provider)
25131
+ - name: aiservice_storage_ssl
25132
+ value: $(params.aiservice_storage_ssl)
25133
+ - name: aiservice_s3_endpoint_url
25134
+ value: $(params.aiservice_s3_endpoint_url)
25135
+ - name: aiservice_s3_bucket_prefix
25136
+ value: $(params.aiservice_s3_bucket_prefix)
25137
+ - name: rsl_url
25138
+ value: $(params.rsl_url)
25139
+ - name: tenant_entitlement_type
25140
+ value: $(params.tenant_entitlement_type)
25141
+ - name: tenant_entitlement_start_date
25142
+ value: $(params.tenant_entitlement_start_date)
25143
+ - name: tenant_entitlement_end_date
25144
+ value: $(params.tenant_entitlement_end_date)
25145
+ # --------------------------------------------------------------------------------
25146
+ # /home/runner/work/cli/cli/tekton/target/pipelines/gitops-deprovision-aiservice-pipeline.yaml
25147
+ # --------------------------------------------------------------------------------
25148
+ apiVersion: tekton.dev/v1beta1
25149
+ kind: Pipeline
25150
+ metadata:
25151
+ name: gitops-deprovision-aiservice-pipeline
25152
+ spec:
25153
+ params:
25154
+ - name: cluster_name
25136
25155
  type: string
25137
- - name: mas_aibroker_connector_tag
25156
+ - name: cluster_id
25138
25157
  type: string
25139
- - name: mas_aibroker_provision_tenant
25158
+ - name: account
25140
25159
  type: string
25141
- - name: mas_aibroker_saas
25160
+ - name: aiservice_instance_id
25142
25161
  type: string
25143
- - name: model_id_prefix
25162
+ - name: cluster_url
25144
25163
  type: string
25145
- - name: model_id_unique_length
25164
+ default: ""
25165
+ - name: secrets_path
25146
25166
  type: string
25147
- - name: ssh_secret_name
25167
+ - name: avp_aws_secret_region
25148
25168
  type: string
25149
- - name: tenantNamespace
25150
- type: string
25151
- - name: environment_type
25169
+ - name: git_branch
25152
25170
  type: string
25153
- - name: mas_aibroker_s3_endpoint_url
25171
+ - name: github_org
25154
25172
  type: string
25155
- - name: mas_aibroker_s3_region
25173
+ - name: github_repo
25156
25174
  type: string
25157
- - name: mas_aibroker_s3_bucket_prefix
25175
+ - name: github_host
25158
25176
  type: string
25159
-
25160
25177
  workspaces:
25161
25178
  - name: configs
25162
25179
 
25163
25180
  tasks:
25164
-
25165
- # 2.gitops-odh
25166
- # -------------------------------------------------------------------------
25167
- - name: gitops-odh
25181
+ #1. gitops-deprovision-aiservice
25182
+ # -------------------------------------------------------------------------------------------------------
25183
+ - name: run-gitops-deprovision-aiservice
25168
25184
  taskRef:
25169
- name: gitops-odh
25185
+ kind: Task
25186
+ name: gitops-deprovision-aiservice
25170
25187
  workspaces:
25171
25188
  - name: configs
25172
25189
  workspace: configs
@@ -25175,10 +25192,14 @@ spec:
25175
25192
  value: $(params.cluster_name)
25176
25193
  - name: account
25177
25194
  value: $(params.account)
25178
- - name: aibroker_instance_id
25179
- value: $(params.aibroker_instance_id)
25195
+ - name: cluster_id
25196
+ value: $(params.cluster_id)
25180
25197
  - name: cluster_url
25181
25198
  value: $(params.cluster_url)
25199
+ - name: secrets_path
25200
+ value: $(params.secrets_path)
25201
+ - name: avp_aws_secret_region
25202
+ value: $(params.avp_aws_secret_region)
25182
25203
  - name: git_branch
25183
25204
  value: $(params.git_branch)
25184
25205
  - name: github_org
@@ -25187,44 +25208,27 @@ spec:
25187
25208
  value: $(params.github_repo)
25188
25209
  - name: github_host
25189
25210
  value: $(params.github_host)
25190
- - name: secrets_path
25191
- value: $(params.secrets_path)
25192
- - name: avp_aws_secret_region
25193
- value: $(params.avp_aws_secret_region)
25194
- - name: odh_channel
25195
- value: $(params.odh_channel)
25196
- - name: odh_subscription_install_plan
25197
- value: $(params.odh_subscription_install_plan)
25198
- - name: opendatahub_name
25199
- value: $(params.opendatahub_name)
25200
- - name: opendatahub_operator_group
25201
- value: $(params.opendatahub_operator_group)
25202
- - name: opendatahub_namespace
25203
- value: $(params.opendatahub_namespace)
25204
- - name: odh_operator_version
25205
- value: $(params.odh_operator_version)
25206
- - name: mas_aibroker_storage_ssl
25207
- value: $(params.mas_aibroker_storage_ssl)
25208
- - name: mas_aibroker_storage_region
25209
- value: $(params.mas_aibroker_storage_region)
25210
-
25211
- # 3.gitops-Aibroker
25212
- # -------------------------------------------------------------------------
25211
+ - name: aiservice_instance_id
25212
+ value: $(params.aiservice_instance_id)
25213
25213
 
25214
- - name: gitops-aibroker
25215
- taskRef:
25216
- name: gitops-aibroker
25214
+ #2.gitops-deprovision-odh
25215
+ # -------------------------------------------------------------------------
25216
+ - name: run-gitops-deprovision-odh
25217
25217
  runAfter:
25218
- - gitops-odh
25218
+ - run-gitops-deprovision-aiservice
25219
+ taskRef:
25220
+ kind: Task
25221
+ name: gitops-deprovision-odh
25219
25222
  workspaces:
25220
25223
  - name: configs
25221
25224
  workspace: configs
25222
25225
  params:
25223
- # AIBROKER shared and specific params
25224
25226
  - name: cluster_name
25225
25227
  value: $(params.cluster_name)
25226
25228
  - name: account
25227
25229
  value: $(params.account)
25230
+ - name: cluster_id
25231
+ value: $(params.cluster_id)
25228
25232
  - name: cluster_url
25229
25233
  value: $(params.cluster_url)
25230
25234
  - name: secrets_path
@@ -25239,69 +25243,50 @@ spec:
25239
25243
  value: $(params.github_repo)
25240
25244
  - name: github_host
25241
25245
  value: $(params.github_host)
25242
- - name: aibroker_instance_id
25243
- value: $(params.aibroker_instance_id)
25244
- - name: aibroker_namespace
25245
- value: $(params.aibroker_namespace)
25246
- - name: mas_aibroker_watsonx_secret
25247
- value: $(params.mas_aibroker_watsonx_secret)
25248
- - name: pull_secret_name
25249
- value: $(params.pull_secret_name)
25250
- - name: mas_aibroker_storage_provider
25251
- value: $(params.mas_aibroker_storage_provider)
25252
- - name: mas_aibroker_storage_secret
25253
- value: $(params.mas_aibroker_storage_secret)
25254
- - name: mas_aibroker_storage_host
25255
- value: $(params.mas_aibroker_storage_host)
25256
- - name: mas_aibroker_storage_port
25257
- value: $(params.mas_aibroker_storage_port)
25258
- - name: mas_aibroker_storage_ssl
25259
- value: $(params.mas_aibroker_storage_ssl)
25260
- - name: mas_aibroker_storage_region
25261
- value: $(params.mas_aibroker_storage_region)
25262
- - name: mas_aibroker_storage_pipelines_bucket
25263
- value: $(params.mas_aibroker_storage_pipelines_bucket)
25264
- - name: mas_aibroker_storage_tenants_bucket
25265
- value: $(params.mas_aibroker_storage_tenants_bucket)
25266
- - name: mas_aibroker_storage_templates_bucket
25267
- value: $(params.mas_aibroker_storage_templates_bucket)
25268
- - name: mas_aibroker_mariadb_secret
25269
- value: $(params.mas_aibroker_mariadb_secret)
25270
- - name: primary_storage_class
25271
- value: $(params.primary_storage_class)
25272
- - name: artifactory_username
25273
- value: $(params.artifactory_username)
25274
- - name: mas_app_channel
25275
- value: $(params.mas_app_channel)
25276
- - name: mas_catalog_source
25277
- value: $(params.mas_catalog_source)
25278
- - name: mas_icr_cp
25279
- value: $(params.mas_icr_cp)
25280
- - name: mas_icr_cpopen
25281
- value: $(params.mas_icr_cpopen)
25282
- - name: cluster_domain
25283
- value: $(params.cluster_domain)
25284
- - name: in_saas_env
25285
- value: $(params.in_saas_env)
25286
- - name: is_external_route
25287
- value: $(params.is_external_route)
25288
- - name: environment_type
25289
- value: $(params.environment_type)
25290
- - name: mas_aibroker_s3_endpoint_url
25291
- value: $(params.mas_aibroker_s3_endpoint_url)
25292
- - name: mas_aibroker_s3_region
25293
- value: $(params.mas_aibroker_s3_region)
25294
- - name: mas_aibroker_s3_bucket_prefix
25295
- value: $(params.mas_aibroker_s3_bucket_prefix)
25296
-
25246
+ - name: aiservice_instance_id
25247
+ value: $(params.aiservice_instance_id)
25297
25248
 
25298
- # 4.gitops-Kmodel
25299
- # -------------------------------------------------------------------------
25300
- - name: gitops-kmodel
25249
+ # --------------------------------------------------------------------------------
25250
+ # /home/runner/work/cli/cli/tekton/target/pipelines/gitops-deprovision-aiservice-tenant-pipeline.yaml
25251
+ # --------------------------------------------------------------------------------
25252
+ apiVersion: tekton.dev/v1beta1
25253
+ kind: Pipeline
25254
+ metadata:
25255
+ name: gitops-deprovision-aiservice-tenant-pipeline
25256
+ spec:
25257
+ params:
25258
+ - name: cluster_name
25259
+ type: string
25260
+ - name: cluster_id
25261
+ type: string
25262
+ - name: account
25263
+ type: string
25264
+ - name: aiservice_instance_id
25265
+ type: string
25266
+ - name: tenant_id
25267
+ type: string
25268
+ - name: cluster_url
25269
+ type: string
25270
+ default: ""
25271
+ - name: secrets_path
25272
+ type: string
25273
+ - name: avp_aws_secret_region
25274
+ type: string
25275
+ - name: git_branch
25276
+ type: string
25277
+ - name: github_org
25278
+ type: string
25279
+ - name: github_repo
25280
+ type: string
25281
+ - name: github_host
25282
+ type: string
25283
+ workspaces:
25284
+ - name: configs
25285
+ tasks:
25286
+ - name: run-gitops-deprovision-aiservice-tenant
25301
25287
  taskRef:
25302
- name: gitops-kmodel
25303
- runAfter:
25304
- - gitops-aibroker
25288
+ kind: Task
25289
+ name: gitops-deprovision-aiservice-tenant
25305
25290
  workspaces:
25306
25291
  - name: configs
25307
25292
  workspace: configs
@@ -25326,58 +25311,14 @@ spec:
25326
25311
  value: $(params.github_repo)
25327
25312
  - name: github_host
25328
25313
  value: $(params.github_host)
25329
- - name: aibroker_instance_id
25330
- value: $(params.aibroker_instance_id)
25331
- - name: aibroker_internal_tls
25332
- value: $(params.aibroker_internal_tls)
25333
- - name: aibroker_namespace
25334
- value: $(params.aibroker_namespace)
25335
- - name: pull_secret_name
25336
- value: $(params.pull_secret_name)
25337
- - name: mas_aibroker_storage_provider
25338
- value: $(params.mas_aibroker_storage_provider)
25339
- - name: mas_aibroker_storage_ssl
25340
- value: $(params.mas_aibroker_storage_ssl)
25341
- - name: mas_aibroker_storage_host
25342
- value: $(params.mas_aibroker_storage_host)
25343
- - name: mas_aibroker_storage_port
25344
- value: $(params.mas_aibroker_storage_port)
25345
- - name: mas_aibroker_storage_region
25346
- value: $(params.mas_aibroker_storage_region)
25347
- - name: mas_aibroker_storage_templates_bucket
25348
- value: $(params.mas_aibroker_storage_templates_bucket)
25349
- - name: mas_aibroker_storage_tenants_bucket
25350
- value: $(params.mas_aibroker_storage_tenants_bucket)
25351
- - name: mas_aibroker_storage_pipelines_bucket
25352
- value: $(params.mas_aibroker_storage_pipelines_bucket)
25353
- - name: ssh_secret_name
25354
- value: $(params.ssh_secret_name)
25355
- - name: docker_server
25356
- value: $(params.docker_server)
25357
- - name: tenantNamespace
25358
- value: $(params.tenantNamespace)
25359
- - name: mas_aibroker_provision_tenant
25360
- value: $(params.mas_aibroker_provision_tenant)
25361
- - name: primary_storage_class
25362
- value: $(params.primary_storage_class)
25363
- - name: image_store
25364
- value: $(params.image_store)
25365
- - name: image_watcher
25366
- value: $(params.image_watcher)
25367
- - name: image_controller
25368
- value: $(params.image_controller)
25369
- - name: mas_aibroker_connector_tag
25370
- value: $(params.mas_aibroker_connector_tag)
25371
- - name: mas_aibroker_saas
25372
- value: $(params.mas_aibroker_saas)
25373
- - name: model_id_unique_length
25374
- value: $(params.model_id_unique_length)
25375
- - name: model_id_prefix
25376
- value: $(params.model_id_prefix)
25377
- - name: mas_app_channel
25378
- value: $(params.mas_app_channel)
25379
- - name: mas_icr_cp
25380
- value: $(params.mas_icr_cp)# --------------------------------------------------------------------------------
25314
+ - name: aiservice_instance_id
25315
+ value: $(params.aiservice_instance_id)
25316
+ - name: tenant_id
25317
+ value: $(params.tenant_id)
25318
+
25319
+
25320
+
25321
+ # --------------------------------------------------------------------------------
25381
25322
  # /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-apps.yaml
25382
25323
  # --------------------------------------------------------------------------------
25383
25324
  ---
@@ -30811,6 +30752,9 @@ spec:
30811
30752
  - name: provisioner_csb_ca_certificate_file
30812
30753
  type: string
30813
30754
  default: ''
30755
+ - name: provisioner_recommend_cluster
30756
+ type: string
30757
+ default: 'false'
30814
30758
 
30815
30759
  tasks:
30816
30760
  - name: gitops-cluster
@@ -31118,6 +31062,8 @@ spec:
31118
31062
  value: $(params.provisioner_enable_pd_alert)
31119
31063
  - name: csb_ca_certificate_file
31120
31064
  value: $(params.provisioner_csb_ca_certificate_file)
31065
+ - name: recommend_cluster
31066
+ value: $(params.provisioner_recommend_cluster)
31121
31067
  taskRef:
31122
31068
  kind: Task
31123
31069
  name: gitops-mas-provisioner
@@ -33673,36 +33619,6 @@ spec:
33673
33619
  runAfter:
33674
33620
  - kyverno-assist
33675
33621
 
33676
- - name: imagescan-assist
33677
- timeout: "0"
33678
- taskRef:
33679
- kind: Task
33680
- name: mas-ivt-core
33681
- workspaces:
33682
- - name: configs
33683
- workspace: shared-configs
33684
- params:
33685
- - name: mas_instance_id
33686
- value: $(params.mas_instance_id)
33687
- - name: mas_workspace_id
33688
- value: $(params.mas_workspace_id)
33689
- - name: fvt_image_registry
33690
- value: $(params.fvt_image_registry)
33691
- - name: fvt_image_digest
33692
- value: $(params.ivt_digest_core)
33693
-
33694
- - name: product_id
33695
- value: ibm-mas-assist
33696
- - name: product_channel
33697
- value: $(params.mas_app_channel_assist)
33698
- - name: fvt_test_suite
33699
- value: imagescan
33700
- when:
33701
- - input: "$(params.ivt_digest_core)"
33702
- operator: notin
33703
- values: [""]
33704
-
33705
-
33706
33622
  # 2. Prepare data for Python and Desktop suites
33707
33623
  # -----------------------------------------------------------------------------
33708
33624
  - name: fvt-assist-preparedata
@@ -33998,7 +33914,7 @@ spec:
33998
33914
  - input: "$(params.ivt_digest_core)"
33999
33915
  operator: notin
34000
33916
  values: [""]
34001
-
33917
+
34002
33918
  - name: kyverno-dependencies
34003
33919
  timeout: "0"
34004
33920
  taskRef:
@@ -34061,35 +33977,6 @@ spec:
34061
33977
  runAfter:
34062
33978
  - kyverno-dependencies
34063
33979
 
34064
- - name: imagescan
34065
- timeout: "0"
34066
- taskRef:
34067
- kind: Task
34068
- name: mas-ivt-core
34069
- workspaces:
34070
- - name: configs
34071
- workspace: shared-configs
34072
- params:
34073
- - name: mas_instance_id
34074
- value: $(params.mas_instance_id)
34075
- - name: mas_workspace_id
34076
- value: $(params.mas_workspace_id)
34077
- - name: fvt_image_registry
34078
- value: $(params.fvt_image_registry)
34079
- - name: fvt_image_digest
34080
- value: $(params.ivt_digest_core)
34081
-
34082
- - name: product_id
34083
- value: ibm-mas
34084
- - name: product_channel
34085
- value: $(params.mas_channel)
34086
- - name: fvt_test_suite
34087
- value: imagescan
34088
- when:
34089
- - input: "$(params.ivt_digest_core)"
34090
- operator: notin
34091
- values: [""]
34092
-
34093
33980
  # Phase 1
34094
33981
  # -------------------------------------------------------------------------
34095
33982
  # Only suites that take less than 5 minutes
@@ -35591,35 +35478,6 @@ spec:
35591
35478
  - name: pod-templates
35592
35479
  workspace: shared-pod-templates
35593
35480
 
35594
- - name: imagescan-iot
35595
- timeout: "0"
35596
- taskRef:
35597
- kind: Task
35598
- name: mas-ivt-core
35599
- workspaces:
35600
- - name: configs
35601
- workspace: shared-configs
35602
- params:
35603
- - name: mas_instance_id
35604
- value: $(params.mas_instance_id)
35605
- - name: mas_workspace_id
35606
- value: $(params.mas_workspace_id)
35607
- - name: fvt_image_registry
35608
- value: $(params.fvt_image_registry)
35609
- - name: fvt_image_digest
35610
- value: $(params.ivt_digest_core)
35611
-
35612
- - name: product_id
35613
- value: ibm-mas-iot
35614
- - name: product_channel
35615
- value: $(params.mas_app_channel_iot)
35616
- - name: fvt_test_suite
35617
- value: imagescan
35618
- when:
35619
- - input: "$(params.ivt_digest_core)"
35620
- operator: notin
35621
- values: [""]
35622
-
35623
35481
  # 2. IoT FVT
35624
35482
  # -----------------------------------------------------------------------------
35625
35483
  - name: fvt-iot
@@ -35754,6 +35612,10 @@ spec:
35754
35612
  type: string
35755
35613
  default: "false"
35756
35614
  description: "Set this to 'true' to enable launch of the Mobile FVT pipeline after app-cfg-manage completes"
35615
+ - name: launchfvt_mobile_requests
35616
+ type: string
35617
+ default: "false"
35618
+ description: "Set this to 'true' to enable execution of the Mobile FVT requests pipeline after the regular mobile pipeline completes"
35757
35619
  - name: launchfvt_monitor
35758
35620
  type: string
35759
35621
  default: "false"
@@ -36183,8 +36045,10 @@ spec:
36183
36045
  value: "$(params.mas_instance_id)-fvt-mobile-testng"
36184
36046
  - name: pipelinerun_name_pytest
36185
36047
  value: "$(params.mas_instance_id)-fvt-mobile-pytest"
36186
- - name: launchfvt_manage
36187
- value: "$(params.launchfvt_manage)"
36048
+ - name: pipelinerun_name_requests
36049
+ value: "$(params.mas_instance_id)-fvt-mobile-requests"
36050
+ - name: launchfvt_mobile_requests
36051
+ value: "$(params.launchfvt_mobile_requests)"
36188
36052
  taskRef:
36189
36053
  kind: Task
36190
36054
  name: mas-launchfvt-mobile
@@ -39267,35 +39131,6 @@ spec:
39267
39131
  - name: pod-templates
39268
39132
  workspace: shared-pod-templates
39269
39133
 
39270
- - name: imagescan-manage
39271
- timeout: "0"
39272
- taskRef:
39273
- kind: Task
39274
- name: mas-ivt-core
39275
- workspaces:
39276
- - name: configs
39277
- workspace: shared-configs
39278
- params:
39279
- - name: mas_instance_id
39280
- value: $(params.mas_instance_id)
39281
- - name: mas_workspace_id
39282
- value: $(params.mas_workspace_id)
39283
- - name: fvt_image_registry
39284
- value: $(params.fvt_image_registry)
39285
- - name: fvt_image_digest
39286
- value: $(params.ivt_digest_core)
39287
-
39288
- - name: product_id
39289
- value: ibm-mas-manage
39290
- - name: product_channel
39291
- value: $(params.mas_app_channel_manage)
39292
- - name: fvt_test_suite
39293
- value: imagescan
39294
- when:
39295
- - input: "$(params.ivt_digest_core)"
39296
- operator: notin
39297
- values: [""]
39298
-
39299
39134
  # 2. Manage FVT - Manage
39300
39135
  # -------------------------------------------------------------------------
39301
39136
 
@@ -40892,118 +40727,215 @@ spec:
40892
40727
  - name: input_data_file
40893
40728
  value: "MobilePytestSetup.data"
40894
40729
  - name: fvt_test_suite
40895
- value: mobile-api-ic
40730
+ value: mobile-api-ic
40731
+ runAfter:
40732
+ - mobile-pytest-calibration
40733
+ - mobile-pytest-civil-defects
40734
+
40735
+ - name: mobile-pytest-ir
40736
+ taskRef:
40737
+ kind: Task
40738
+ name: mas-fvt-mobile-pytest
40739
+ timeout: "0"
40740
+ workspaces:
40741
+ - name: configs
40742
+ workspace: shared-configs
40743
+ when:
40744
+ - input: "$(params.mas_app_channel_manage)"
40745
+ operator: notin
40746
+ values: [""]
40747
+ - input: "$(params.fvt_digest_mobile_pytest)"
40748
+ operator: notin
40749
+ values: [""]
40750
+
40751
+ params:
40752
+ - name: fvt_image_registry
40753
+ value: $(params.fvt_image_registry)
40754
+ - name: fvt_image_digest
40755
+ value: $(params.fvt_digest_mobile_pytest)
40756
+ - name: mas_instance_id
40757
+ value: $(params.mas_instance_id)
40758
+ - name: mas_workspace_id
40759
+ value: $(params.mas_workspace_id)
40760
+ - name: product_channel
40761
+ value: $(params.mas_app_channel_manage)
40762
+ - name: input_data_file
40763
+ value: "MobilePytestSetup.data"
40764
+ - name: fvt_test_suite
40765
+ value: mobile-api-ir
40766
+ runAfter:
40767
+ - mobile-pytest-calibration
40768
+ - mobile-pytest-civil-defects
40769
+
40770
+ - name: mobile-pytest-it
40771
+ taskRef:
40772
+ kind: Task
40773
+ name: mas-fvt-mobile-pytest
40774
+ timeout: "0"
40775
+ workspaces:
40776
+ - name: configs
40777
+ workspace: shared-configs
40778
+ when:
40779
+ - input: "$(params.mas_app_channel_manage)"
40780
+ operator: notin
40781
+ values: [""]
40782
+ - input: "$(params.fvt_digest_mobile_pytest)"
40783
+ operator: notin
40784
+ values: [""]
40785
+
40786
+ params:
40787
+ - name: fvt_image_registry
40788
+ value: $(params.fvt_image_registry)
40789
+ - name: fvt_image_digest
40790
+ value: $(params.fvt_digest_mobile_pytest)
40791
+ - name: mas_instance_id
40792
+ value: $(params.mas_instance_id)
40793
+ - name: mas_workspace_id
40794
+ value: $(params.mas_workspace_id)
40795
+ - name: product_channel
40796
+ value: $(params.mas_app_channel_manage)
40797
+ - name: input_data_file
40798
+ value: "MobilePytestSetup.data"
40799
+ - name: fvt_test_suite
40800
+ value: mobile-api-it
40801
+ runAfter:
40802
+ - mobile-pytest-calibration
40803
+ - mobile-pytest-civil-defects
40804
+
40805
+ - name: mobile-pytest-sr
40806
+ taskRef:
40807
+ kind: Task
40808
+ name: mas-fvt-mobile-pytest
40809
+ timeout: "0"
40810
+ workspaces:
40811
+ - name: configs
40812
+ workspace: shared-configs
40813
+ when:
40814
+ - input: "$(params.mas_app_channel_manage)"
40815
+ operator: notin
40816
+ values: [""]
40817
+ - input: "$(params.fvt_digest_mobile_pytest)"
40818
+ operator: notin
40819
+ values: [""]
40820
+
40821
+ params:
40822
+ - name: fvt_image_registry
40823
+ value: $(params.fvt_image_registry)
40824
+ - name: fvt_image_digest
40825
+ value: $(params.fvt_digest_mobile_pytest)
40826
+ - name: mas_instance_id
40827
+ value: $(params.mas_instance_id)
40828
+ - name: mas_workspace_id
40829
+ value: $(params.mas_workspace_id)
40830
+ - name: product_channel
40831
+ value: $(params.mas_app_channel_manage)
40832
+ - name: input_data_file
40833
+ value: "MobilePytestSetup.data"
40834
+ - name: fvt_test_suite
40835
+ value: mobile-api-sr
40836
+ runAfter:
40837
+ - mobile-pytest-ic
40838
+ - mobile-pytest-ir
40839
+ - mobile-pytest-it
40840
+
40841
+ - name: mobile-pytest-insp
40842
+ taskRef:
40843
+ kind: Task
40844
+ name: mas-fvt-mobile-pytest
40845
+ timeout: "0"
40846
+ workspaces:
40847
+ - name: configs
40848
+ workspace: shared-configs
40849
+ when:
40850
+ - input: "$(params.mas_app_channel_manage)"
40851
+ operator: notin
40852
+ values: [""]
40853
+ - input: "$(params.fvt_digest_mobile_pytest)"
40854
+ operator: notin
40855
+ values: [""]
40856
+
40857
+ params:
40858
+ - name: fvt_image_registry
40859
+ value: $(params.fvt_image_registry)
40860
+ - name: fvt_image_digest
40861
+ value: $(params.fvt_digest_mobile_pytest)
40862
+ - name: mas_instance_id
40863
+ value: $(params.mas_instance_id)
40864
+ - name: mas_workspace_id
40865
+ value: $(params.mas_workspace_id)
40866
+ - name: product_channel
40867
+ value: $(params.mas_app_channel_manage)
40868
+ - name: input_data_file
40869
+ value: "MobilePytestSetup.data"
40870
+ - name: fvt_test_suite
40871
+ value: mobile-api-insp
40896
40872
  runAfter:
40897
- - mobile-pytest-calibration
40898
- - mobile-pytest-civil-defects
40873
+ - mobile-pytest-ic
40874
+ - mobile-pytest-ir
40875
+ - mobile-pytest-it
40876
+ # --------------------------------------------------------------------------------
40877
+ # /home/runner/work/cli/cli/tekton/target/pipelines/mas-fvt-mobile-requests.yaml
40878
+ # --------------------------------------------------------------------------------
40879
+ ---
40880
+ apiVersion: tekton.dev/v1beta1
40881
+ kind: Pipeline
40882
+ metadata:
40883
+ name: mas-fvt-mobile-requests
40884
+ spec:
40885
+ workspaces:
40886
+ # The generated configuration files
40887
+ - name: shared-configs
40899
40888
 
40900
- - name: mobile-pytest-ir
40901
- taskRef:
40902
- kind: Task
40903
- name: mas-fvt-mobile-pytest
40904
- timeout: "0"
40905
- workspaces:
40906
- - name: configs
40907
- workspace: shared-configs
40908
- when:
40909
- - input: "$(params.mas_app_channel_manage)"
40910
- operator: notin
40911
- values: [""]
40912
- - input: "$(params.fvt_digest_mobile_pytest)"
40913
- operator: notin
40914
- values: [""]
40889
+ params:
40890
+ # Tekton Pipeline image pull policy (for ibmmas/cli images)
40891
+ - name: image_pull_policy
40892
+ type: string
40893
+ default: IfNotPresent
40894
+ description: Pull policy for pipeline container images
40915
40895
 
40916
- params:
40917
- - name: fvt_image_registry
40918
- value: $(params.fvt_image_registry)
40919
- - name: fvt_image_digest
40920
- value: $(params.fvt_digest_mobile_pytest)
40921
- - name: mas_instance_id
40922
- value: $(params.mas_instance_id)
40923
- - name: mas_workspace_id
40924
- value: $(params.mas_workspace_id)
40925
- - name: product_channel
40926
- value: $(params.mas_app_channel_manage)
40927
- - name: input_data_file
40928
- value: "MobilePytestSetup.data"
40929
- - name: fvt_test_suite
40930
- value: mobile-api-ir
40931
- runAfter:
40932
- - mobile-pytest-calibration
40933
- - mobile-pytest-civil-defects
40934
-
40935
- - name: mobile-pytest-it
40936
- taskRef:
40937
- kind: Task
40938
- name: mas-fvt-mobile-pytest
40939
- timeout: "0"
40940
- workspaces:
40941
- - name: configs
40942
- workspace: shared-configs
40943
- when:
40944
- - input: "$(params.mas_app_channel_manage)"
40945
- operator: notin
40946
- values: [""]
40947
- - input: "$(params.fvt_digest_mobile_pytest)"
40948
- operator: notin
40949
- values: [""]
40896
+ # MAS Configuration
40897
+ - name: mas_channel
40898
+ type: string
40899
+ default: ""
40900
+ - name: mas_app_channel_manage
40901
+ type: string
40902
+ default: ""
40903
+ - name: mas_instance_id
40904
+ type: string
40905
+ default: ""
40906
+ - name: mas_workspace_id
40907
+ type: string
40908
+ default: ""
40950
40909
 
40951
- params:
40952
- - name: fvt_image_registry
40953
- value: $(params.fvt_image_registry)
40954
- - name: fvt_image_digest
40955
- value: $(params.fvt_digest_mobile_pytest)
40956
- - name: mas_instance_id
40957
- value: $(params.mas_instance_id)
40958
- - name: mas_workspace_id
40959
- value: $(params.mas_workspace_id)
40960
- - name: product_channel
40961
- value: $(params.mas_app_channel_manage)
40962
- - name: input_data_file
40963
- value: "MobilePytestSetup.data"
40964
- - name: fvt_test_suite
40965
- value: mobile-api-it
40966
- runAfter:
40967
- - mobile-pytest-calibration
40968
- - mobile-pytest-civil-defects
40910
+ # FVT Configuration
40911
+ - name: fvt_image_registry
40912
+ type: string
40913
+ default: ""
40914
+ - name: fvt_artifactory_token
40915
+ type: string
40916
+ default: ""
40917
+ - name: build_num
40918
+ type: string
40919
+ default: ""
40920
+
40921
+ # FVT: Mobile Digests
40922
+ - name: fvt_digest_mobile_pytest
40923
+ type: string
40924
+ default: ""
40925
+
40926
+ # FVT: Request Pipelines
40927
+ - name: launchfvt_mobile_requests
40928
+ default: "False"
40929
+ description: Used to trigger the request pipeline. This pipeline is to be used initially in dev envs
40930
+ type: string
40969
40931
 
40970
- - name: mobile-pytest-sr
40971
- taskRef:
40972
- kind: Task
40973
- name: mas-fvt-mobile-pytest
40974
- timeout: "0"
40975
- workspaces:
40976
- - name: configs
40977
- workspace: shared-configs
40978
- when:
40979
- - input: "$(params.mas_app_channel_manage)"
40980
- operator: notin
40981
- values: [""]
40982
- - input: "$(params.fvt_digest_mobile_pytest)"
40983
- operator: notin
40984
- values: [""]
40985
40932
 
40986
- params:
40987
- - name: fvt_image_registry
40988
- value: $(params.fvt_image_registry)
40989
- - name: fvt_image_digest
40990
- value: $(params.fvt_digest_mobile_pytest)
40991
- - name: mas_instance_id
40992
- value: $(params.mas_instance_id)
40993
- - name: mas_workspace_id
40994
- value: $(params.mas_workspace_id)
40995
- - name: product_channel
40996
- value: $(params.mas_app_channel_manage)
40997
- - name: input_data_file
40998
- value: "MobilePytestSetup.data"
40999
- - name: fvt_test_suite
41000
- value: mobile-api-sr
41001
- runAfter:
41002
- - mobile-pytest-ic
41003
- - mobile-pytest-ir
41004
- - mobile-pytest-it
40933
+ tasks:
40934
+ # 2. Mobile FVT - Mobile Request tasks
40935
+ # -------------------------------------------------------------------------
40936
+
41005
40937
 
41006
- - name: mobile-pytest-insp
40938
+ - name: mobile-pytest-insp-forms
41007
40939
  taskRef:
41008
40940
  kind: Task
41009
40941
  name: mas-fvt-mobile-pytest
@@ -41018,6 +40950,9 @@ spec:
41018
40950
  - input: "$(params.fvt_digest_mobile_pytest)"
41019
40951
  operator: notin
41020
40952
  values: [""]
40953
+ - input: "$(params.launchfvt_mobile_requests)"
40954
+ operator: in
40955
+ values: ["true", "True"]
41021
40956
 
41022
40957
  params:
41023
40958
  - name: fvt_image_registry
@@ -41033,11 +40968,8 @@ spec:
41033
40968
  - name: input_data_file
41034
40969
  value: "MobilePytestSetup.data"
41035
40970
  - name: fvt_test_suite
41036
- value: mobile-api-insp
41037
- runAfter:
41038
- - mobile-pytest-ic
41039
- - mobile-pytest-ir
41040
- - mobile-pytest-it
40971
+ value: mobile-api-insp-forms
40972
+
41041
40973
  # --------------------------------------------------------------------------------
41042
40974
  # /home/runner/work/cli/cli/tekton/target/pipelines/mas-fvt-mobile-testng.yaml
41043
40975
  # --------------------------------------------------------------------------------
@@ -41480,35 +41412,6 @@ spec:
41480
41412
  operator: notin
41481
41413
  values: [""]
41482
41414
 
41483
- - name: imagescan-monitor
41484
- timeout: "0"
41485
- taskRef:
41486
- kind: Task
41487
- name: mas-ivt-core
41488
- workspaces:
41489
- - name: configs
41490
- workspace: shared-configs
41491
- params:
41492
- - name: mas_instance_id
41493
- value: $(params.mas_instance_id)
41494
- - name: mas_workspace_id
41495
- value: $(params.mas_workspace_id)
41496
- - name: fvt_image_registry
41497
- value: $(params.fvt_image_registry)
41498
- - name: fvt_image_digest
41499
- value: $(params.ivt_digest_core)
41500
-
41501
- - name: product_id
41502
- value: ibm-mas-monitor
41503
- - name: product_channel
41504
- value: $(params.mas_app_channel_monitor)
41505
- - name: fvt_test_suite
41506
- value: imagescan
41507
- when:
41508
- - input: "$(params.ivt_digest_core)"
41509
- operator: notin
41510
- values: [""]
41511
-
41512
41415
  # 2. Monitor FVT (with or without Manage Integration)
41513
41416
  # -----------------------------------------------------------------------------
41514
41417
  # When Manage is installed in the cluster, many Monitor APIs are disabled, this
@@ -41745,35 +41648,6 @@ spec:
41745
41648
  operator: notin
41746
41649
  values: [""]
41747
41650
 
41748
- - name: imagescan-optimizer
41749
- timeout: "0"
41750
- taskRef:
41751
- kind: Task
41752
- name: mas-ivt-core
41753
- workspaces:
41754
- - name: configs
41755
- workspace: shared-configs
41756
- params:
41757
- - name: mas_instance_id
41758
- value: $(params.mas_instance_id)
41759
- - name: mas_workspace_id
41760
- value: $(params.mas_workspace_id)
41761
- - name: fvt_image_registry
41762
- value: $(params.fvt_image_registry)
41763
- - name: fvt_image_digest
41764
- value: $(params.ivt_digest_core)
41765
-
41766
- - name: product_id
41767
- value: ibm-mas-optimizer
41768
- - name: product_channel
41769
- value: $(params.mas_app_channel_optimizer)
41770
- - name: fvt_test_suite
41771
- value: imagescan
41772
- when:
41773
- - input: "$(params.ivt_digest_core)"
41774
- operator: notin
41775
- values: [""]
41776
-
41777
41651
  # 2. Run "cypress/optimizer/e2e/ui/bvt/MOAdmin.cy.js"
41778
41652
  # -----------------------------------------------------------------------------
41779
41653
  - name: moadmin
@@ -41812,7 +41686,7 @@ spec:
41812
41686
  operator: notin
41813
41687
  values: [""]
41814
41688
  runAfter:
41815
- - imagescan-optimizer
41689
+ - ivtcore-optimizer
41816
41690
  workspaces:
41817
41691
  - name: configs
41818
41692
  workspace: shared-configs
@@ -42513,35 +42387,6 @@ spec:
42513
42387
  operator: notin
42514
42388
  values: [""]
42515
42389
 
42516
- - name: imagescan-predict
42517
- timeout: "0"
42518
- taskRef:
42519
- kind: Task
42520
- name: mas-ivt-core
42521
- workspaces:
42522
- - name: configs
42523
- workspace: shared-configs
42524
- params:
42525
- - name: mas_instance_id
42526
- value: $(params.mas_instance_id)
42527
- - name: mas_workspace_id
42528
- value: $(params.mas_workspace_id)
42529
- - name: fvt_image_registry
42530
- value: $(params.fvt_image_registry)
42531
- - name: fvt_image_digest
42532
- value: $(params.ivt_digest_core)
42533
-
42534
- - name: product_id
42535
- value: ibm-mas-predict
42536
- - name: product_channel
42537
- value: $(params.mas_app_channel_predict)
42538
- - name: fvt_test_suite
42539
- value: imagescan
42540
- when:
42541
- - input: "$(params.ivt_digest_core)"
42542
- operator: notin
42543
- values: [""]
42544
-
42545
42390
  # 2. Prepare data for Python and Desktop suites
42546
42391
  # -----------------------------------------------------------------------------
42547
42392
  - name: fvt-predict
@@ -42821,35 +42666,6 @@ spec:
42821
42666
  operator: notin
42822
42667
  values: [""]
42823
42668
 
42824
- - name: imagescan-visualinspection
42825
- timeout: "0"
42826
- taskRef:
42827
- kind: Task
42828
- name: mas-ivt-core
42829
- workspaces:
42830
- - name: configs
42831
- workspace: shared-configs
42832
- params:
42833
- - name: mas_instance_id
42834
- value: $(params.mas_instance_id)
42835
- - name: mas_workspace_id
42836
- value: $(params.mas_workspace_id)
42837
- - name: fvt_image_registry
42838
- value: $(params.fvt_image_registry)
42839
- - name: fvt_image_digest
42840
- value: $(params.ivt_digest_core)
42841
-
42842
- - name: product_id
42843
- value: ibm-mas-visualinspection
42844
- - name: product_channel
42845
- value: $(params.mas_app_channel_visualinspection)
42846
- - name: fvt_test_suite
42847
- value: imagescan
42848
- when:
42849
- - input: "$(params.ivt_digest_core)"
42850
- operator: notin
42851
- values: [""]
42852
-
42853
42669
  # 2. Prepare data for Python and Desktop suites
42854
42670
  # -----------------------------------------------------------------------------
42855
42671
  - name: fvt-visualinspection