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.

Sign up for GitHub

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

Switch ftrepo checkout based on ref instead of commit_id #4419

Merged
merged 4 commits into from
Feb 7, 2024
Merged

Switch ftrepo checkout based on ref instead of commit_id #4419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77000a9
Switch ftrepo checkout based on ref instead of commit_id
peterzhuamazon Feb 6, 2024
aa20bfa
update test cases
peterzhuamazon Feb 6, 2024
0698296
Update isort/flake8
peterzhuamazon Feb 6, 2024
b20449b
Fix isort again
peterzhuamazon Feb 6, 2024
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 src/test_workflow/integ_test/integ_test_suite_opensearch_dashboards.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def __init__(

self.repo = GitRepository(
build_manifest_opensearch_dashboards.components['functionalTestDashboards'].repository,
build_manifest_opensearch_dashboards.components['functionalTestDashboards'].commit_id,
build_manifest_opensearch_dashboards.components['functionalTestDashboards'].ref,
peterzhuamazon marked this conversation as resolved.
Show resolved Hide resolved
os.path.join(self.work_dir, self.component.name),
test_config.working_directory
)
Expand Down
135 changes: 135 additions & 0 deletions tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest_osd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
---
peterzhuamazon marked this conversation as resolved.
Show resolved Hide resolved
schema-version: '1.2'
build:
name: OpenSearch Dashboards
version: 2.12.0
platform: windows
architecture: x64
distribution: zip
id: '7236'
components:
- name: OpenSearch-Dashboards
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
ref: 2.x
commit_id: 0926ae6319a455d711a61ca5ace2e61a511b9878
artifacts:
dist:
- dist\opensearch-dashboards-min-2.12.0-windows-x64.zip
version: 2.12.0.0
- name: functionalTestDashboards
repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
ref: 2.x
commit_id: f871b2011095122faaa4558556d831a290a4ef15
version: 2.12.0.0
- name: observabilityDashboards
repository: https://github.com/opensearch-project/dashboards-observability.git
ref: 2.x
commit_id: 7442e6f60d1c6790c82fde3c5d141a7a04c7f9c2
artifacts:
plugins:
- plugins\observabilityDashboards-2.12.0.zip
version: 2.12.0.0
- name: reportsDashboards
repository: https://github.com/opensearch-project/dashboards-reporting.git
ref: 2.x
commit_id: b31a1475eedb736dfd0ae8b430c1af73adc4fd81
artifacts:
plugins:
- plugins\reportsDashboards-2.12.0.zip
version: 2.12.0.0
- name: ganttChartDashboards
repository: https://github.com/opensearch-project/dashboards-visualizations.git
ref: 2.x
commit_id: 07dbfc7a6147369084df11e99ab3680596a33ab3
artifacts:
plugins:
- plugins\ganttChartDashboards-2.12.0.zip
version: 2.12.0.0
- name: queryWorkbenchDashboards
repository: https://github.com/opensearch-project/dashboards-query-workbench.git
ref: 2.x
commit_id: 36e879a406359f7e98b7226840fae0f956b602a3
artifacts:
plugins:
- plugins\queryWorkbenchDashboards-2.12.0.zip
version: 2.12.0.0
- name: anomalyDetectionDashboards
repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin
ref: 2.x
commit_id: 1f019eb5e99f4b53ce8dea28751bfc4e3af6004f
artifacts:
plugins:
- plugins\anomalyDetectionDashboards-2.12.0.zip
version: 2.12.0.0
- name: mlCommonsDashboards
repository: https://github.com/opensearch-project/ml-commons-dashboards.git
ref: 2.x
commit_id: d28607d0dc67c961774ec6742ac12de167da1679
artifacts:
plugins:
- plugins\mlCommonsDashboards-2.12.0.zip
version: 2.12.0.0
- name: indexManagementDashboards
repository: https://github.com/opensearch-project/index-management-dashboards-plugin.git
ref: 2.x
commit_id: 461de48fdbcdaaac5cfd48b05f42f8c35e60f3c1
artifacts:
plugins:
- plugins\indexManagementDashboards-2.12.0.zip
version: 2.12.0.0
- name: notificationsDashboards
repository: https://github.com/opensearch-project/dashboards-notifications.git
ref: 2.x
commit_id: 9559b3a93531831045d99a1eb33a60b8b253f16e
artifacts:
plugins:
- plugins\notificationsDashboards-2.12.0.zip
version: 2.12.0.0
- name: alertingDashboards
repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git
ref: 2.x
commit_id: 607b2d7f83a2fcb82ae03641dc74e018aad53ead
artifacts:
plugins:
- plugins\alertingDashboards-2.12.0.zip
version: 2.12.0.0
- name: securityAnalyticsDashboards
repository: https://github.com/opensearch-project/security-analytics-dashboards-plugin.git
ref: 2.x
commit_id: 388eb6f1f4f3a6e7bd4e457bdd277e4cdb846727
artifacts:
plugins:
- plugins\securityAnalyticsDashboards-2.12.0.zip
version: 2.12.0.0
- name: securityDashboards
repository: https://github.com/opensearch-project/security-dashboards-plugin.git
ref: 2.x
commit_id: bd8da9fe07ba61cfb7c9171f846face2cad514df
artifacts:
plugins:
- plugins\securityDashboards-2.12.0.zip
version: 2.12.0.0
- name: searchRelevanceDashboards
repository: https://github.com/opensearch-project/dashboards-search-relevance.git
ref: 2.x
commit_id: 25a93d1f70c841402cf71ae9f4fa3660621f3b80
artifacts:
plugins:
- plugins\searchRelevanceDashboards-2.12.0.zip
version: 2.12.0.0
- name: customImportMapDashboards
repository: https://github.com/opensearch-project/dashboards-maps.git
ref: 2.x
commit_id: 823816e001336e75b59b0f2c72e563060f07a7e6
artifacts:
plugins:
- plugins\customImportMapDashboards-2.12.0.zip
version: 2.12.0.0
- name: assistantDashboards
repository: https://github.com/opensearch-project/dashboards-assistant.git
ref: 2.x
commit_id: 6be636550e1d0462f1e34727a7f00f67667fda7a
artifacts:
plugins:
- plugins\assistantDashboards-2.12.0.zip
version: 2.12.0.0
90 changes: 90 additions & 0 deletions tests/tests_test_workflow/test_integ_workflow/integ_test/data/bundle_manifest_osd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
---
schema-version: '1.1'
build:
name: OpenSearch Dashboards
version: 2.12.0
platform: windows
architecture: x64
distribution: zip
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/dist/opensearch-dashboards/opensearch-dashboards-2.12.0-windows-x64.zip
id: '7236'
components:
- name: OpenSearch-Dashboards
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
ref: 2.x
commit_id: 0926ae6319a455d711a61ca5ace2e61a511b9878
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/dist\opensearch-dashboards-min-2.12.0-windows-x64.zip
- name: functionalTestDashboards
repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
ref: 2.x
commit_id: f871b2011095122faaa4558556d831a290a4ef15
- name: observabilityDashboards
repository: https://github.com/opensearch-project/dashboards-observability.git
ref: 2.x
commit_id: 7442e6f60d1c6790c82fde3c5d141a7a04c7f9c2
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\observabilityDashboards-2.12.0.zip
- name: reportsDashboards
repository: https://github.com/opensearch-project/dashboards-reporting.git
ref: 2.x
commit_id: b31a1475eedb736dfd0ae8b430c1af73adc4fd81
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\reportsDashboards-2.12.0.zip
- name: ganttChartDashboards
repository: https://github.com/opensearch-project/dashboards-visualizations.git
ref: 2.x
commit_id: 07dbfc7a6147369084df11e99ab3680596a33ab3
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\ganttChartDashboards-2.12.0.zip
- name: queryWorkbenchDashboards
repository: https://github.com/opensearch-project/dashboards-query-workbench.git
ref: 2.x
commit_id: 36e879a406359f7e98b7226840fae0f956b602a3
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\queryWorkbenchDashboards-2.12.0.zip
- name: anomalyDetectionDashboards
repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin
ref: 2.x
commit_id: 1f019eb5e99f4b53ce8dea28751bfc4e3af6004f
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\anomalyDetectionDashboards-2.12.0.zip
- name: mlCommonsDashboards
repository: https://github.com/opensearch-project/ml-commons-dashboards.git
ref: 2.x
commit_id: d28607d0dc67c961774ec6742ac12de167da1679
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\mlCommonsDashboards-2.12.0.zip
- name: indexManagementDashboards
repository: https://github.com/opensearch-project/index-management-dashboards-plugin.git
ref: 2.x
commit_id: 461de48fdbcdaaac5cfd48b05f42f8c35e60f3c1
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\indexManagementDashboards-2.12.0.zip
- name: notificationsDashboards
repository: https://github.com/opensearch-project/dashboards-notifications.git
ref: 2.x
commit_id: 9559b3a93531831045d99a1eb33a60b8b253f16e
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\notificationsDashboards-2.12.0.zip
- name: alertingDashboards
repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git
ref: 2.x
commit_id: 607b2d7f83a2fcb82ae03641dc74e018aad53ead
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\alertingDashboards-2.12.0.zip
- name: securityAnalyticsDashboards
repository: https://github.com/opensearch-project/security-analytics-dashboards-plugin.git
ref: 2.x
commit_id: 388eb6f1f4f3a6e7bd4e457bdd277e4cdb846727
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\securityAnalyticsDashboards-2.12.0.zip
- name: securityDashboards
repository: https://github.com/opensearch-project/security-dashboards-plugin.git
ref: 2.x
commit_id: bd8da9fe07ba61cfb7c9171f846face2cad514df
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\securityDashboards-2.12.0.zip
- name: searchRelevanceDashboards
repository: https://github.com/opensearch-project/dashboards-search-relevance.git
ref: 2.x
commit_id: 25a93d1f70c841402cf71ae9f4fa3660621f3b80
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\searchRelevanceDashboards-2.12.0.zip
- name: customImportMapDashboards
repository: https://github.com/opensearch-project/dashboards-maps.git
ref: 2.x
commit_id: 823816e001336e75b59b0f2c72e563060f07a7e6
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\customImportMapDashboards-2.12.0.zip
- name: assistantDashboards
repository: https://github.com/opensearch-project/dashboards-assistant.git
ref: 2.x
commit_id: 6be636550e1d0462f1e34727a7f00f67667fda7a
location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.12.0/7236/windows/x64/zip/builds/opensearch-dashboards/plugins\assistantDashboards-2.12.0.zip
Loading
Loading