Skip to content

Commit

Permalink
test: add test_marker checks to integ scripts (#1169)
Browse files Browse the repository at this point in the history
Signed-off-by: Caden Marofke <[email protected]>
  • Loading branch information
marofke authored Dec 21, 2023
1 parent cb27e13 commit 3e8764f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 15 deletions.
8 changes: 1 addition & 7 deletions integ/scripts/bash/cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@ shopt -s globstar

INTEG_ROOT="$(pwd)"

for COMPONENT in **/cdk.json; do
# In case the yarn install was done inside this integ package, there are some example cdk.json files in the aws-cdk
# package we want to avoid.
if [[ $COMPONENT == *"node_modules"* ]]; then
continue
fi

for COMPONENT in **/test_marker; do
COMPONENT_ROOT="$(dirname "$COMPONENT")"
rm -f "${COMPONENT_ROOT}/cdk.context.json"
rm -rf "${COMPONENT_ROOT}/cdk.out"
Expand Down
2 changes: 1 addition & 1 deletion integ/scripts/bash/deploy-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ npx cdk deploy "*" --require-approval=never

cd "$INTEG_ROOT"

for COMPONENT in **/cdk.json; do
for COMPONENT in **/test_marker; do
COMPONENT_ROOT="$(dirname "$COMPONENT")"
COMPONENT_NAME=$(basename "$COMPONENT_ROOT")
# Use a pattern match to exclude the infrastructure app from the results
Expand Down
2 changes: 1 addition & 1 deletion integ/scripts/bash/report-test-results.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ report_results () {
}

# Report test results for each test component
for COMPONENT in **/cdk.json; do
for COMPONENT in **/test_marker; do
COMPONENT_ROOT="$(dirname "$COMPONENT")"
COMPONENT_NAME=$(basename "$COMPONENT_ROOT")
# Use a pattern match to exclude the infrastructure app from the results
Expand Down
7 changes: 1 addition & 6 deletions integ/scripts/bash/tear-down.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,7 @@ source $BASH_SCRIPTS/set-test-variables.sh
# the others. Disable the exit on error option
set +e

for COMPONENT in **/cdk.json; do
# In case the yarn install was done inside this integ package, there are some example cdk.json files in the aws-cdk
# package we want to avoid.
if [[ $COMPONENT == *"node_modules"* ]]; then
continue
fi
for COMPONENT in **/test_marker; do
COMPONENT_ROOT="$(dirname "$COMPONENT")"
COMPONENT_NAME=$(basename "$COMPONENT_ROOT")
# Use a pattern match to exclude the infrastructure app from the results
Expand Down

0 comments on commit 3e8764f

Please sign in to comment.