Skip to content

Conversation

@amitgalitz
Copy link
Member

Description

backporting PRs #1422, #1414, #1441 to 2.x

Check List

  • Commits are signed per the DCO using --signoff.

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.

dependabot bot and others added 2 commits March 19, 2025 10:33
…pensearch-project#1422)

Bumps com.netflix.nebula.ospackage from 11.5.0 to 11.11.1.

---
updated-dependencies:
- dependency-name: com.netflix.nebula.ospackage
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Use testclusters when testing with security

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add download plugin

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Get js and security plugin

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add opensearchPlugin

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove duplicate

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Wait for yellow

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix tests

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix bwc test

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add prepareBwcTests

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to developer guide

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@codecov
Copy link

codecov bot commented Mar 21, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.66%. Comparing base (019756a) to head (57a94da).
Report is 1 commits behind head on 2.x.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##                2.x    #1442      +/-   ##
============================================
+ Coverage     81.63%   81.66%   +0.02%     
- Complexity     5871     5875       +4     
============================================
  Files           533      533              
  Lines         23665    23665              
  Branches       2374     2374              
============================================
+ Hits          19320    19326       +6     
+ Misses         3188     3183       -5     
+ Partials       1157     1156       -1     
Flag Coverage Δ
plugin 81.66% <ø> (∅)

Flags with carried forward coverage won't be shown. Click here to find out more.

see 12 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@amitgalitz
Copy link
Member Author

amitgalitz commented Mar 23, 2025

@cwperks Hey Craig I am backporting your change along with others to 2.x and I the latest code to get the job-scheduler file is having issues on getting 1.3.2 as you see in the CI.
The main cause here I think is due to this being removed:

plugin(provider(new Callable<RegularFile>(){
                @Override
                RegularFile call() throws Exception {
                    return new RegularFile() {
                        @Override
                        File getAsFile() {
                            if (new File("$project.rootDir/$bwcFilePath/job-scheduler/$bwcVersion").exists()) {
                                project.delete(files("$project.rootDir/$bwcFilePath/job-scheduler/$bwcVersion"))
                            }
                            project.mkdir bwcJobSchedulerPath + bwcVersion
                            ant.get(src: bwcOpenSearchJSDownload,
                                    dest: bwcJobSchedulerPath + bwcVersion,
                                    httpusecaches: false)
                            return fileTree(bwcJobSchedulerPath + bwcVersion).getSingleFile()
                        }
                    }
                }
            }))
            

Is it reasonable for the bwc section to return to using this? I think more specifically we were able to get job scheduler 1.3.2 for 2.x bwc tests from:
bwcOpenSearchJSDownload = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' + bwcVersionShort + '/latest/linux/x64/tar/builds/' +
'opensearch/plugins/opensearch-job-scheduler-' + bwcVersion + '.zip'

@cwperks
Copy link
Member

cwperks commented Mar 24, 2025

@amitgalitz 1.3.2 is fairly old, is it possible to refer to a later patch release for 1.3 like 1.3.19? What about using released artifacts instead of snapshot? Released artifacts will never be deleted.

@prudhvigodithi
Copy link
Member

1.3.2 is fairly old, is it possible to refer to a later patch release for 1.3 like 1.3.19? What about using released artifacts instead of snapshot? Released artifacts will never be deleted.

Yes I would recommend the same using released artifacts by removing -SNAPSHOT for already released versions.

Signed-off-by: Amit Galitzky <amgalitz@amazon.com>
@amitgalitz
Copy link
Member Author

@kaituo @cwperks all CI passes here now

@amitgalitz amitgalitz merged commit 26ffc0b into opensearch-project:2.x Apr 8, 2025
31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants