Skip to content

test(aws): Improve reliability on CI #17502

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
Sep 2, 2025
+10 −7
Merged

test(aws): Improve reliability on CI #17502

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions dev-packages/e2e-tests/test-applications/aws-serverless/pull-sam-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Script to pull the correct SAM docker image based on the NODE_VERSION environment variable.
# Script to pull the correct Lambda docker image based on the NODE_VERSION environment variable.

set -e

Expand All @@ -9,7 +9,7 @@ if [[ -z "$NODE_VERSION" ]]; then
exit 1
fi

echo "Pulling SAM Node $NODE_VERSION docker image..."
docker pull "public.ecr.aws/sam/build-nodejs${NODE_VERSION}.x:latest"
echo "Pulling Lambda Node $NODE_VERSION docker image..."
docker pull "public.ecr.aws/lambda/nodejs:${NODE_VERSION}"

echo "Successfully pulled SAM Node $NODE_VERSION docker image"
echo "Successfully pulled Lambda Node $NODE_VERSION docker image"
9 changes: 6 additions & 3 deletions dev-packages/e2e-tests/test-applications/aws-serverless/tests/lambda-fixtures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
writeFileSync(SAM_TEMPLATE_FILE, JSON.stringify(template, null, 2));

const debugLog = tmp.fileSync({ prefix: 'sentry_aws_lambda_tests_sam_debug', postfix: '.log' });
console.log(`[test_environment fixture] Writing SAM debug log to: ${debugLog.name}`);
if (!process.env.CI) {
console.log(`[test_environment fixture] Writing SAM debug log to: ${debugLog.name}`);
}

const args = [
'local',
Expand All @@ -39,16 +41,17 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
'EAGER',
'--docker-network',
DOCKER_NETWORK_NAME,
'--skip-pull-image',
];

if (process.env.NODE_VERSION) {
args.push('--invoke-image', `public.ecr.aws/sam/build-nodejs${process.env.NODE_VERSION}.x:latest`);
args.push('--invoke-image', `public.ecr.aws/lambda/nodejs:${process.env.NODE_VERSION}`);
}

console.log(`[testEnvironment fixture] Running SAM with args: ${args.join(' ')}`);

const samProcess = spawn('sam', args, {
stdio: ['ignore', debugLog.fd, debugLog.fd],
stdio: process.env.CI ? 'inherit' : ['ignore', debugLog.fd, debugLog.fd],
});

try {
Expand Down
Loading