Skip to content

Commit

Permalink
Merge branch 'master' into hadr-replicadb
Browse files Browse the repository at this point in the history
  • Loading branch information
mnivedithaa authored Mar 4, 2025
2 parents 3f4f754 + 21b0712 commit cc5a9ef
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 53 deletions.
15 changes: 0 additions & 15 deletions tekton/src/pipelines/taskdefs/fvt-manage/phase3.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# - fvt-manage-base-ui-classification (selenium)
# - fvt-manage-base-ui-helplinks (selenium)
# - fvt-manage-base-ui-wo-basic (selenium)
# - fvt-manage-base-ui-mas-navigation (selenium)
# - fvt-manage-base-ui-requestreport-pages (selenium)
# - fvt-manage-base-api-scheduler-qualification (pytest)
# -------------------------------------------------------------
Expand Down Expand Up @@ -50,20 +49,6 @@
- fvt-manage-base-api-system
- fvt-manage-base-api-mif

# Manage FVT Mas Navigation Scenario
- name: fvt-manage-base-ui-mas-navigation
{{ lookup('template', 'taskdefs/fvt-manage/ui/taskref.yml.j2') | indent(2) }}
{{ lookup('template', 'taskdefs/fvt-manage/ui/when.yml.j2') | indent(2) }}
params:
{{ lookup('template', 'taskdefs/fvt-manage/ui/params.yml.j2') | indent(4) }}
- name: fvt_test_suite_prefix
value: base-ui
- name: fvt_test_suite
value: mas-navigation
runAfter:
- fvt-manage-base-api-system
- fvt-manage-base-api-mif

# Manage FVT Generate Request Pages for Reports
- name: fvt-manage-base-ui-requestreport-pages
{{ lookup('template', 'taskdefs/fvt-manage/ui/taskref.yml.j2') | indent(2) }}
Expand Down
5 changes: 0 additions & 5 deletions tekton/src/pipelines/taskdefs/fvt-manage/phase4.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
- fvt-manage-base-ui-classification
- fvt-manage-base-ui-helplinks
- fvt-manage-base-ui-wo-basic
- fvt-manage-base-ui-mas-navigation
- fvt-manage-base-api-scheduler-qualification
- fvt-manage-base-ui-requestreport-pages

Expand All @@ -37,7 +36,6 @@
- fvt-manage-base-ui-classification
- fvt-manage-base-ui-helplinks
- fvt-manage-base-ui-wo-basic
- fvt-manage-base-ui-mas-navigation
- fvt-manage-base-api-scheduler-qualification
- fvt-manage-base-ui-requestreport-pages

Expand All @@ -55,7 +53,6 @@
- fvt-manage-base-ui-classification
- fvt-manage-base-ui-helplinks
- fvt-manage-base-ui-wo-basic
- fvt-manage-base-ui-mas-navigation
- fvt-manage-base-api-scheduler-qualification
- fvt-manage-base-ui-requestreport-pages

Expand All @@ -73,7 +70,6 @@
- fvt-manage-base-ui-classification
- fvt-manage-base-ui-helplinks
- fvt-manage-base-ui-wo-basic
- fvt-manage-base-ui-mas-navigation
- fvt-manage-base-api-scheduler-qualification
- fvt-manage-base-ui-requestreport-pages

Expand All @@ -91,6 +87,5 @@
- fvt-manage-base-ui-classification
- fvt-manage-base-ui-helplinks
- fvt-manage-base-ui-wo-basic
- fvt-manage-base-ui-mas-navigation
- fvt-manage-base-api-scheduler-qualification
- fvt-manage-base-ui-requestreport-pages
18 changes: 0 additions & 18 deletions tekton/src/pipelines/taskdefs/fvt-manage/phase5.yml.j2
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# -------------------------------------------------------------
# PHASE 5
# - fvt-manage-base-ui-sec-audit-log (selenium)
# - fvt-manage-base-ui-sec-inactive-auth (selenium)
# - fvt-manage-base-ui-wo-doclink (selenium)
# - fvt-manage-base-ui-directprint (selenium)
# - fvt-manage-base-ui-adhoc-report (selenium)
Expand All @@ -24,23 +23,6 @@
- fvt-manage-base-ui-user-consumption
- fvt-manage-base-ui-communication-temp

# Manage FVT Inactive User Authentication
- name: fvt-manage-base-ui-sec-inactive-auth
{{ lookup('template', pipeline_src_dir ~ '/taskdefs/fvt-manage/ui/taskref.yml.j2') | indent(2) }}
{{ lookup('template', pipeline_src_dir ~ '/taskdefs/fvt-manage/ui/when.yml.j2') | indent(2) }}
params:
{{ lookup('template', pipeline_src_dir ~ '/taskdefs/fvt-manage/ui/params.yml.j2') | indent(4) }}
- name: fvt_test_suite_prefix
value: base-ui
- name: fvt_test_suite
value: sec-inactive-auth
runAfter:
- fvt-manage-base-ui-escalation-action
- fvt-manage-base-ui-birt-report
- fvt-manage-base-ui-user-crud
- fvt-manage-base-ui-user-consumption
- fvt-manage-base-ui-communication-temp

# Manage FVT Work Order Attachments
- name: fvt-manage-base-ui-wo-doclink
{{ lookup('template', pipeline_src_dir ~ '/taskdefs/fvt-manage/ui/taskref.yml.j2') | indent(2) }}
Expand Down
15 changes: 0 additions & 15 deletions tekton/src/tasks/fvt/fvt-manage-last-phase.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -145,21 +145,6 @@ spec:

steps:

# Manage FVT Application Designer
- name: fvt-manage-application-designer
image: '$(params.fvt_image_registry)/fvt-manage/fvt-ibm-mas-manage@$(params.fvt_image_digest)'
imagePullPolicy: $(params.image_pull_policy)
timeout: 150m # Ensure bad FVTs don't run forever
onError: continue # Ensure bad FVTs don't break the pipeline
resources: {}
workingDir: /opt/ibm/test/src
volumeMounts:
- mountPath: /dev/shm
name: dshm
env:
- name: FVT_TEST_SUITE
value: application-designer

# Manage FVT Start Center
- name: fvt-manage-startcenter-config
image: '$(params.fvt_image_registry)/fvt-manage/fvt-ibm-mas-manage@$(params.fvt_image_digest)'
Expand Down

0 comments on commit cc5a9ef

Please sign in to comment.