-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[minor] Mobile FVT pipelines clean up and reorganization (#1196)
- Loading branch information
Showing
32 changed files
with
759 additions
and
520 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| --- | ||
| - hosts: localhost | ||
| any_errors_fatal: true | ||
| vars: | ||
| # Image Pull Policy | ||
| image_pull_policy: "{{ lookup('env', 'IMAGE_PULL_POLICY') }}" | ||
|
|
||
| #Registry | ||
| fvt_image_registry: "{{ lookup('env', 'FVT_IMAGE_REGISTRY') }}" | ||
| fvt_artifactory_token: "{{ lookup('env', 'FVT_ARTIFACTORY_TOKEN') }}" | ||
|
|
||
| # MAS Details | ||
| mas_channel: "{{ lookup('env', 'MAS_CHANNEL') }}" | ||
| mas_app_channel_manage: "{{ lookup('env', 'MAS_APP_CHANNEL_MANAGE') }}" | ||
| mas_instance_id: "{{ lookup('env', 'MAS_INSTANCE_ID') }}" | ||
| mas_workspace_id: "{{ lookup('env', 'MAS_WORKSPACE_ID') }}" | ||
|
|
||
| # Black and white listing | ||
| fvt_blacklist: "{{ lookup('env', 'FVT_BLACKLIST') }}" | ||
| fvt_whitelist: "{{ lookup('env', 'FVT_WHITELIST') }}" | ||
|
|
||
| # FVT Configuration | ||
| fvt_digest_mobile_pytest: "{{ lookup('env', 'FVT_DIGEST_MOBILE_PYTEST') }}" | ||
|
|
||
| # Pipeline Run Info | ||
| devops_build_number: "{{ lookup('env', 'DEVOPS_BUILD_NUMBER') | default('0', True) }}" | ||
| pipelinerun_name: "{{ lookup('env', 'PIPELINERUN_NAME') | default('mas-fvt-mobile-pytest', True) }}-{{ devops_build_number }}" | ||
| pipelinerun_namespace: "{{ lookup('env', 'PIPELINERUN_NAMESPACE') | default('mas-' ~ mas_instance_id ~ '-pipelines', True) }}" | ||
| tasks: | ||
| - name: "Debug" | ||
| debug: | ||
| msg: | ||
| - "pipelinerun_name ......................... {{ pipelinerun_name }}" | ||
| - "pipelinerun_namespace .................... {{ pipelinerun_namespace }}" | ||
| - "" | ||
| - "mas_channel .............................. {{ mas_channel }}" | ||
| - "mas_app_channel_manage ................... {{ mas_app_channel_manage }}" | ||
| - "mas_instance_id .......................... {{ mas_instance_id }}" | ||
| - "mas_workspace_id ......................... {{ mas_workspace_id }}" | ||
| - "" | ||
| - "fvt_image_registry ....................... {{ fvt_image_registry }}" | ||
| - "fvt_artifactory_token .................... {{ fvt_artifactory_token }}" | ||
| - "fvt_digest_mobile_pytest ................. {{ fvt_digest_mobile_pytest }}" | ||
| - "" | ||
| - "fvt_blacklist ..................... {{ fvt_blacklist }}" | ||
| - "fvt_whitelist ..................... {{ fvt_whitelist }}" | ||
|
|
||
| - name: "Start fvt-mobile-pytest pipeline" | ||
| kubernetes.core.k8s: | ||
| apply: true | ||
| template: templates/mas-fvt-mobile-pytest.yml.j2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| --- | ||
| apiVersion: tekton.dev/v1beta1 | ||
| kind: PipelineRun | ||
| metadata: | ||
| name: "{{ pipelinerun_name }}" | ||
| namespace: "{{ pipelinerun_namespace }}" | ||
| labels: | ||
| tekton.dev/pipeline: mas-fvt-mobile-pytest | ||
| spec: | ||
| pipelineRef: | ||
| name: mas-fvt-mobile-pytest | ||
|
|
||
| serviceAccountName: pipeline | ||
| timeouts: | ||
| pipeline: "8h" | ||
|
|
||
| params: | ||
| # Pull Policy | ||
| - name: image_pull_policy | ||
| value: "{{ image_pull_policy }}" | ||
|
|
||
| # Registry | ||
| - name: fvt_image_registry | ||
| value: "{{ fvt_image_registry }}" | ||
| - name: fvt_artifactory_token | ||
| value: "{{ fvt_artifactory_token }}" | ||
|
|
||
| # MAS Info | ||
| - name: mas_channel | ||
| value: "{{ mas_channel }}" | ||
| - name: mas_app_channel_manage | ||
| value: "{{ mas_app_channel_manage }}" | ||
| - name: mas_instance_id | ||
| value: "{{ mas_instance_id }}" | ||
| - name: mas_workspace_id | ||
| value: "{{ mas_workspace_id }}" | ||
|
|
||
| # Digests | ||
| - name: fvt_digest_mobile_pytest | ||
| value: "{{ fvt_digest_mobile_pytest }}" | ||
|
|
||
| workspaces: | ||
| # The generated configuration files | ||
| - name: shared-configs | ||
| persistentVolumeClaim: | ||
| claimName: config-pvc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| --- | ||
| apiVersion: tekton.dev/v1beta1 | ||
| kind: Pipeline | ||
| metadata: | ||
| name: mas-fvt-mobile-pytest | ||
| spec: | ||
| workspaces: | ||
| # The generated configuration files | ||
| - name: shared-configs | ||
|
|
||
| params: | ||
| # Tekton Pipeline image pull policy (for ibmmas/cli images) | ||
| - name: image_pull_policy | ||
| type: string | ||
| default: IfNotPresent | ||
| description: Pull policy for pipeline container images | ||
|
|
||
| # MAS Configuration | ||
| - name: mas_channel | ||
| type: string | ||
| default: "" | ||
| - name: mas_app_channel_manage | ||
| type: string | ||
| default: "" | ||
| - name: mas_instance_id | ||
| type: string | ||
| default: "" | ||
| - name: mas_workspace_id | ||
| type: string | ||
| default: "" | ||
|
|
||
| # FVT Configuration | ||
| - name: fvt_image_registry | ||
| type: string | ||
| default: "" | ||
| - name: fvt_artifactory_token | ||
| type: string | ||
| default: "" | ||
|
|
||
| # FVT: Mobile Digests | ||
| - name: fvt_digest_mobile_pytest | ||
| type: string | ||
| default: "" | ||
|
|
||
| tasks: | ||
| # 2. Manage FVT - Manage Mobile | ||
| # ------------------------------------------------------------------------- | ||
|
|
||
| {{ lookup('template', 'taskdefs/fvt-mobile/pytest/phase1-setup.yml.j2') | indent(4) }} | ||
| {{ lookup('template', 'taskdefs/fvt-mobile/pytest/phase2-apps.yml.j2') | indent(4) }} | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
tekton/src/pipelines/taskdefs/fvt-mobile/common/params-pytest.yml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| - name: fvt_image_registry | ||
| value: $(params.fvt_image_registry) | ||
| - name: fvt_image_digest | ||
| value: $(params.fvt_digest_mobile_pytest) | ||
| - 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) |
File renamed without changes.
13 changes: 13 additions & 0 deletions
13
tekton/src/pipelines/taskdefs/fvt-mobile/common/taskref-pytest.yml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| taskRef: | ||
| kind: Task | ||
| name: mas-fvt-mobile-pytest | ||
| workspaces: | ||
| - name: configs | ||
| workspace: shared-configs | ||
| when: | ||
| - input: "$(params.mas_app_channel_manage)" | ||
| operator: notin | ||
| values: [""] | ||
| - input: "$(params.fvt_digest_mobile_pytest)" | ||
| operator: notin | ||
| values: [""] |
2 changes: 1 addition & 1 deletion
2
...taskdefs/fvt-mobile/common/taskref.yml.j2 → ...s/fvt-mobile/common/taskref-testng.yml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.