Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e31b6f8
Added param jdbc type to ivt core
dpdifferent1 Apr 21, 2026
03f61c2
Updated preparer pipeline
dpdifferent1 Apr 21, 2026
95898f4
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 Apr 21, 2026
34ae108
Corrected pipeline definition
dpdifferent1 Apr 27, 2026
772ace8
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 Apr 27, 2026
855da1f
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 1, 2026
a5d8a9b
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 4, 2026
af2d85e
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 6, 2026
87afdcb
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 7, 2026
1a59586
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 8, 2026
b670dcf
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 14, 2026
fde44c8
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 18, 2026
e49ff35
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 18, 2026
4a5f363
Merge branch master into feature branch
dpdifferent1 May 21, 2026
da60b79
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 21, 2026
1be1b40
Add JDBC_TYPE parameter support to IVT pipeline chain for Manage
dpdifferent1 May 21, 2026
7845dd7
removed duplicate param
dpdifferent1 May 21, 2026
a28a901
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 25, 2026
97ec56d
updated preparer to update jdbc params in gitops-envs
dpdifferent1 May 25, 2026
d527158
fixed syntax
dpdifferent1 May 25, 2026
ac7fdd8
create pod using oc command instead of cat
dpdifferent1 May 25, 2026
afe4136
Ran detect secrets
dpdifferent1 May 25, 2026
9b0679e
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 26, 2026
e3eebea
Updated value of APPLHEAPSZ
dpdifferent1 May 26, 2026
1cb8b36
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 26, 2026
fcc5d9b
corrected syntax
dpdifferent1 May 26, 2026
1eb61e5
updated .secrets.baseline
dpdifferent1 May 26, 2026
287027b
added gitops-envs in git clone
dpdifferent1 May 27, 2026
1510d3f
added required params for preparer
dpdifferent1 May 27, 2026
400841d
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 27, 2026
56b2c6a
Removed GITHUB_PAT from params
dpdifferent1 May 27, 2026
0169203
updated function
dpdifferent1 May 27, 2026
6de30cd
updated .secrets.baseline
dpdifferent1 May 28, 2026
2c53368
removed jdbc app sync
dpdifferent1 May 28, 2026
e65be01
Merge branch 'master' of github.com:ibm-mas/cli into mascore-13263
dpdifferent1 May 28, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$|^docs/catalogs/",
"lines": null
},
"generated_at": "2026-05-20T23:47:35Z",
"generated_at": "2026-05-28T19:28:18Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -914,6 +914,16 @@
"type": "Base64 High Entropy String",
"verified_result": null
}
],
"tekton/src/tasks/gitops/gitops-mas-fvt-preparer.yml.j2": [
{
"hashed_secret": "282db52cffa0e6a89ac34921d87d138ac00fba71",
"is_secret": false,
"is_verified": false,
"line_number": 543,
"type": "Base64 High Entropy String",
"verified_result": null
}
]
},
"version": "0.13.1+ibm.64.dss",
Expand Down
3 changes: 3 additions & 0 deletions image/cli/mascli/functions/gitops_mas_fvt_preparer
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ function gitops_mas_fvt_preparer_noninteractive() {
[[ -z "$FVT_IMAGE_REGISTRY" ]] && gitops_mas_fvt_preparer_help "FVT_IMAGE_REGISTRY is not set"
[[ -z "$FVT_VERSION_CORE" ]] && gitops_mas_fvt_preparer_help "FVT_VERSION_CORE is not set"
[[ -z "$IVT_VERSION_CORE" ]] && gitops_mas_fvt_preparer_help "IVT_VERSION_CORE is not set"

# Export ENABLE_TRANSITION_TESTING with default value
export ENABLE_TRANSITION_TESTING=${ENABLE_TRANSITION_TESTING:-false}
}

function gitops_mas_fvt_preparer() {
Expand Down
1 change: 1 addition & 0 deletions image/cli/masfvt/fvt-manage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
ldap_bind_password: "{{ lookup('env', 'LDAP_BIND_PASSWORD') }}"
ldap_user_map: "{{ lookup('env', 'LDAP_USER_MAP') }}"
ldap_cert_alias: "{{ lookup('env', 'LDAP_CERT_ALIAS') }}"
jdbc_type: "{{ lookup('env', 'JDBC_TYPE') }}"
ldap_crt: "{{ lookup('env', 'LDAP_CRT') }}"
tasks:
- name: "Debug"
Expand Down
2 changes: 2 additions & 0 deletions image/cli/masfvt/ivt-manage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
ldap_user_map: "{{ lookup('env', 'LDAP_USER_MAP') }}"
ldap_cert_alias: "{{ lookup('env', 'LDAP_CERT_ALIAS') }}"
ldap_crt: "{{ lookup('env', 'LDAP_CRT') }}"
# JDBC Configuration
jdbc_type: "{{ lookup('env', 'JDBC_TYPE') }}"
# Control the Monitor suite based on the presence/absence of Manage
fvt_test_suite: "{{ (mas_app_channel_manage == '') | ternary('monitor_fvt', 'monitor_fvt_with_manage') }}"
tasks:
Expand Down
2 changes: 2 additions & 0 deletions image/cli/masfvt/templates/mas-fvt-manage.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ spec:
value: "{{ fvt_digest_manage_cypress }}"
- name: ivt_digest_core
value: "{{ ivt_digest_core }}"
- name: jdbc_type
value: "{{ jdbc_type }}"

workspaces:
# The generated configuration files
Expand Down
4 changes: 4 additions & 0 deletions image/cli/masfvt/templates/mas-ivt-manage.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ spec:
- name: fvt_digest_ctf
value: "{{ fvt_digest_ctf }}"

# JDBC Configuration
- name: jdbc_type
value: "{{ jdbc_type }}"

workspaces:
# The generated configuration files
- name: shared-configs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,19 @@ spec:
- name: standalone_sls_service
type: string
default: ""
- name: jdbc_type
type: string
default: ""
- name: enable_transition_testing
type: string
default: "false"
description: "Enable post-IVT transition testing for JDBC configuration changes"
- name: github_host
type: string
default: "github.ibm.com"
- name: github_org
type: string
default: "maximoappsuite"

tasks:
- name: mas-launchfvt
Expand Down Expand Up @@ -311,6 +324,14 @@ spec:
value: $(params.ldap_basedn)
- name: ldap_userid_map
value: $(params.ldap_userid_map)
- name: jdbc_type
value: $(params.jdbc_type)
- name: enable_transition_testing
value: $(params.enable_transition_testing)
- name: github_host
value: $(params.github_host)
- name: github_org
value: $(params.github_org)

- name: icn
value: $(params.sls_license_icn)
Expand Down
5 changes: 5 additions & 0 deletions tekton/src/pipelines/mas-fvt-manage.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ spec:
- name: ivt_digest_core
type: string
default: ""
- name: jdbc_type
type: string
default: ""

tasks:
- name: pipeline-start
Expand Down Expand Up @@ -122,6 +125,8 @@ spec:
value: ibm-mas-manage
- name: product_channel
value: $(params.mas_app_channel_manage)
- name: jdbc_type
value: $(params.jdbc_type)
- name: fvt_test_suite
value: coreivt
- name: workspace_id
Expand Down
8 changes: 8 additions & 0 deletions tekton/src/pipelines/mas-ivt-manage.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ spec:
description: Whether to run the Monitor (Base) [monitor_fvt] or Monitor (with Manage) FVT suite [monitor_fvt_with_manage]
default: "monitor_fvt_with_manage"

# JDBC Configuration
- name: jdbc_type
type: string
description: JDBC type for database connection (e.g., incluster_db2, rds-db2, external-db2)
default: ""

tasks:
- name: pipeline-start
timeout: "0"
Expand Down Expand Up @@ -105,6 +111,8 @@ spec:
value: $(params.mas_app_channel_monitor)
- name: fvt_test_suite
value: $(params.fvt_test_suite)
- name: jdbc_type
value: $(params.jdbc_type)
taskRef:
kind: Task
name: mas-ivt-manage
Expand Down
6 changes: 6 additions & 0 deletions tekton/src/tasks/fvt-launcher/mas-launchfvt-manage.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,12 @@ spec:
secretKeyRef:
name: mas-fvt-manage
key: LDAP_CRT
optional: false
- name: JDBC_TYPE
valueFrom:
secretKeyRef:
name: mas-fvt-manage
key: JDBC_TYPE
optional: false

- name: wait-for-pipelinerun
Expand Down
6 changes: 6 additions & 0 deletions tekton/src/tasks/fvt-launcher/mas-launchivt-manage.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ spec:
name: mas-fvt-manage
key: FVT_WHITELIST_IS
optional: false
- name: JDBC_TYPE
valueFrom:
secretKeyRef:
name: mas-fvt-manage
key: JDBC_TYPE
optional: true

- name: wait-for-pipelinerun
image: quay.io/ibmmas/cli:latest
Expand Down
Loading
Loading