Update getIndexFileRoot path in BuildManifest (opensearch-project#353)

Signed-off-by: Divya Madala <[email protected]>
gaiksaya · Jan 9, 2024 · 27d4cee · 27d4cee
1 parent 1d3df4d
commit 27d4cee
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git 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 <[email protected]>
           author: opensearch-ci-bot <[email protected]>
           commit-message: |

diff --git 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
@@ -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
@@ -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)