Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
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/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
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ spec:
- name: standalone_sls_service
type: string
default: ""
- name: jdbc_type
type: string
default: ""

tasks:
- name: mas-launchfvt
Expand Down Expand Up @@ -311,6 +314,8 @@ spec:
value: $(params.ldap_basedn)
- name: ldap_userid_map
value: $(params.ldap_userid_map)
- name: jdbc_type
value: $(params.jdbc_type)

- 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
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
5 changes: 5 additions & 0 deletions tekton/src/tasks/gitops/gitops-mas-fvt-preparer.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ spec:
- name: ldap_userid_map
type: string
default: ""
- name: jdbc_type
type: string
default: ""

- name: icn
type: string
Expand Down Expand Up @@ -322,6 +325,8 @@ spec:
value: $(params.ldap_userid_map)
- name: LDAP_CERT_ALIAS
value: ldap
- name: JDBC_TYPE
value: $(params.jdbc_type)

- name: ICN
value: $(params.icn)
Expand Down
6 changes: 6 additions & 0 deletions tekton/src/tasks/ivt/ivt-core.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ spec:
- name: mas_workspace_id
type: string
description: Workspace ID in MAS to use for running the tests
- name: jdbc_type
type: string
description: JDBC type for database connection
default: ""

stepTemplate:
name: 'ivt-core'
Expand All @@ -58,6 +62,8 @@ spec:
value: $(params.product_channel)
- name: NAMESPACE
value: "mas-$(params.mas_instance_id)-core"
- name: JDBC_TYPE
value: $(params.jdbc_type)
- name: INSTANCE_ID
value: "$(params.mas_instance_id)"
- name: WORKSPACE_ID
Expand Down
Loading