updated promote artifacts lib s3 upload (opensearch-project#1493)

Signed-off-by: Abhinav Gupta <abhng@amazon.com>
peterzhuamazon · Feb 16, 2022 · 53a8b9d · 53a8b9d
1 parent 5495951
commit 53a8b9d
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 11 deletions.
diff --git a/tests/jenkins/jobs/PromoteArtifacts_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifacts_Jenkinsfile.txt
@@ -35,4 +35,3 @@
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/plugins/repository-gcs-1.1.0.zip/1.3.0/, workingDir=workspace/artifacts/vars-build/1.3.0/33/linux/x64/builds/opensearch/core-plugins/, includePathPattern=**/repository-gcs-1.1.0.zip*})
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/core/opensearch/1.3.0/, workingDir=workspace/artifacts/vars-build/1.3.0/33/linux/x64/builds/opensearch/dist/, includePathPattern=**/opensearch-min-1.3.0*})
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/bundle/opensearch/1.3.0/, workingDir=workspace/artifacts/vars-build/1.3.0/33/linux/x64/dist/opensearch/, includePathPattern=**/opensearch-1.3.0*})
-                     promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/1.3.0/linux/x64/, workingDir=workspace/artifacts/vars-build/1.3.0/33/linux/x64/, includePathPattern=**/})
diff --git a/tests/jenkins/jobs/PromoteArtifacts_OpenSearch_Dashboards_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifacts_OpenSearch_Dashboards_Jenkinsfile.txt
@@ -15,4 +15,3 @@
                   promoteArtifacts.withAWS({role=artifactPromotionRole, roleAccount=artifactsAccount, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure)
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/core/opensearch-dashboards/1.2.0/, workingDir=workspace/artifacts/vars-build/1.2.0/33/linux/x64/builds/opensearch-dashboards/dist/, includePathPattern=**/opensearch-dashboards-min-1.2.0*})
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/bundle/opensearch-dashboards/1.2.0/, workingDir=workspace/artifacts/vars-build/1.2.0/33/linux/x64/dist/opensearch-dashboards/, includePathPattern=**/opensearch-dashboards-1.2.0*})
-                     promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/1.2.0/linux/x64/, workingDir=workspace/artifacts/vars-build/1.2.0/33/linux/x64/, includePathPattern=**/})
diff --git a/tests/jenkins/jobs/PromoteArtifacts_actions_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifacts_actions_Jenkinsfile.txt
@@ -88,4 +88,3 @@
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/plugins/repository-gcs-1.1.0.zip/1.3.0/, workingDir=workspace/artifacts/vars-build/1.3.0/33/linux/x64/builds/opensearch/core-plugins/, includePathPattern=**/repository-gcs-1.1.0.zip*})
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/core/opensearch/1.3.0/, workingDir=workspace/artifacts/vars-build/1.3.0/33/linux/x64/builds/opensearch/dist/, includePathPattern=**/opensearch-min-1.3.0*})
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/bundle/opensearch/1.3.0/, workingDir=workspace/artifacts/vars-build/1.3.0/33/linux/x64/dist/opensearch/, includePathPattern=**/opensearch-1.3.0*})
-                     promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/1.3.0/linux/x64/, workingDir=workspace/artifacts/vars-build/1.3.0/33/linux/x64/, includePathPattern=**/})
diff --git a/tests/jenkins/jobs/PromoteArtifacts_actions_OpenSearch_Dashboards_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifacts_actions_OpenSearch_Dashboards_Jenkinsfile.txt
@@ -61,4 +61,3 @@
                   promoteArtifacts.withAWS({role=artifactPromotionRole, roleAccount=artifactsAccount, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure)
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/core/opensearch-dashboards/1.2.0/, workingDir=workspace/artifacts/vars-build/1.2.0/33/linux/x64/builds/opensearch-dashboards/dist/, includePathPattern=**/opensearch-dashboards-min-1.2.0*})
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/bundle/opensearch-dashboards/1.2.0/, workingDir=workspace/artifacts/vars-build/1.2.0/33/linux/x64/dist/opensearch-dashboards/, includePathPattern=**/opensearch-dashboards-1.2.0*})
-                     promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/1.2.0/linux/x64/, workingDir=workspace/artifacts/vars-build/1.2.0/33/linux/x64/, includePathPattern=**/})
diff --git a/vars/promoteArtifacts.groovy b/vars/promoteArtifacts.groovy
@@ -75,7 +75,7 @@ void call(Map args = [:]) {
                 )
             }
         }
-      
+
         s3Upload(
             bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}",
             path: "releases/$coreFullPath/",
@@ -89,11 +89,5 @@ void call(Map args = [:]) {
             workingDir: "$WORKSPACE/artifacts/$artifactPath/dist/$filename/",
             includePathPattern: "**/${filename}-${version}*")
 
-        // upload build and dist
-        s3Upload(
-            bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}",
-            path: "releases/$version/${DISTRIBUTION_PLATFORM}/${DISTRIBUTION_ARCHITECTURE}/",
-            workingDir: "$WORKSPACE/artifacts/$artifactPath/",
-            includePathPattern: "**/")
     }
 }