diff --git a/build.gradle b/build.gradle index 6a2afe92a..e69980466 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,10 @@ buildscript { '/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' + bwcOpenDistroADDownload = 'https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/' + + 'opendistro-anomaly-detection/opendistro-anomaly-detection-1.13.0.0.zip' + bwcOpenDistroJSDownload = 'https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/' + + 'opendistro-job-scheduler/opendistro-job-scheduler-1.13.0.0.zip' } repositories { @@ -325,8 +329,8 @@ 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 +String bwcJobSchedulerPath = bwcFilePath + "job-scheduler/" +String bwcAnomalyDetectionPath = bwcFilePath + "anomaly-detection/" 2.times {i -> testClusters { @@ -340,7 +344,14 @@ String bwcAnomalyDetectionPath = bwcFilePath + "anomaly-detection/" + opensearch return new RegularFile() { @Override File getAsFile() { - return fileTree(bwcFilePath + "job-scheduler/" + bwcVersion).getSingleFile() + 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: bwcOpenDistroJSDownload, + dest: bwcJobSchedulerPath + bwcVersion, + httpusecaches: false) + return fileTree(bwcJobSchedulerPath + bwcVersion).getSingleFile() } } } @@ -351,7 +362,14 @@ String bwcAnomalyDetectionPath = bwcFilePath + "anomaly-detection/" + opensearch return new RegularFile() { @Override File getAsFile() { - return fileTree(bwcFilePath + "anomaly-detection/" + bwcVersion).getSingleFile() + if (new File("$project.rootDir/$bwcFilePath/anomaly-detection/$bwcVersion").exists()) { + project.delete(files("$project.rootDir/$bwcFilePath/anomaly-detection/$bwcVersion")) + } + project.mkdir bwcAnomalyDetectionPath + bwcVersion + ant.get(src: bwcOpenDistroADDownload, + dest: bwcAnomalyDetectionPath + bwcVersion, + httpusecaches: false) + return fileTree(bwcAnomalyDetectionPath + bwcVersion).getSingleFile() } } } @@ -372,11 +390,11 @@ List> plugins = [ if (new File("$project.rootDir/$bwcFilePath/job-scheduler/$opensearch_build").exists()) { project.delete(files("$project.rootDir/$bwcFilePath/job-scheduler/$opensearch_build")) } - project.mkdir bwcJobSchedulerPath + project.mkdir bwcJobSchedulerPath + opensearch_build ant.get(src: job_scheduler_build_download, - dest: bwcJobSchedulerPath, + dest: bwcJobSchedulerPath + opensearch_build, httpusecaches: false) - return fileTree(bwcJobSchedulerPath).getSingleFile() + return fileTree(bwcJobSchedulerPath + opensearch_build).getSingleFile() } } } @@ -387,7 +405,14 @@ List> plugins = [ return new RegularFile() { @Override File getAsFile() { - return fileTree(bwcFilePath + "anomaly-detection/" + project.version).getSingleFile() + if (new File("$project.rootDir/$bwcFilePath/anomaly-detection/$opensearch_build").exists()) { + project.delete(files("$project.rootDir/$bwcFilePath/anomaly-detection/$opensearch_build")) + } + project.mkdir bwcAnomalyDetectionPath + opensearch_build + ant.get(src: anomaly_detection_build_download, + dest: bwcAnomalyDetectionPath + opensearch_build, + httpusecaches: false) + return fileTree(bwcAnomalyDetectionPath + opensearch_build).getSingleFile() } } } diff --git a/src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.1.0.0-SNAPSHOT/opensearch-anomaly-detection-1.1.0.0-SNAPSHOT.zip b/src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.1.0.0-SNAPSHOT/opensearch-anomaly-detection-1.1.0.0-SNAPSHOT.zip deleted file mode 100644 index 88441f912..000000000 Binary files a/src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.1.0.0-SNAPSHOT/opensearch-anomaly-detection-1.1.0.0-SNAPSHOT.zip and /dev/null differ diff --git a/src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.13.0.0/opendistro-anomaly-detection-1.13.0.0.zip b/src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.13.0.0/opendistro-anomaly-detection-1.13.0.0.zip deleted file mode 100644 index a68b74704..000000000 Binary files a/src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.13.0.0/opendistro-anomaly-detection-1.13.0.0.zip and /dev/null differ diff --git a/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.13.0.0/opendistro-job-scheduler-1.13.0.0.zip b/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.13.0.0/opendistro-job-scheduler-1.13.0.0.zip deleted file mode 100644 index daf3b8f73..000000000 Binary files a/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.13.0.0/opendistro-job-scheduler-1.13.0.0.zip and /dev/null differ diff --git a/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.2.0.0-SNAPSHOT/opensearch-job-scheduler-1.2.0.0-SNAPSHOT.zip b/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.2.0.0-SNAPSHOT/opensearch-job-scheduler-1.2.0.0-SNAPSHOT.zip deleted file mode 100644 index 53c0668a1..000000000 Binary files a/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.2.0.0-SNAPSHOT/opensearch-job-scheduler-1.2.0.0-SNAPSHOT.zip and /dev/null differ diff --git a/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.3.0.0-SNAPSHOT/opensearch-job-scheduler-1.3.0.0-SNAPSHOT.zip b/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.3.0.0-SNAPSHOT/opensearch-job-scheduler-1.3.0.0-SNAPSHOT.zip deleted file mode 100644 index 70d403410..000000000 Binary files a/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.3.0.0-SNAPSHOT/opensearch-job-scheduler-1.3.0.0-SNAPSHOT.zip and /dev/null differ