removing job-scheduler zip and replacing with distribution build #487
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,4 +14,5 @@ out/ | |
| .classpath | ||
| .vscode | ||
| bin/ | ||
| ._.DS_Store | ||
| src/test/resources/job-scheduler/ | ||
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 |
|---|---|---|
|
|
@@ -22,12 +22,16 @@ buildscript { | |
| // 2.0.0-alpha1-SNAPSHOT -> 2.0.0.0-alpha1-SNAPSHOT | ||
| version_tokens = opensearch_version.tokenize('-') | ||
| opensearch_build = version_tokens[0] + '.0' | ||
| job_scheduler_no_snapshot = opensearch_build | ||
| if (buildVersionQualifier) { | ||
| opensearch_build += "-${buildVersionQualifier}" | ||
| job_scheduler_no_snapshot += "-${buildVersionQualifier}" | ||
| } | ||
| if (isSnapshot) { | ||
| opensearch_build += "-SNAPSHOT" | ||
| } | ||
| opensearch_no_snapshot = opensearch_version.substring(0, opensearch_version.indexOf("-", opensearch_version.indexOf("-") + 1)) | ||
| js_resource_folder = "src/test/resources/job-scheduler" | ||
| common_utils_version = System.getProperty("common_utils.version", opensearch_build) | ||
| job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build) | ||
| } | ||
|
|
@@ -254,7 +258,14 @@ testClusters.integTest { | |
| return new RegularFile() { | ||
| @Override | ||
| File getAsFile() { | ||
| project.mkdir js_resource_folder | ||
| ant.get(src: 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' | ||
| + opensearch_no_snapshot | ||
| + '/latest/linux/x64/builds/opensearch/plugins/opensearch-job-scheduler-' | ||
|
There was a problem hiding this comment. I see we use hard code There was a problem hiding this comment. Since github actions offer default runner are x64 I see no problem running on hardcoded x64. There was a problem hiding this comment. This will eventually become a problem, but not just because of x64. For example, windows. For now this is fine. |
||
| + job_scheduler_no_snapshot + '.zip', | ||
ohltyler marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| dest: js_resource_folder, | ||
| httpusecaches: false) | ||
| return fileTree(js_resource_folder).getSingleFile() | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -326,7 +337,13 @@ String bwcFilePath = "src/test/resources/org/opensearch/ad/bwc/" | |
| return new RegularFile() { | ||
| @Override | ||
| File getAsFile() { | ||
| ant.get(src: 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' | ||
| + opensearch_no_snapshot | ||
| + '/latest/linux/x64/builds/opensearch/plugins/opensearch-job-scheduler-' | ||
| + job_scheduler_no_snapshot + '.zip', | ||
| dest: bwcFilePath + "job-scheduler/" + opensearch_version, | ||
| httpusecaches: false) | ||
| return fileTree(bwcFilePath + "job-scheduler/" + opensearch_version).getSingleFile() | ||
| } | ||
| } | ||
| } | ||
|
|
||
Binary file not shown.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this is just to remove the
-SNAPSHOT, can't we just persist theopensearch_buildvar as a separate var before the optional-SNAPSHOTis added on lines 30-32?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In fact, what's the difference between
job_scheduler_no_snapshotandopensearch_no_snapshot?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just replace
-SNAPSHOTwithThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
job_scheduler_no_snapshot = 2.0.0.0-alpha1
opensearch_no_snapshot = 2.0.0-alpha1
The optional -SNAPSHOT is added after adding the
.0@peterzhuamazon good call, I'll change to
opensearch_version.replace("-SNAPSHOT, "")There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ohltyler since one has the .0 and one doesn't, I changed it to
.replacefrom theopensearch_version. Might have misunderstood what you meantThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, missed that. Your change looks good to me!