Skip to content

Commit

Permalink
Revert back to S3 repository for ML snapshot artifacts (#92381) (#92402)
Browse files Browse the repository at this point in the history
We have been having issues with reliability of downloads of artifacts
from our GCS-backed artifact repository. The root cause has been
identified and reported to GCP and a production fix is incoming. The
current ETA is January so let's just revert for now to reduce some of
the CI failure noise.

This change only affects development builds. Both snapshot and staging
builds will continue to use DRA artifacts downloaded by CI.
  • Loading branch information
mark-vieira authored Dec 15, 2022
1 parent 092c58f commit 0725a53
Showing 1 changed file with 7 additions and 25 deletions.
32 changes: 7 additions & 25 deletions x-pack/plugin/ml/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import org.elasticsearch.gradle.VersionProperties
import org.elasticsearch.gradle.internal.dra.DraResolvePlugin

apply plugin: 'elasticsearch.internal-es-plugin'
apply plugin: 'elasticsearch.internal-cluster-test'
apply plugin: 'elasticsearch.internal-test-artifact'
Expand All @@ -14,42 +11,27 @@ esplugin {
extendedPlugins = ['x-pack-autoscaling', 'lang-painless']
}

def localRepo = providers.systemProperty('build.ml_cpp.repo').orNull
if (useDra == false) {
repositories {
exclusiveContent {
filter {
includeGroup 'org.elasticsearch.ml'
}
forRepository {
ivy {
name "ml-cpp"
url providers.systemProperty('build.ml_cpp.repo').orElse('https://prelert-artifacts.s3.amazonaws.com').get()
metadataSources {
// no repository metadata, look directly for the artifact
artifact()
}
if (localRepo) {
url localRepo
patternLayout {
artifact "maven/[orgPath]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]"
}
} else {
url "https://artifacts-snapshot.elastic.co/"
patternLayout {
if (VersionProperties.isElasticsearchSnapshot()) {
artifact '/ml-cpp/[revision]/downloads/ml-cpp/[module]-[revision]-[classifier].[ext]'
} else {
// When building locally we always use snapshot artifacts even if passing `-Dbuild.snapshot=false`.
// Release builds are always done with a local repo.
artifact '/ml-cpp/[revision]-SNAPSHOT/downloads/ml-cpp/[module]-[revision]-SNAPSHOT-[classifier].[ext]'
}
}
patternLayout {
artifact "maven/org/elasticsearch/ml/ml-cpp/[revision]/[module]-[revision](-[classifier]).[ext]"
}
}
}
filter {
includeGroup 'org.elasticsearch.ml'
}
}
}

}

configurations {
Expand Down Expand Up @@ -130,4 +112,4 @@ tasks.named("dependencyLicenses").configure {
mapping from: /lucene-.*/, to: 'lucene'
}

addQaCheckDependencies(project)
addQaCheckDependencies(project)

0 comments on commit 0725a53

Please sign in to comment.