Skip to content

Commit df97cb4

Browse files
ci: fix jenkins step
1 parent 87a90a5 commit df97cb4

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

Jenkinsfile

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ spec:
146146
branch 'dev'
147147
}
148148
steps {
149-
container('aws-cli') {
150149
script {
151150
// Get recently merged PR numbers from merge commits
152151
def mergedPRs = sh(
@@ -168,35 +167,36 @@ spec:
168167
def prList = mergedPRs.split('\n').collect { it.trim() }
169168
echo "Recently merged PRs: ${prList}"
170169

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

176-
// Check if directory exists
177-
def hasFiles = sh(
178-
script: "aws s3 ls s3://${S3_BUCKET}/${prefix}/",
179-
returnStatus: true
180-
) == 0
176+
// Check if directory exists
177+
def hasFiles = sh(
178+
script: "aws s3 ls s3://${S3_BUCKET}/${prefix}/",
179+
returnStatus: true
180+
) == 0
181181

182-
if (!hasFiles) {
183-
echo "No files found for PR ${prNumber}, skipping..."
184-
return
185-
}
182+
if (!hasFiles) {
183+
echo "No files found for PR ${prNumber}, skipping..."
184+
return
185+
}
186186

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

193-
echo "Cleaning up S3 files for merged PR: ${prNumber}"
194-
sh "aws s3 rm s3://${S3_BUCKET}/${prefix}/ --recursive"
193+
echo "Cleaning up S3 files for merged PR: ${prNumber}"
194+
sh "aws s3 rm s3://${S3_BUCKET}/${prefix}/ --recursive"
195+
}
195196
}
196197
}
197198
}
198199
}
199-
}
200200
}
201201
stage('Test') {
202202
steps {

0 commit comments

Comments
 (0)