From 120cc3ad30a8122c7c7662d61e488bf0aea3f18a Mon Sep 17 00:00:00 2001 From: Zelin Hao Date: Fri, 2 Feb 2024 15:09:48 -0800 Subject: [PATCH] Force remove the existing distribution folder before move (#384) Signed-off-by: Zelin Hao --- build.gradle | 2 +- tests/jenkins/TestRetrievePreviousBuild.groovy | 4 ++-- tests/jenkins/jobs/RetrievePreviousBuild_Jenkinsfile.txt | 4 ++-- vars/retrievePreviousBuild.groovy | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 1fa94c390..3257afe5b 100644 --- a/build.gradle +++ b/build.gradle @@ -121,7 +121,7 @@ jacocoTestReport { } } -String version = '6.3.0' +String version = '6.3.1' task updateVersion { doLast { diff --git a/tests/jenkins/TestRetrievePreviousBuild.groovy b/tests/jenkins/TestRetrievePreviousBuild.groovy index bcbc0d1a8..11d001aa5 100644 --- a/tests/jenkins/TestRetrievePreviousBuild.groovy +++ b/tests/jenkins/TestRetrievePreviousBuild.groovy @@ -33,10 +33,10 @@ class TestRetrievePreviousBuild extends BuildPipelineTest { void testRetrievePreviousBuild() { super.testPipeline('tests/jenkins/jobs/RetrievePreviousBuild_Jenkinsfile') def shCommands = getCommands('sh', 'mkdir') - assertThat(shCommands, hasItems('mkdir -p tar && mv -v /tmp/workspace/download/dummy_job/2.12.0/123/linux/x64/tar/* /tmp/workspace/tar')) + assertThat(shCommands, hasItems('rm -rf tar && mkdir -p tar && mv -v /tmp/workspace/download/dummy_job/2.12.0/123/linux/x64/tar/* /tmp/workspace/tar')) assertThat(shCommands, hasItems('mkdir -p ~/.m2/repository/org/ && cp -r tar/builds/opensearch/maven/org/opensearch/ ~/.m2/repository/org/')) - assertThat(shCommands, hasItems('mkdir -p zip && mv -v /tmp/workspace/download/dummy_job/2.12.0/1234/windows/x64/zip/* /tmp/workspace/zip')) + assertThat(shCommands, hasItems('rm -rf zip && mkdir -p zip && mv -v /tmp/workspace/download/dummy_job/2.12.0/1234/windows/x64/zip/* /tmp/workspace/zip')) assertThat(shCommands, not(hasItems('mkdir -p ~/.m2/repository/org/ && cp -r zip/builds/opensearch/maven/org/opensearch/ ~/.m2/repository/org/'))) def s3DownloadCommands = getCommands('s3Download', 'bucket').findAll { diff --git a/tests/jenkins/jobs/RetrievePreviousBuild_Jenkinsfile.txt b/tests/jenkins/jobs/RetrievePreviousBuild_Jenkinsfile.txt index 78e2f48b6..ac2ca7fa4 100644 --- a/tests/jenkins/jobs/RetrievePreviousBuild_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RetrievePreviousBuild_Jenkinsfile.txt @@ -15,7 +15,7 @@ downloadFromS3.withCredentials([AWS_ACCOUNT_NUMBER], groovy.lang.Closure) downloadFromS3.withAWS({role=opensearch-bundle, roleAccount=AWS_ACCOUNT_NUMBER, duration=900, roleSessionName=jenkins-session, region=us-east-1}, groovy.lang.Closure) downloadFromS3.s3Download({file=/tmp/workspace/download, bucket=ARTIFACT_BUCKET_NAME, path=dummy_job/2.12.0/123/linux/x64/tar/, force=true}) - retrievePreviousBuild.sh(mkdir -p tar && mv -v /tmp/workspace/download/dummy_job/2.12.0/123/linux/x64/tar/* /tmp/workspace/tar) + retrievePreviousBuild.sh(rm -rf tar && mkdir -p tar && mv -v /tmp/workspace/download/dummy_job/2.12.0/123/linux/x64/tar/* /tmp/workspace/tar) retrievePreviousBuild.echo(Setting up Maven Local for OpenSearch build.) retrievePreviousBuild.sh(mkdir -p ~/.m2/repository/org/ && cp -r tar/builds/opensearch/maven/org/opensearch/ ~/.m2/repository/org/) RetrievePreviousBuild_Jenkinsfile.retrievePreviousBuild({inputManifest=tests/data/opensearch-dashboards-input-2.12.0.yml, distribution=zip, architecture=x64, platform=windows, previousBuildId=1234}) @@ -30,4 +30,4 @@ downloadFromS3.withCredentials([AWS_ACCOUNT_NUMBER], groovy.lang.Closure) downloadFromS3.withAWS({role=opensearch-bundle, roleAccount=AWS_ACCOUNT_NUMBER, duration=900, roleSessionName=jenkins-session, region=us-east-1}, groovy.lang.Closure) downloadFromS3.s3Download({file=/tmp/workspace/download, bucket=ARTIFACT_BUCKET_NAME, path=dummy_job/2.12.0/1234/windows/x64/zip/, force=true}) - retrievePreviousBuild.sh(mkdir -p zip && mv -v /tmp/workspace/download/dummy_job/2.12.0/1234/windows/x64/zip/* /tmp/workspace/zip) + retrievePreviousBuild.sh(rm -rf zip && mkdir -p zip && mv -v /tmp/workspace/download/dummy_job/2.12.0/1234/windows/x64/zip/* /tmp/workspace/zip) diff --git a/vars/retrievePreviousBuild.groovy b/vars/retrievePreviousBuild.groovy index 21135130d..c20711704 100644 --- a/vars/retrievePreviousBuild.groovy +++ b/vars/retrievePreviousBuild.groovy @@ -63,7 +63,7 @@ void call(Map args = [:]) { force: true, ) } - sh("mkdir -p ${distribution} && mv -v ${prefixPath}/${artifactPath}/* ${WORKSPACE}/${distribution}") + sh("rm -rf ${distribution} && mkdir -p ${distribution} && mv -v ${prefixPath}/${artifactPath}/* ${WORKSPACE}/${distribution}") if (inputManifestObj.build.getFilename().equals("opensearch")) { echo("Setting up Maven Local for OpenSearch build.") sh("mkdir -p ~/.m2/repository/org/ && cp -r ${distribution}/builds/opensearch/maven/org/opensearch/ ~/.m2/repository/org/")