Skip to content

ci: fix jenkins step #1461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2025
Merged

ci: fix jenkins step #1461

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ spec:
branch 'dev'
}
steps {
container('aws-cli') {
script {
// Get recently merged PR numbers from merge commits
def mergedPRs = sh(
Expand All @@ -168,35 +167,36 @@ spec:
def prList = mergedPRs.split('\n').collect { it.trim() }
echo "Recently merged PRs: ${prList}"

withEnv(["AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}", "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}"]) {
// For each PR, check if files exist and clean up
prList.each { prNumber ->
def prefix = "pr-${prNumber}"
container('aws-cli') {
withEnv(["AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}", "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}"]) {
// For each PR, check if files exist and clean up
prList.each { prNumber ->
def prefix = "pr-${prNumber}"

// Check if directory exists
def hasFiles = sh(
script: "aws s3 ls s3://${S3_BUCKET}/${prefix}/",
returnStatus: true
) == 0
// Check if directory exists
def hasFiles = sh(
script: "aws s3 ls s3://${S3_BUCKET}/${prefix}/",
returnStatus: true
) == 0

if (!hasFiles) {
echo "No files found for PR ${prNumber}, skipping..."
return
}
if (!hasFiles) {
echo "No files found for PR ${prNumber}, skipping..."
return
}

// List files that would be deleted
def filesToDelete = sh(
script: "aws s3 ls s3://${S3_BUCKET}/${prefix}/ --recursive",
returnStdout: true
).trim()
// List files that would be deleted
def filesToDelete = sh(
script: "aws s3 ls s3://${S3_BUCKET}/${prefix}/ --recursive",
returnStdout: true
).trim()

echo "Cleaning up S3 files for merged PR: ${prNumber}"
sh "aws s3 rm s3://${S3_BUCKET}/${prefix}/ --recursive"
echo "Cleaning up S3 files for merged PR: ${prNumber}"
sh "aws s3 rm s3://${S3_BUCKET}/${prefix}/ --recursive"
}
}
}
}
}
}
}
stage('Test') {
steps {
Expand Down