Swap version and SHAs. (#1123)

Signed-off-by: dblock <[email protected]>
opensearch-project · Nov 22, 2021 · c3d0129 · c3d0129
1 parent 5a79d68
commit c3d0129
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/jenkins/InputManifest.groovy b/src/jenkins/InputManifest.groovy
@@ -70,8 +70,8 @@ class InputManifest {
     public String getSHAsRoot(String jobName, String platform = null, String architecture = null) {
         return [
             jobName,
-            'shas',
             this.build.version,
+            'shas',
             platform ?: this.build.platform,
             architecture ?: this.build.architecture
         ].join("/")

diff --git a/tests/jenkins/jobs/InputManifest_Jenkinsfile.txt b/tests/jenkins/jobs/InputManifest_Jenkinsfile.txt
@@ -13,4 +13,4 @@
                InputManifest.getPublicDistUrl(https://ci.opensearch.org/ci/dbc, bundle-build, 1, linux, x86)
                InputManifest_Jenkinsfile.echo(https://ci.opensearch.org/ci/dbc/bundle-build/1.2.0/1/linux/x86/dist/opensearch-1.2.0-linux-x86.tar.gz)
                InputManifest.getSHAsRoot(bundle-build, linux, x86)
-               InputManifest_Jenkinsfile.echo(bundle-build/shas/1.2.0/linux/x86)
+               InputManifest_Jenkinsfile.echo(bundle-build/1.2.0/shas/linux/x86)
diff --git a/tests/jenkins/jobs/Vars_Jenkinsfile.txt b/tests/jenkins/jobs/Vars_Jenkinsfile.txt
@@ -82,7 +82,7 @@ https://ci.opensearch.org/dbc//vars-build/1.1.0/33/linux/x64/dist/manifest.yml)
 https://ci.opensearch.org/dbc//vars-build/1.1.0/33/linux/x64/dist/manifest.yml})
                         uploadArtifacts.stash({includes=messages/*, name=messages-stage})
                   buildAssembleUpload.withAWS({role=opensearch-bundle, roleAccount=account, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure)
-                     buildAssembleUpload.echo(s3Upload(bucket: artifact-bucket, file: manifests/2.0.0/opensearch-2.0.0.yml, path: vars-build/shas/2.0.0/linux/x64/sha1.yml))
+                     buildAssembleUpload.echo(s3Upload(bucket: artifact-bucket, file: manifests/2.0.0/opensearch-2.0.0.yml, path: vars-build/2.0.0/shas/linux/x64/sha1.yml))
          Vars_Jenkinsfile.stage(notify, groovy.lang.Closure)
             Vars_Jenkinsfile.script(groovy.lang.Closure)
                Vars_Jenkinsfile.publishNotification({dryRun=true, icon=:white_check_mark:, message=Successful Build, extra=extra, credentialsId=BUILD_NOTICE_WEBHOOK})