Add new fields to integration test and distribution build publish libraries #496

prudhvigodithi · 2024-09-12T21:27:59Z

Description

Add new component_repo and component_repo_url fields for both the distribution and integration test publish libs. With these fields all the distribution and integration test documents can be filtered by component_repo (or component_repo_url).
Since the OSD integration tests has multiple CI groups, filtering by component_repo should give the all the CI groups test failures.
The new fields test_stdout and test_stderr for both with-security and without-security should give users direct downloads links for the stderr and stdout errors. Thanks to @peterzhuamazon coming from Add test_stdout and test_stderr path/url for test-report.yml opensearch-build#5001.

Issues Resolved

Part of opensearch-project/opensearch-metrics#72 and opensearch-project/opensearch-metrics#51

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

codecov · 2024-09-12T22:33:05Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.32%. Comparing base (d88c840) to head (cb4c52e).
Report is 2 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff            @@
##               main     #496   +/-   ##
=========================================
  Coverage     84.32%   84.32%           
  Complexity       80       80           
=========================================
  Files           108      108           
  Lines           523      523           
  Branches         61       61           
=========================================
  Hits            441      441           
  Misses           26       26           
  Partials         56       56

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

prudhvigodithi · 2024-09-16T17:07:30Z

Testing, following is the generate sample JSON documents which has all the added new fields

Integration test results

{
  "_index": "opensearch-integration-test-results-09-2024",
  "_id": "k4rD-5EBKO-WGAnwaj9C",
  "_version": 1,
  "_score": null,
  "_source": {
    "component": "skills",
    "component_repo": "skills",
    "component_repo_url": "https://github.com/opensearch-project/skills.git",
    "version": "2.17.0",
    "integ_test_build_number": 87,
    "integ_test_build_url": "https://ci-staging.opensearch.org/job/pgodithi/job/integ-test-publish/87/display/redirect",
    "distribution_build_number": "10292",
    "distribution_build_url": "https://build.ci.opensearch.org/blue/organizations/jenkins/distribution-build-opensearch/detail/distribution-build-opensearch/10154/pipeline",
    "build_start_time": 1726505450200,
    "rc": true,
    "rc_number": 6,
    "platform": "linux",
    "architecture": "arm64",
    "distribution": "tar",
    "component_category": "OpenSearch",
    "component_build_result": "passed",
    "test_report_manifest_yml": "https://ci.opensearch.org/ci/dbc/pgodithi/integ-test-publish/2.17.0/10292/linux/arm64/tar/test-results/87/integ-test/test-report.yml",
    "with_security": "pass",
    "with_security_build_yml": "https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/with-security/skills.yml",
    "with_security_cluster_stdout": [
      "https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/with-security/local-cluster-logs/id-0/stdout.txt"
    ],
    "with_security_cluster_stderr": [
      "https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/with-security/local-cluster-logs/id-0/stderr.txt"
    ],
    "with_security_test_stdout": "https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/with-security/stdout.txt",
    "with_security_test_stderr": "https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/with-security/stderr.txt",
    "without_security": "pass",
    "without_security_build_yml": "https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/without-security/skills.yml",
    "without_security_cluster_stdout": [
      "https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/without-security/local-cluster-logs/id-1/stdout.txt"
    ],
    "without_security_cluster_stderr": [
      "https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/without-security/local-cluster-logs/id-1/stderr.txt"
    ],
    "without_security_test_stdout": "https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/without-security/stdout.txt",
    "without_security_test_stderr": "https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/without-security/stderr.txt"
  },
  "fields": {
    "build_start_time": [
      "2024-09-16T16:50:50.200Z"
    ]
  },
  "sort": [
    1726505450200
  ]
}

Distribution build results

{
  "_index": "opensearch-distribution-build-results-09-2024",
  "_id": "Pq3N-5EBDMw2GPZSOcoY",
  "_version": 1,
  "_score": null,
  "_source": {
    "component": "OpenSearch",
    "component_repo": "OpenSearch",
    "component_repo_url": "https://github.com/opensearch-project/OpenSearch.git",
    "component_ref": "tags/2.16.0",
    "version": "2.16.0",
    "distribution_build_number": 6530,
    "distribution_build_url": "https://ci-staging.opensearch.org/job/pgodithi/job/distribution-build-opensearch/6530/display/redirect",
    "build_start_time": 1726505558993,
    "rc": false,
    "rc_number": 0,
    "component_category": "OpenSearch",
    "component_build_result": "passed"
  },
  "fields": {
    "build_start_time": [
      "2024-09-16T16:52:38.993Z"
    ]
  },
  "sort": [
    1726505558993
  ]
}

tests/jenkins/TestPublishDistributionBuildResults.groovy

peterzhuamazon · 2024-09-16T18:58:21Z

vars/publishIntegTestResults.groovy

@@ -54,25 +54,32 @@ void call(Map args = [:]) {

    manifest.components.each { component ->
        def componentName = component.name
+        def componentRepo = component.repository.split('/')[-1].replace('.git', '')
+        def componentRepoUrl = component.repository


I think we should also remove .git here as sometimes people didnt add that in input manifest, causing bundle manifest to sometimes have .git sometimes not, which will make your data diverse for the same component at times.

I feel like we should also try to remove everything before github.com as people tend to mistype https vs http or anything, causing diverse data.

so component repo url should just show opensearch-project/OpenSearch.

Got It you mean https://github.com/opensearch-project/{component_name}, but this would cause problems in long term if we have to build and publish plugins from other org apart from opensearch-project. Also @peterzhuamazon with your automation the manifests are now auto generated from past release manifests so technically no errors and anyhow we review for new plugins that are added. Also if merged with errors and fixed later the new documents indexed will have the updated value for the component_repo_url.

No, just strip https:// http:// .git and then index.
You dont need to hardcode the opensearch-project.
Index as github.com/opensearch-project/OpenSearch or similar.

I was thinking index as https://github.com/opensearch-project/OpenSearch and using OSD scripted fields just add opensearch-project/OpenSearch to reduce the field length for visualizations, but during any query it would return the full URL as https://github.com/opensearch-project/OpenSearch.

does it matter?
url with or without .git takes you to the same page.
Also, didn't get the reason behind dropping https?

Its because Rishab, when we browse (just try copy pasting this in browser) github.com/opensearch-project/OpenSearch, it should add https:// and add take us to the repo.

prudhvigodithi · 2024-09-16T21:13:16Z

I can see the following after the latest commit, please check

Integration test publish:

    "component": "skills",
    "component_repo": "skills",
    "component_repo_url": "github.com/opensearch-project/skills",

Distribution build publish:

    "component": "OpenSearch",
    "component_repo": "OpenSearch",
    "component_repo_url": "github.com/opensearch-project/OpenSearch",
    "component_ref": "tags/2.16.0",

vars/publishIntegTestResults.groovy

Signed-off-by: Prudhvi Godithi <[email protected]>

peterzhuamazon · 2024-09-16T23:06:58Z

This PR will share the same version:
#497

Thanks.

…raries (#496) Signed-off-by: Prudhvi Godithi <[email protected]> (cherry picked from commit 5cc8d08) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

prudhvigodithi force-pushed the main branch 2 times, most recently from 15318c9 to a284fbd Compare September 12, 2024 21:55

prudhvigodithi changed the title ~~Add new component_repo and component_repo_url fields~~ Add new fields to integration test and distribution build publish libraries Sep 12, 2024

prudhvigodithi force-pushed the main branch from a284fbd to ddda5cd Compare September 12, 2024 22:14

prudhvigodithi self-assigned this Sep 13, 2024

prudhvigodithi force-pushed the main branch 4 times, most recently from a4af87d to e30b297 Compare September 16, 2024 16:44

prudhvigodithi closed this Sep 16, 2024

prudhvigodithi force-pushed the main branch from e30b297 to d88c840 Compare September 16, 2024 16:46

prudhvigodithi reopened this Sep 16, 2024

prudhvigodithi force-pushed the main branch from 0e42cce to 2ccf852 Compare September 16, 2024 16:50

prudhvigodithi marked this pull request as ready for review September 16, 2024 16:52

prudhvigodithi requested review from peterzhuamazon, gaiksaya, rishabh6788, Divyaasm and zelinh as code owners September 16, 2024 16:52

peterzhuamazon reviewed Sep 16, 2024

View reviewed changes

prudhvigodithi force-pushed the main branch from 2ccf852 to 2714a73 Compare September 16, 2024 20:56

peterzhuamazon reviewed Sep 16, 2024

View reviewed changes

vars/publishIntegTestResults.groovy Outdated Show resolved Hide resolved

Add new fields to the metrics publish libraries

cb4c52e

Signed-off-by: Prudhvi Godithi <[email protected]>

prudhvigodithi force-pushed the main branch from 2714a73 to cb4c52e Compare September 16, 2024 22:57

peterzhuamazon approved these changes Sep 16, 2024

View reviewed changes

prudhvigodithi merged commit 5cc8d08 into opensearch-project:main Sep 17, 2024
9 checks passed

peterzhuamazon added the backport 6.x label Sep 17, 2024

opensearch-trigger-bot bot mentioned this pull request Sep 17, 2024

[Backport 6.x] Add new fields to integration test and distribution build publish libraries #502

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add new fields to integration test and distribution build publish libraries #496

Add new fields to integration test and distribution build publish libraries #496

prudhvigodithi commented Sep 12, 2024 •

edited

Loading

codecov bot commented Sep 12, 2024 •

edited

Loading

prudhvigodithi commented Sep 16, 2024

peterzhuamazon Sep 16, 2024

peterzhuamazon Sep 16, 2024

peterzhuamazon Sep 16, 2024 •

edited

Loading

prudhvigodithi Sep 16, 2024 •

edited

Loading

peterzhuamazon Sep 16, 2024 •

edited

Loading

prudhvigodithi Sep 16, 2024

rishabh6788 Sep 16, 2024

prudhvigodithi Sep 16, 2024

prudhvigodithi commented Sep 16, 2024

peterzhuamazon commented Sep 16, 2024

Add new fields to integration test and distribution build publish libraries #496

Add new fields to integration test and distribution build publish libraries #496

Conversation

prudhvigodithi commented Sep 12, 2024 • edited Loading

Description

Issues Resolved

codecov bot commented Sep 12, 2024 • edited Loading

Codecov Report

prudhvigodithi commented Sep 16, 2024

Testing, following is the generate sample JSON documents which has all the added new fields

Integration test results

Distribution build results

peterzhuamazon Sep 16, 2024

Choose a reason for hiding this comment

peterzhuamazon Sep 16, 2024

Choose a reason for hiding this comment

peterzhuamazon Sep 16, 2024 • edited Loading

Choose a reason for hiding this comment

prudhvigodithi Sep 16, 2024 • edited Loading

Choose a reason for hiding this comment

peterzhuamazon Sep 16, 2024 • edited Loading

Choose a reason for hiding this comment

prudhvigodithi Sep 16, 2024

Choose a reason for hiding this comment

rishabh6788 Sep 16, 2024

Choose a reason for hiding this comment

prudhvigodithi Sep 16, 2024

Choose a reason for hiding this comment

prudhvigodithi commented Sep 16, 2024

Integration test publish:

Distribution build publish:

peterzhuamazon commented Sep 16, 2024

prudhvigodithi commented Sep 12, 2024 •

edited

Loading

codecov bot commented Sep 12, 2024 •

edited

Loading

peterzhuamazon Sep 16, 2024 •

edited

Loading

prudhvigodithi Sep 16, 2024 •

edited

Loading

peterzhuamazon Sep 16, 2024 •

edited

Loading