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

Version bump to 1.3.2 #485

Merged
merged 5 commits into from
Apr 29, 2022
Merged

Version bump to 1.3.2 #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38d497a
incremenet to 1.3.2
amitgalitz Apr 1, 2022
66c0d90
fixed issue with zips not being deleted before fetching
amitgalitz Apr 13, 2022
106dce0
fix bwc issue
amitgalitz Apr 13, 2022
e80e02f
changed download link to add tar folder
amitgalitz Apr 25, 2022
99617e4
fix bwc to pull latest version for ad
amitgalitz Apr 26, 2022
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
22 changes: 11 additions & 11 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,28 @@ jobs:

- name: Assemble anomaly-detection
run: |
./gradlew assemble -Dopensearch.version=1.3.1-SNAPSHOT
echo "Creating ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.3.1.0-SNAPSHOT ..."
mkdir -p ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.3.1.0-SNAPSHOT
echo "Copying ./build/distributions/*.zip to ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.3.1.0-SNAPSHOT ..."
./gradlew assemble -Dopensearch.version=1.3.2-SNAPSHOT
echo "Creating ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.3.2.0-SNAPSHOT ..."
mkdir -p ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.3.2.0-SNAPSHOT
echo "Copying ./build/distributions/*.zip to ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.3.2.0-SNAPSHOT ..."
ls ./build/distributions/
cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.3.1.0-SNAPSHOT
echo "Copied ./build/distributions/*.zip to ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.3.1.0-SNAPSHOT ..."
ls ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.3.1.0-SNAPSHOT
cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.3.2.0-SNAPSHOT
echo "Copied ./build/distributions/*.zip to ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.3.2.0-SNAPSHOT ..."
ls ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.3.2.0-SNAPSHOT
- name: Build and Run Tests
run: |
./gradlew build -Dopensearch.version=1.3.1-SNAPSHOT
./gradlew build -Dopensearch.version=1.3.2-SNAPSHOT
- name: Publish to Maven Local
run: |
./gradlew publishToMavenLocal -Dopensearch.version=1.3.1-SNAPSHOT
./gradlew publishToMavenLocal -Dopensearch.version=1.3.2-SNAPSHOT
- name: Multi Nodes Integration Testing
run: |
./gradlew integTest -PnumNodes=3
- name: Pull and Run Docker
run: |
plugin=`ls build/distributions/*.zip`
version=1.3.1
plugin_version=1.3.1.0-SNAPSHOT
version=1.3.2
plugin_version=1.3.2.0-SNAPSHOT
echo Using OpenSearch $version with AD $plugin_version
cd ..
if docker pull opensearchstaging/opensearch:$version
Expand Down
34 changes: 21 additions & 13 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,17 @@ import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
buildscript {
ext {
opensearch_group = "org.opensearch"
opensearch_version = System.getProperty("opensearch.version", "1.3.1-SNAPSHOT")
job_scheduler_version = opensearch_version.substring(0, opensearch_version.indexOf("-"))
opensearch_version = System.getProperty("opensearch.version", "1.3.2-SNAPSHOT")
plugin_version = opensearch_version.substring(0, opensearch_version.indexOf("-"))
// 1.2.0 -> 1.2.0.0, and 1.2.0-SNAPSHOT -> 1.2.0.0-SNAPSHOT
opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')
common_utils_version = System.getProperty("common_utils.version", opensearch_build)
job_scheduler_version_snapshot = System.getProperty("job_scheduler.version", opensearch_build)
js_resource_folder = "src/test/resources/job-scheduler"
job_scheduler_build_download = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' + plugin_version +
'/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-job-scheduler-' + plugin_version + '.0.zip'
anomaly_detection_build_download = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' + plugin_version +
'/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-anomaly-detection-' + plugin_version + '.0.zip'
}

repositories {
Expand Down Expand Up @@ -251,11 +255,11 @@ testClusters.integTest {
return new RegularFile() {
@Override
File getAsFile() {
if (new File("$project.rootDir/$js_resource_folder").exists()) {
project.delete(files("$project.rootDir/$js_resource_folder"))
}
project.mkdir js_resource_folder
ant.get(src: 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/'
+ job_scheduler_version
+ '/latest/linux/x64/builds/opensearch/plugins/opensearch-job-scheduler-'
+ job_scheduler_version + '.0.zip',
ant.get(src: job_scheduler_build_download,
dest: js_resource_folder)
return fileTree(js_resource_folder).getSingleFile()
}
Expand Down Expand Up @@ -316,12 +320,14 @@ task integTestRemote(type: RestIntegTestTask) {
String bwcVersion = "1.13.0.0"
String baseName = "adBwcCluster"
String bwcFilePath = "src/test/resources/org/opensearch/ad/bwc/"
String bwcJobSchedulerPath = bwcFilePath + "job-scheduler/" + opensearch_build
String bwcAnomalyDetectionPath = bwcFilePath + "anomaly-detection/" + opensearch_build

2.times {i ->
testClusters {
"${baseName}$i" {
testDistribution = "ARCHIVE"
versions = ["7.10.2","1.3.1-SNAPSHOT"]
versions = ["7.10.2","1.3.2-SNAPSHOT"]
numberOfNodes = 3
plugin(provider(new Callable<RegularFile>(){
@Override
Expand Down Expand Up @@ -358,12 +364,14 @@ List<Provider<RegularFile>> plugins = [
return new RegularFile() {
@Override
File getAsFile() {
ant.get(src: 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/'
+ job_scheduler_version
+ '/latest/linux/x64/builds/opensearch/plugins/opensearch-job-scheduler-'
+ job_scheduler_version + '.0.zip',
dest: bwcFilePath + "job-scheduler/" + job_scheduler_version)
return fileTree(bwcFilePath + "job-scheduler/" + job_scheduler_version).getSingleFile()
if (new File("$project.rootDir/$bwcFilePath/job-scheduler/$opensearch_build").exists()) {
project.delete(files("$project.rootDir/$bwcFilePath/job-scheduler/$opensearch_build"))
}
project.mkdir bwcJobSchedulerPath
ant.get(src: job_scheduler_build_download,
dest: bwcJobSchedulerPath,
httpusecaches: false)
return fileTree(bwcJobSchedulerPath).getSingleFile()
}
}
}
Expand Down