removing job-scheduler zip and replacing with distribution build (#487)

* removing job-scheduler zip and replacign with distribution build Signed-off-by: Amit Galitzky <[email protected]> * added constants Signed-off-by: Amit Galitzky <[email protected]>
opensearch-project · Apr 4, 2022 · 70a76b2 · 70a76b2
1 parent 80beb7c
commit 70a76b2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,5 @@ out/
 .classpath
 .vscode
 bin/
-._.DS_Store
+._.DS_Store
+src/test/resources/job-scheduler/
diff --git a/build.gradle b/build.gradle
@@ -22,14 +22,20 @@ 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.replace("-SNAPSHOT","")
+        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)
+        job_scheduler_build_download = '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'
     }
 
     repositories {
@@ -254,7 +260,11 @@ testClusters.integTest {
             return new RegularFile() {
                 @Override
                 File getAsFile() {
-                    return fileTree("src/test/resources/job-scheduler").getSingleFile()
+                    project.mkdir js_resource_folder
+                    ant.get(src: job_scheduler_build_download,
+                            dest: js_resource_folder,
+                            httpusecaches: false)
+                    return fileTree(js_resource_folder).getSingleFile()
                 }
             }
         }
@@ -326,7 +336,10 @@ String bwcFilePath = "src/test/resources/org/opensearch/ad/bwc/"
                     return new RegularFile() {
                         @Override
                         File getAsFile() {
-                            return fileTree(bwcFilePath + "job-scheduler/" + bwcVersion).getSingleFile()
+                            ant.get(src: job_scheduler_build_download,
+                                    dest: bwcFilePath + "job-scheduler/" + opensearch_version,
+                                    httpusecaches: false)
+                            return fileTree(bwcFilePath + "job-scheduler/" + opensearch_version).getSingleFile()
                         }
                     }
                 }

diff --git a/src/test/resources/job-scheduler/opensearch-job-scheduler-2.0.0.0-SNAPSHOT.zip b/src/test/resources/job-scheduler/opensearch-job-scheduler-2.0.0.0-SNAPSHOT.zip