From 4f17d5e17b2522d7c78aa55b668d10910a87f2e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 22 Oct 2025 18:44:37 +0000 Subject: [PATCH] Onboarding new maven snapshots publishing to s3 (sql) (#4588) Signed-off-by: Peter Zhu (cherry picked from commit 279eb677dfdcc9bbceb4859f6d324ef77f5a232d) Signed-off-by: github-actions[bot] --- .github/workflows/maven-publish.yml | 18 +++++++++++------- .../spark/data/constants/SparkConstants.java | 2 +- .../dispatcher/SparkQueryDispatcherTest.java | 2 +- build.gradle | 10 ++++------ integ-test/build.gradle | 2 +- plugin/build.gradle | 9 +++++---- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 1645cd4501d..148baa073cb 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -5,11 +5,11 @@ on: push: branches: - main - - 1.* - - 2.* + - '[0-9]+.[0-9]+' + - '[0-9]+.x' env: - SNAPSHOT_REPO_URL: https://central.sonatype.com/repository/maven-snapshots/ + SNAPSHOT_REPO_URL: https://ci.opensearch.org/ci/dbc/snapshots/maven/ jobs: build-and-publish-snapshots: @@ -35,9 +35,13 @@ jobs: export-env: true env: OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} - SONATYPE_USERNAME: op://opensearch-infra-secrets/maven-central-portal-credentials/username - SONATYPE_PASSWORD: op://opensearch-infra-secrets/maven-central-portal-credentials/password - + MAVEN_SNAPSHOTS_S3_REPO: op://opensearch-infra-secrets/maven-snapshots-s3/repo + MAVEN_SNAPSHOTS_S3_ROLE: op://opensearch-infra-secrets/maven-snapshots-s3/role + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v5 + with: + role-to-assume: ${{ env.MAVEN_SNAPSHOTS_S3_ROLE }} + aws-region: us-east-1 - name: publish snapshots to maven run: | - ./gradlew publishPluginZipPublicationToSnapshotsRepository \ No newline at end of file + ./gradlew publishPluginZipPublicationToSnapshotsRepository diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/data/constants/SparkConstants.java b/async-query-core/src/main/java/org/opensearch/sql/spark/data/constants/SparkConstants.java index 0083ce6ee68..6f43a59f473 100644 --- a/async-query-core/src/main/java/org/opensearch/sql/spark/data/constants/SparkConstants.java +++ b/async-query-core/src/main/java/org/opensearch/sql/spark/data/constants/SparkConstants.java @@ -72,7 +72,7 @@ public class SparkConstants { public static final String PPL_STANDALONE_PACKAGE = "org.opensearch:opensearch-spark-ppl_2.12:0.3.0-SNAPSHOT"; public static final String AWS_SNAPSHOT_REPOSITORY = - "https://central.sonatype.com/repository/maven-snapshots/"; + "https://ci.opensearch.org/ci/dbc/snapshots/maven/"; public static final String GLUE_HIVE_CATALOG_FACTORY_CLASS = "com.amazonaws.glue.catalog.metastore.AWSGlueDataCatalogHiveClientFactory"; public static final String FLINT_DELEGATE_CATALOG = diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/SparkQueryDispatcherTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/SparkQueryDispatcherTest.java index 1fc98f15b06..24bf138ca00 100644 --- a/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/SparkQueryDispatcherTest.java +++ b/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/SparkQueryDispatcherTest.java @@ -981,7 +981,7 @@ private String constructExpectedSparkSubmitParameterString( "spark.hadoop.fs.s3.customAWSCredentialsProvider=com.amazonaws.emr.AssumeRoleAWSCredentialsProvider", "spark.hadoop.aws.catalog.credentials.provider.factory.class=com.amazonaws.glue.catalog.metastore.STSAssumeRoleSessionCredentialsProviderFactory", "spark.jars.packages=org.opensearch:opensearch-spark-standalone_2.12:0.3.0-SNAPSHOT,org.opensearch:opensearch-spark-sql-application_2.12:0.3.0-SNAPSHOT,org.opensearch:opensearch-spark-ppl_2.12:0.3.0-SNAPSHOT", - "spark.jars.repositories=https://central.sonatype.com/repository/maven-snapshots/", + "spark.jars.repositories=https://ci.opensearch.org/ci/dbc/snapshots/maven/", "spark.emr-serverless.driverEnv.JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto.x86_64/", "spark.executorEnv.JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto.x86_64/", "spark.emr-serverless.driverEnv.FLINT_CLUSTER_NAME=TEST_CLUSTER", diff --git a/build.gradle b/build.gradle index 4728364b8b1..19672946ebe 100644 --- a/build.gradle +++ b/build.gradle @@ -67,8 +67,7 @@ buildscript { repositories { mavenLocal() mavenCentral() - maven { url "https://central.sonatype.com/repository/maven-snapshots/" } - maven { url "https://ci.opensearch.org/ci/dbc/snapshots/" } + maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } } dependencies { @@ -93,9 +92,8 @@ apply plugin: 'opensearch.java-agent' repositories { mavenLocal() mavenCentral() // For Elastic Libs that you can use to get started coding until open OpenSearch libs are available - maven { url "https://central.sonatype.com/repository/maven-snapshots/" } + maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } maven { url 'https://jitpack.io' } - maven { url "https://ci.opensearch.org/ci/dbc/snapshots/" } } spotless { @@ -158,9 +156,9 @@ subprojects { repositories { mavenLocal() mavenCentral() - maven { url "https://central.sonatype.com/repository/maven-snapshots/" } + maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } + maven { url "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" } maven { url 'https://jitpack.io' } - maven { url "https://ci.opensearch.org/ci/dbc/snapshots/" } } } diff --git a/integ-test/build.gradle b/integ-test/build.gradle index e2aa605b44d..61b6c536b7c 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -70,7 +70,7 @@ ext { noticeFile = rootProject.file('NOTICE') getSecurityPluginDownloadLink = { -> - var repo = "https://central.sonatype.com/repository/maven-snapshots/org/opensearch/plugin/" + + var repo = "https://ci.opensearch.org/ci/dbc/snapshots/maven/org/opensearch/plugin/" + "opensearch-security/$opensearch_build_snapshot/" var metadataFile = Paths.get(projectDir.toString(), "build", "maven-metadata.xml").toAbsolutePath().toFile() download.run { diff --git a/plugin/build.gradle b/plugin/build.gradle index 65a24f6658e..c6d05e934fa 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -82,10 +82,11 @@ publishing { repositories { maven { name = "Snapshots" // optional target repository name - url = "https://central.sonatype.com/repository/maven-snapshots/" - credentials { - username System.getenv("SONATYPE_USERNAME") - password System.getenv("SONATYPE_PASSWORD") + url = System.getenv("MAVEN_SNAPSHOTS_S3_REPO") + credentials(AwsCredentials) { + accessKey = System.getenv("AWS_ACCESS_KEY_ID") + secretKey = System.getenv("AWS_SECRET_ACCESS_KEY") + sessionToken = System.getenv("AWS_SESSION_TOKEN") } } }