diff --git a/build.gradle b/build.gradle index 505c019c5..375ff375d 100644 --- a/build.gradle +++ b/build.gradle @@ -120,7 +120,7 @@ jacocoTestReport { } } -String version = '2.0.1' +String version = '2.0.2' task updateVersion { doLast { diff --git a/tests/jenkins/TestPromoteRepos.groovy b/tests/jenkins/TestPromoteRepos.groovy index 58a591bf3..1086fa4ee 100644 --- a/tests/jenkins/TestPromoteRepos.groovy +++ b/tests/jenkins/TestPromoteRepos.groovy @@ -46,7 +46,7 @@ class TestPromoteRepos extends BuildPipelineTest { runScript("tests/jenkins/jobs/PromoteRepos_Jenkinsfile") assertThat(getShellCommands('sh', 'curl'), hasItems('\n set -e\n set +x\n\n echo \"Pulling 1.3.0 deb\"\n cd /tmp/workspace/artifacts/releases/bundle/opensearch/1.x/apt\n curl -SLO https://ci.opensearch.org/dbc/opensearch/1.3.0/123/linux/x64/deb/dist/opensearch/opensearch-1.3.0-linux-x64.deb\n curl -SLO https://ci.opensearch.org/dbc/opensearch/1.3.0/123/linux/arm64/deb/dist/opensearch/opensearch-1.3.0-linux-arm64.deb\n\n ls -l\n ')) assertThat(getShellCommands('sh', 'aws'), hasItems('aws s3 sync s3://ARTIFACT_PRODUCTION_BUCKET_NAME/releases/bundle/opensearch/1.x/apt/ /tmp/workspace/artifacts/releases/bundle/opensearch/1.x/apt/ --no-progress')) - assertThat(getShellCommands('sh', 'aptly'), hasItems('#!/bin/bash\n\n echo \"Start Signing Apt\"\n rm -rf ~/.aptly\n mkdir $ARTIFACT_PATH/base\n find $ARTIFACT_PATH -type f -name \"*.deb\" | xargs -I {} mv -v {} $ARTIFACT_PATH/base\n aptly repo create -distribution=stable -component=main opensearch\n aptly repo add opensearch $ARTIFACT_PATH/base\n aptly repo show -with-packages opensearch\n aptly snapshot create opensearch-1.x from repo opensearch\n aptly publish snapshot -batch=true -passphrase-file=passphrase opensearch-1.x\n echo \"------------------------------------------------------------------------\"\n echo \"Clean up gpg\"\n gpg --batch --yes --delete-secret-keys RPM_SIGNING_KEY_ID\n gpg --batch --yes --delete-keys RPM_SIGNING_KEY_ID\n rm -v passphrase\n echo \"------------------------------------------------------------------------\"\n rm -rf $ARTIFACT_PATH/*\n cp -rvp ~/.aptly/public/* $ARTIFACT_PATH/\n ls $ARTIFACT_PATH\n\n ')) + assertThat(getShellCommands('sh', 'aptly'), hasItems('#!/bin/bash\n\n set -e\n set +x\n\n ARTIFACT_PATH=\"/tmp/workspace/artifacts/releases/bundle/opensearch/1.x/apt\"\n\n echo \"Start Signing Apt\"\n rm -rf ~/.aptly\n mkdir $ARTIFACT_PATH/base\n find $ARTIFACT_PATH -type f -name \"*.deb\" | xargs -I {} mv -v {} $ARTIFACT_PATH/base\n aptly repo create -distribution=stable -component=main opensearch\n aptly repo add opensearch $ARTIFACT_PATH/base\n aptly repo show -with-packages opensearch\n aptly snapshot create opensearch-1.x from repo opensearch\n aptly publish snapshot -batch=true -passphrase-file=passphrase opensearch-1.x\n echo \"------------------------------------------------------------------------\"\n echo \"Clean up gpg\"\n gpg --batch --yes --delete-secret-keys RPM_SIGNING_KEY_ID\n gpg --batch --yes --delete-keys RPM_SIGNING_KEY_ID\n rm -v passphrase\n echo \"------------------------------------------------------------------------\"\n rm -rf $ARTIFACT_PATH/*\n cp -rvp ~/.aptly/public/* $ARTIFACT_PATH/\n ls $ARTIFACT_PATH\n\n ')) } def getShellCommands(methodName, searchString) { diff --git a/tests/jenkins/jobs/PromoteRepos_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteRepos_Jenkinsfile.txt index 9207912cf..64e1a49d9 100644 --- a/tests/jenkins/jobs/PromoteRepos_Jenkinsfile.txt +++ b/tests/jenkins/jobs/PromoteRepos_Jenkinsfile.txt @@ -160,6 +160,11 @@ ) promoteRepos.sh(#!/bin/bash + set -e + set +x + + ARTIFACT_PATH="/tmp/workspace/artifacts/releases/bundle/opensearch/1.x/apt" + echo "Start Signing Apt" rm -rf ~/.aptly mkdir $ARTIFACT_PATH/base diff --git a/vars/promoteRepos.groovy b/vars/promoteRepos.groovy index 009986ca1..60059ec75 100644 --- a/vars/promoteRepos.groovy +++ b/vars/promoteRepos.groovy @@ -180,6 +180,11 @@ void call(Map args = [:]) { sh """#!/bin/bash + set -e + set +x + + ARTIFACT_PATH="${artifactPath}" + echo "Start Signing Apt" rm -rf ~/.aptly mkdir \$ARTIFACT_PATH/base