From 91f222a956684b8dbd359b841739a5a5944d0b83 Mon Sep 17 00:00:00 2001 From: Gabriel Bonamico Date: Thu, 16 May 2024 10:20:07 -0300 Subject: [PATCH 1/4] [patch] adding ic desktop --- .../taskdefs/fvt-mobile/phase8-desktop.yml.j2 | 15 +++++++++++++++ tekton/src/tasks/fvt/fvt-mobile.yml.j2 | 9 ++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/phase8-desktop.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/phase8-desktop.yml.j2 index 132b28dad8..911b67571e 100644 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/phase8-desktop.yml.j2 +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/phase8-desktop.yml.j2 @@ -8,6 +8,21 @@ value: chrome - name: fvt_test_suite value: inventory-counting-mvt-desktop + runAfter: + - fvt-supervisor-mvt-ios + - fvt-calibration-mvt-ios + - fvt-issuesandtransfers-mvt-ios + +- name: fvt-inspection-forms-mvt-desktop-chrome + {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref.yml.j2') | indent(2) }} + params: + {{ lookup('template', 'taskdefs/fvt-mobile/common/params.yml.j2') | indent(4) }} + - name: fvt_mobile_app + value: inspection-forms-app + - name: mobile_device_type + value: chrome + - name: fvt_test_suite + value: inspection-forms-mvt-chrome runAfter: - fvt-supervisor-mvt-ios - fvt-calibration-mvt-ios diff --git a/tekton/src/tasks/fvt/fvt-mobile.yml.j2 b/tekton/src/tasks/fvt/fvt-mobile.yml.j2 index 1989ca87de..0bccdddcd6 100644 --- a/tekton/src/tasks/fvt/fvt-mobile.yml.j2 +++ b/tekton/src/tasks/fvt/fvt-mobile.yml.j2 @@ -130,7 +130,14 @@ spec: name: mas-fvt-mobile key: FVT_BSTACK_INSP_SR optional: true - + + - name: FVT_BSTACK_IC_DESK + valueFrom: + secretKeyRef: + name: mas-fvt-mobile + key: FVT_BSTACK_IC_DESK + optional: true + - name: FVT_BSTACK_ASSET_TECH valueFrom: secretKeyRef: From 6b7f5cd795bfead728311eec4c295cf9f85143aa Mon Sep 17 00:00:00 2001 From: Leonardo Miranda Date: Fri, 17 May 2024 19:31:33 -0300 Subject: [PATCH 2/4] [patch] fix iot wait and approval tasks conditions --- tekton/src/pipelines/fvt-launcher.yml.j2 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tekton/src/pipelines/fvt-launcher.yml.j2 b/tekton/src/pipelines/fvt-launcher.yml.j2 index 7021efdd81..8e9760156d 100644 --- a/tekton/src/pipelines/fvt-launcher.yml.j2 +++ b/tekton/src/pipelines/fvt-launcher.yml.j2 @@ -272,7 +272,7 @@ spec: # Wait for IoT to be installed if we are running the IoT and/or the Monitor FVT suite - input: "$(params.launchfvt_iot)$(params.launchfvt_monitor)" operator: in - values: ["true", "True","truetrue", "TrueTrue"] + values: ["true", "True", "truetrue", "TrueTrue", "falsetrue", "FalseTrue"] - input: $(params.sync_with_install) operator: in values: ["true", "True"] @@ -292,10 +292,6 @@ spec: - input: $(params.launchfvt_iot) operator: in values: ["true", "True"] - when: - - input: $(params.launchfvt_iot) - operator: in - values: ["true", "True"] runAfter: - waitfor-iot @@ -315,7 +311,7 @@ spec: when: - input: "$(params.launchfvt_iot)$(params.launchfvt_monitor)" operator: in - values: ["true", "True","truetrue", "TrueTrue"] + values: ["true", "True", "truetrue", "TrueTrue", "falsetrue", "FalseTrue"] - input: $(params.sync_with_install) operator: in values: ["true", "True"] From ccc2930ce1f4fc3ac0ea6fc2dd8f374c868e2e2e Mon Sep 17 00:00:00 2001 From: Leonardo Miranda Date: Fri, 17 May 2024 19:52:08 -0300 Subject: [PATCH 3/4] [patch] manage and mobile waits and approvals --- tekton/src/pipelines/fvt-launcher.yml.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tekton/src/pipelines/fvt-launcher.yml.j2 b/tekton/src/pipelines/fvt-launcher.yml.j2 index 8e9760156d..d8c7002539 100644 --- a/tekton/src/pipelines/fvt-launcher.yml.j2 +++ b/tekton/src/pipelines/fvt-launcher.yml.j2 @@ -349,9 +349,9 @@ spec: - name: ignore_failure value: "False" when: - - input: $(params.launchfvt_manage) + - input: $(params.launchfvt_manage)$(params.launchfvt_monitor)" operator: in - values: ["true", "True"] + values: ["true", "True", "truetrue", "TrueTrue", "falsetrue", "FalseTrue", "truefalse", "TrueFalse"] - input: $(params.sync_with_install) operator: in values: ["true", "True"] @@ -388,9 +388,9 @@ spec: - name: configmap_value value: approved when: - - input: $(params.launchfvt_manage) + - input: $(params.launchfvt_manage)$(params.launchfvt_monitor)" operator: in - values: ["true", "True"] + values: ["true", "True", "truetrue", "TrueTrue", "falsetrue", "FalseTrue", "truefalse", "TrueFalse"] - input: $(params.sync_with_install) operator: in values: ["true", "True"] From c4d60c733512331ce4850d9466560033d9829a9a Mon Sep 17 00:00:00 2001 From: Leonardo Miranda Date: Fri, 17 May 2024 19:54:30 -0300 Subject: [PATCH 4/4] [patch] fix var name --- tekton/src/pipelines/fvt-launcher.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tekton/src/pipelines/fvt-launcher.yml.j2 b/tekton/src/pipelines/fvt-launcher.yml.j2 index d8c7002539..13a666b344 100644 --- a/tekton/src/pipelines/fvt-launcher.yml.j2 +++ b/tekton/src/pipelines/fvt-launcher.yml.j2 @@ -349,7 +349,7 @@ spec: - name: ignore_failure value: "False" when: - - input: $(params.launchfvt_manage)$(params.launchfvt_monitor)" + - input: $(params.launchfvt_manage)$(params.launchfvt_mobile)" operator: in values: ["true", "True", "truetrue", "TrueTrue", "falsetrue", "FalseTrue", "truefalse", "TrueFalse"] - input: $(params.sync_with_install) @@ -388,7 +388,7 @@ spec: - name: configmap_value value: approved when: - - input: $(params.launchfvt_manage)$(params.launchfvt_monitor)" + - input: $(params.launchfvt_manage)$(params.launchfvt_mobile)" operator: in values: ["true", "True", "truetrue", "TrueTrue", "falsetrue", "FalseTrue", "truefalse", "TrueFalse"] - input: $(params.sync_with_install)