Add 2.17.0 in main branch

[bowenlan-amzn]

Description

Add 2.17.0 in main branch

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

• Functionality includes testing.
• API changes companion pull request created, if applicable.
• Public documentation issue/PR created, if applicable.

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.

[prudhvigodithi]

LGTM thanks @bowenlan-amzn.

[github-actions]

❌ Gradle check result for 8d41db9: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

[github-actions]

❌ Gradle check result for 8d41db9: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

[github-actions]

❌ Gradle check result for 8d41db9: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

[github-actions]

❌ Gradle check result for 8d41db9: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

[bowenlan-amzn]

Gradle is hitting this logic when checkout 2.x branch to build bwc distribution.

Jenkins gradle check uses bwc.checkout.align which will checkout the commit on 2.x branch that is before the last commit in this PR. And the time unfortunately is before my 2.x commit for 2.17 version, so it's using an old commit to build 2.x.

OpenSearch/buildSrc/src/main/java/org/opensearch/gradle/internal/InternalBwcGitPlugin.java

Lines 160 to 198 in f4c7ac9

	/**
	* We use a time based approach to make the bwc versions built deterministic and compatible with the current hash.
	* Most of the time we want to test against latest, but when running delayed exhaustive tests or wanting
	* reproducible builds we want this to be deterministic by using a hash that was the latest when the current
	* commit was made.
	* <p>
	* This approach doesn't work with merge commits as these can introduce commits in the chronological order
	* after the fact e.x. a merge done today can add commits dated with yesterday so the result will no longer be
	* deterministic.
	* <p>
	* We don't use merge commits, but for additional safety we check that no such commits exist in the time period
	* we are interested in.
	* <p>
	* Timestamps are at seconds resolution. rev-parse --before and --after are inclusive w.r.t the second
	* passed as input. This means the results might not be deterministic in the current second, but this
	* should not matter in practice.
	*/
	private String maybeAlignedRefSpec(Logger logger, String defaultRefSpec) {
	if (providerFactory.systemProperty("bwc.checkout.align").isPresent() == false) {
	return defaultRefSpec;
	}
	String timeOfCurrent = execInCheckoutDir(execSpec -> {
	execSpec.commandLine(asList("git", "show", "--no-patch", "--no-notes", "--pretty='%cD'"));
	execSpec.workingDir(project.getRootDir());
	});
	logger.lifecycle("Commit date of current: {}", timeOfCurrent);
	String mergeCommits = execInCheckoutDir(
	spec -> spec.commandLine(asList("git", "rev-list", defaultRefSpec, "--after", timeOfCurrent, "--merges"))
	);
	if (mergeCommits.isEmpty() == false) {
	throw new IllegalStateException("Found the following merge commits which prevent determining bwc commits: " + mergeCommits);
	}
	return execInCheckoutDir(
	spec -> spec.commandLine(asList("git", "rev-list", defaultRefSpec, "-n", "1", "--before", timeOfCurrent, "--date-order"))
	);
	}

[reta]

@bowenlan-amzn yes, it seems like the wrong commit is picked:

Commit date of current: 'Wed, 31 Jul 2024 16:01:25 -0700'
Performing checkout of opensearch-project/2.x...
Checkout hash for :distribution:bwc:minor is cc86e275030eb61da451cc9e5af3885b4e7d99c8
```

[github-actions]

❌ Gradle check result for a824df2: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

[bowenlan-amzn]

❌ Gradle check result for a824df2: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

This is a new flaky test added in #14795
@sumitasr please check

[github-actions]

❌ Gradle check result for a824df2:

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

[bowenlan-amzn]

@github-actions commented on Aug 1, 2024, 4:56 PM PDT:

❌ Gradle check result for a824df2:

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

#8131

[github-actions]

❌ Gradle check result for a824df2: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

[bowenlan-amzn]

@github-actions commented on Aug 1, 2024, 5:38 PM PDT:

❌ Gradle check result for a824df2: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

we are even seeing 2 flaky tests now

[github-actions]

❌ Gradle check result for a824df2: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

[github-actions]

✅ Gradle check result for a824df2: SUCCESS

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.83%. Comparing base (67a2e4c) to head (a824df2).

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #15053      +/-   ##
============================================
- Coverage     71.93%   71.83%   -0.10%     
+ Complexity    62900    62805      -95     
============================================
  Files          5169     5169              
  Lines        294645   294646       +1     
  Branches      42610    42610              
============================================
- Hits         211957   211670     -287     
- Misses        65296    65594     +298     
+ Partials      17392    17382      -10     

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