From 27d4cee4f172efc03bb381005696b2eca30d558b Mon Sep 17 00:00:00 2001 From: Divya Madala <113469545+Divyaasm@users.noreply.github.com> Date: Tue, 9 Jan 2024 12:49:45 -0800 Subject: [PATCH] Update getIndexFileRoot path in BuildManifest (#353) Signed-off-by: Divya Madala --- .github/workflows/version-increment.yml | 2 +- build.gradle | 2 +- src/jenkins/BuildManifest.groovy | 6 +++++- tests/jenkins/jobs/BuildManifest_Jenkinsfile.txt | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/version-increment.yml b/.github/workflows/version-increment.yml index 738f57761..5830707a9 100644 --- a/.github/workflows/version-increment.yml +++ b/.github/workflows/version-increment.yml @@ -33,7 +33,7 @@ jobs: uses: peter-evans/create-pull-request@v4 with: token: ${{ steps.github_app_token.outputs.token }} - base: '5.x' + base: '6.x' committer: opensearch-ci-bot author: opensearch-ci-bot commit-message: | diff --git a/build.gradle b/build.gradle index 1a88de297..d7eea41fb 100644 --- a/build.gradle +++ b/build.gradle @@ -121,7 +121,7 @@ jacocoTestReport { } } -String version = '5.12.0' +String version = '6.0.0' task updateVersion { doLast { diff --git a/src/jenkins/BuildManifest.groovy b/src/jenkins/BuildManifest.groovy index 221a51c13..cf300dcb2 100644 --- a/src/jenkins/BuildManifest.groovy +++ b/src/jenkins/BuildManifest.groovy @@ -116,7 +116,11 @@ class BuildManifest implements Serializable { public String getIndexFileRoot(String jobName) { return [ jobName, - this.build.version + this.build.version, + "index", + this.build.platform, + this.build.architecture, + this.build.distribution ].join("/") } diff --git a/tests/jenkins/jobs/BuildManifest_Jenkinsfile.txt b/tests/jenkins/jobs/BuildManifest_Jenkinsfile.txt index c1f3602f8..b922db96f 100644 --- a/tests/jenkins/jobs/BuildManifest_Jenkinsfile.txt +++ b/tests/jenkins/jobs/BuildManifest_Jenkinsfile.txt @@ -28,7 +28,7 @@ BuildManifest.getMinArtifact() BuildManifest_Jenkinsfile.echo(dist/opensearch-min-1.1.0-linux-x64.tar.gz) BuildManifest.getIndexFileRoot(distribution-build-opensearch) - BuildManifest_Jenkinsfile.echo(distribution-build-opensearch/1.1.0) + BuildManifest_Jenkinsfile.echo(distribution-build-opensearch/1.1.0/index/linux/x64/tar) BuildManifest.getCommitId(OpenSearch) BuildManifest_Jenkinsfile.echo(b7334f49d530ffd1a3f7bd0e5832b9b2a9caa583) BuildManifest.getRepo(OpenSearch)