Priorize snapshot builds in distribution downloader

In the Security plugin's BWC tests there have been an issue with stale artifacts, when troubleshooting we noticed that a release candidate for OpenSearch 3.0.0 was being picked up in priority before the latest snapshot build. This was causing build failures preventing our tests from running. - Related opensearch-project/security#3020 Signed-off-by: Peter Nied <[email protected]>
peternied · Jul 17, 2023 · d0d3f33 · d0d3f33
1 parent 688c53f
commit d0d3f33
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/DistributionDownloadPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/DistributionDownloadPlugin.java
@@ -181,30 +181,30 @@ private static void setupDownloadServiceRepo(Project project) {
         String distributionDownloadType = customDistributionDownloadType != null
             && customDistributionDownloadType.toString().equals("bundle") ? "bundle" : "min";
         if (customDistributionUrl != null) {
-            addIvyRepo(project, DOWNLOAD_REPO_NAME, customDistributionUrl.toString(), FAKE_IVY_GROUP, "");
             addIvyRepo(project, SNAPSHOT_REPO_NAME, customDistributionUrl.toString(), FAKE_SNAPSHOT_IVY_GROUP, "");
+            addIvyRepo(project, DOWNLOAD_REPO_NAME, customDistributionUrl.toString(), FAKE_IVY_GROUP, "");
             return;
         }
         switch (distributionDownloadType) {
             case "bundle":
-                addIvyRepo(project, DOWNLOAD_REPO_NAME, "https://ci.opensearch.org", FAKE_IVY_GROUP, BUNDLE_PATTERN_LAYOUT);
                 addIvyRepo(project, SNAPSHOT_REPO_NAME, "https://ci.opensearch.org", FAKE_SNAPSHOT_IVY_GROUP, BUNDLE_PATTERN_LAYOUT);
+                addIvyRepo(project, DOWNLOAD_REPO_NAME, "https://ci.opensearch.org", FAKE_IVY_GROUP, BUNDLE_PATTERN_LAYOUT);
                 break;
             case "min":
                 addIvyRepo(
                     project,
-                    DOWNLOAD_REPO_NAME,
+                    SNAPSHOT_REPO_NAME,
                     "https://artifacts.opensearch.org",
-                    FAKE_IVY_GROUP,
-                    "/releases" + RELEASE_PATTERN_LAYOUT,
-                    "/release-candidates" + RELEASE_PATTERN_LAYOUT
+                    FAKE_SNAPSHOT_IVY_GROUP,
+                    SNAPSHOT_PATTERN_LAYOUT
                 );
                 addIvyRepo(
                     project,
-                    SNAPSHOT_REPO_NAME,
+                    DOWNLOAD_REPO_NAME,
                     "https://artifacts.opensearch.org",
-                    FAKE_SNAPSHOT_IVY_GROUP,
-                    SNAPSHOT_PATTERN_LAYOUT
+                    FAKE_IVY_GROUP,
+                    "/releases" + RELEASE_PATTERN_LAYOUT,
+                    "/release-candidates" + RELEASE_PATTERN_LAYOUT
                 );
                 break;
             default: