From 91905f23d5c6159dc013125510cacbbc422a7848 Mon Sep 17 00:00:00 2001 From: Gabriel Bonamico Date: Mon, 8 Jul 2024 11:23:19 -0300 Subject: [PATCH 1/3] [patch] add parallel run for api tests --- tekton/src/pipelines/fvt-mobile.yml.j2 | 1 + .../taskdefs/fvt-mobile/phase1-setup.yml.j2 | 30 ---------- .../fvt-mobile/phase1.4-pytest.yml.j2 | 59 +++++++++++++++++++ .../fvt-mobile/phase1.5-selenium-civil.yml.j2 | 2 +- .../fvt-mobile/phase2-android-part1.yml.j2 | 10 ++-- 5 files changed, 65 insertions(+), 37 deletions(-) create mode 100644 tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 diff --git a/tekton/src/pipelines/fvt-mobile.yml.j2 b/tekton/src/pipelines/fvt-mobile.yml.j2 index 892a716133..8dd1a88985 100644 --- a/tekton/src/pipelines/fvt-mobile.yml.j2 +++ b/tekton/src/pipelines/fvt-mobile.yml.j2 @@ -55,6 +55,7 @@ spec: # ------------------------------------------------------------------------- {{ lookup('template', 'taskdefs/fvt-mobile/phase1-setup.yml.j2') | indent(4) }} + {{ lookup('template', 'taskdefs/fvt-mobile/phase1.4-pytest.yml.j2') | indent(4) }} {{ lookup('template', 'taskdefs/fvt-mobile/phase1.5-selenium-civil.yml.j2') | indent(4) }} {{ lookup('template', 'taskdefs/fvt-mobile/phase2-android-part1.yml.j2') | indent(4) }} {{ lookup('template', 'taskdefs/fvt-mobile/phase3-android-part2.yml.j2') | indent(4) }} diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/phase1-setup.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/phase1-setup.yml.j2 index a8e5b5e89c..da8019d683 100644 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/phase1-setup.yml.j2 +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/phase1-setup.yml.j2 @@ -30,33 +30,3 @@ - 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) - when: - - input: "$(params.mas_app_channel_manage)" - operator: notin - values: [""] - - input: "$(params.fvt_digest_mobile_pytest)" - operator: notin - values: [""] - runAfter: - - fvt-mobile-setup-data diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 new file mode 100644 index 0000000000..73d9415434 --- /dev/null +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 @@ -0,0 +1,59 @@ +- 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) + when: + - input: "$(params.mas_app_channel_manage)" + operator: notin + values: [""] + - input: "$(params.fvt_digest_mobile_pytest)" + operator: notin + values: [""] + runAfter: + - fvt-mobile-setup-data + +- name: fvt-mobile-test-insp + 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: insp_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) + when: + - input: "$(params.mas_app_channel_manage)" + operator: notin + values: [""] + - input: "$(params.fvt_digest_mobile_pytest)" + operator: notin + values: [""] + runAfter: + - fvt-mobile-test-sr diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.5-selenium-civil.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.5-selenium-civil.yml.j2 index b232932010..8ab82370a7 100644 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.5-selenium-civil.yml.j2 +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.5-selenium-civil.yml.j2 @@ -6,7 +6,7 @@ - name: fvt_test_suite value: civil-bvt runAfter: - - fvt-mobile-test-sr + - fvt-mobile-setup-data ## Minimum Verification Test for Mobile Defects MAS test suites - name: fvt-civil-defects-mvt-android diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/phase2-android-part1.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/phase2-android-part1.yml.j2 index 7e47ec3c88..f8356fa672 100644 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/phase2-android-part1.yml.j2 +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/phase2-android-part1.yml.j2 @@ -10,8 +10,7 @@ - name: fvt_test_suite value: mobfoundation-mvt-android runAfter: - - fvt-mobile-test-sr - + - fvt-mobile-setup-data ## Minimum Verification Test for Mobile Inspection MAS test suites - name: fvt-inspections-mvt-android {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref.yml.j2') | indent(2) }} @@ -24,8 +23,7 @@ - name: fvt_test_suite value: inspections-mvt-android runAfter: - - fvt-mobile-test-sr - + - fvt-mobile-setup-data ## Minimum Verification Test for Mobile Asset Manager MAS test suites - name: fvt-asset-manager-mvt-android {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref.yml.j2') | indent(2) }} @@ -38,7 +36,7 @@ - name: fvt_test_suite value: asset-manager-mvt-android runAfter: - - fvt-mobile-test-sr + - fvt-mobile-setup-data ## Mobile FVT - Inventory Counting Android - name: fvt-inventorycounting-mvt-android @@ -52,4 +50,4 @@ - name: fvt_test_suite value: inventory-counting-mvt-android # xml for Mobile IC runAfter: - - fvt-mobile-test-sr + - fvt-mobile-setup-data From 7202e0000ceceb42afb2f550855bb02fd38ceaaa Mon Sep 17 00:00:00 2001 From: Gabriel Bonamico Date: Wed, 10 Jul 2024 10:41:27 -0300 Subject: [PATCH 2/3] [patch] matching changed names --- .../src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 index 73d9415434..03f248495b 100644 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 @@ -11,7 +11,7 @@ - name: fvt_image_digest value: $(params.fvt_digest_mobile_pytest) - name: fvt_test_suite - value: sr_api + value: mobile_api_sr - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_workspace_id @@ -41,7 +41,7 @@ - name: fvt_image_digest value: $(params.fvt_digest_mobile_pytest) - name: fvt_test_suite - value: insp_api + value: mobile_api_insp - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_workspace_id From 4e1842f688763bc09a742b9ee191a8f2cebbd635 Mon Sep 17 00:00:00 2001 From: Gabriel Bonamico Date: Mon, 22 Jul 2024 15:11:06 -0300 Subject: [PATCH 3/3] [patch] adding technician --- .../fvt-mobile/phase1.4-pytest.yml.j2 | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 index 03f248495b..ca68b97932 100644 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2 @@ -57,3 +57,33 @@ values: [""] runAfter: - fvt-mobile-test-sr + +- name: fvt-mobile-test-tech + 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: mobile_api_tech + - 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) + when: + - input: "$(params.mas_app_channel_manage)" + operator: notin + values: [""] + - input: "$(params.fvt_digest_mobile_pytest)" + operator: notin + values: [""] + runAfter: + - fvt-mobile-test-insp