Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[patch] Mobile FVT tasks updates #1048

Merged
merged 7 commits into from
Jun 21, 2024
Merged
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
2 changes: 1 addition & 1 deletion tekton/src/pipelines/fvt-launcher.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ spec:
operator: in
values: ["true", "True"]
runAfter:
- waitfor-manage
- manage-setup


# 7. Application FVT - Monitor
Expand Down
34 changes: 34 additions & 0 deletions tekton/src/pipelines/taskdefs/fvt-mobile/phase1-setup.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,44 @@
value: $(params.mas_workspace_id)
- name: product_channel
value: $(params.mas_app_channel_manage)
- name: output_data_file
value: "MobileSetup4MAS.data"
when:
- input: "$(params.mas_app_channel_manage)"
operator: notin
values: [""]
- input: "$(params.fvt_digest_mobile_pytest)"
operator: notin
values: [""]

- name: fvt-mobile-test-sr
taskRef:
kind: Task
name: mas-fvt-mobile-pytest
workspaces:
- name: configs
workspace: shared-configs
params:
- name: fvt_image_registry
value: $(params.fvt_image_registry)
- name: fvt_image_digest
value: $(params.fvt_digest_mobile_pytest)
- name: fvt_test_suite
value: sr_api
- name: mas_instance_id
value: $(params.mas_instance_id)
- name: mas_workspace_id
value: $(params.mas_workspace_id)
- name: product_channel
value: $(params.mas_app_channel_manage)
- name: upload_file
value: "false"
when:
- input: "$(params.mas_app_channel_manage)"
operator: notin
values: [""]
- input: "$(params.fvt_digest_mobile_pytest)"
operator: notin
values: [""]
runAfter:
- fvt-mobile-setup-data
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- name: fvt_test_suite
value: civil-bvt
runAfter:
- fvt-mobile-setup-data
- fvt-mobile-test-sr

## Minimum Verification Test for Mobile Defects MAS test suites
- name: fvt-civil-defects-mvt-android
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- name: fvt_test_suite
value: mobfoundation-mvt-android
runAfter:
- fvt-mobile-setup-data
- fvt-mobile-test-sr

## Minimum Verification Test for Mobile Inspection MAS test suites
- name: fvt-inspections-mvt-android
Expand All @@ -24,7 +24,7 @@
- name: fvt_test_suite
value: inspections-mvt-android
runAfter:
- fvt-mobile-setup-data
- fvt-mobile-test-sr

## Minimum Verification Test for Mobile Asset Manager MAS test suites
- name: fvt-asset-manager-mvt-android
Expand All @@ -38,7 +38,7 @@
- name: fvt_test_suite
value: asset-manager-mvt-android
runAfter:
- fvt-mobile-setup-data
- fvt-mobile-test-sr

## Mobile FVT - Inventory Counting Android
- name: fvt-inventorycounting-mvt-android
Expand All @@ -52,4 +52,4 @@
- name: fvt_test_suite
value: inventory-counting-mvt-android # xml for Mobile IC
runAfter:
- fvt-mobile-setup-data
- fvt-mobile-test-sr
20 changes: 20 additions & 0 deletions tekton/src/tasks/fvt/fvt-mobile-pytest.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,19 @@ spec:
type: string
description: Used only by fvt-mobile-version step to upload version file to artifactory
default: "true"

- name: workspace_managedata_path
type: string
description: Path where output data file will be placed. Defaults to value used in fvt shared workspace
default: "/workspace/configs/mobiledata"
- name: input_data_file
type: string
description: Used by pytest to define input file with shared data
default: "MobileSetup4MAS.data"
- name: output_data_file
type: string
description: Used by pytest to define output file with shared data
default: "default_output.data"

stepTemplate:
name: 'fvt-mobile'
Expand Down Expand Up @@ -97,6 +110,13 @@ spec:

- name: UPLOAD_FILE
value: "$(params.upload_file)"

- name: WORKSPACE_MANAGEDATA_PATH
value: "$(params.workspace_managedata_path)"
- name: INPUT_DATA_FILE
value: "$(params.input_data_file)"
- name: OUTPUT_DATA_FILE
value: "$(params.output_data_file)"

- name: ARTIFACTORY_TOKEN
valueFrom:
Expand Down
Loading