Skip to content

WPB-4910 include build timestamp in s3 upload path for test logs #3621

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
battermann merged 9 commits into from
Sep 29, 2023
Merged

WPB-4910 include build timestamp in s3 upload path for test logs #3621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
74fe585
include BUILD_NAME in s3 upload path for test logs
battermann Sep 28, 2023
fa4841d
try BUILD_ID
battermann Sep 28, 2023
56d3b38
use uuid
battermann Sep 28, 2023
38f7c05
fixed syntax
battermann Sep 28, 2023
d3df659
added libuuid pacakge
battermann Sep 29, 2023
29252aa
try using relative path
battermann Sep 29, 2023
b081665
use timestamp instead of uuid
battermann Sep 29, 2023
a5d8a83
replaced slash with dash, removed libuuid
battermann Sep 29, 2023
8a1f321
changelog
battermann Sep 29, 2023
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
1 change: 1 addition & 0 deletions changelog.d/5-internal/WPB-4910
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Include timestamp in s3 upload path for test logs
13 changes: 7 additions & 6 deletions hack/bin/integration-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CHART=wire-server
tests=(integration stern galley cargohold gundeck federator spar brig)

cleanup() {
if (( CLEANUP_LOCAL_FILES > 0 )); then
if ((CLEANUP_LOCAL_FILES > 0)); then
for t in "${tests[@]}"; do
rm -f "stat-$t"
rm -f "logs-$t"
Expand All @@ -24,11 +24,12 @@ cleanup() {

# Copy to the concourse output (indetified by $OUTPUT_DIR) for propagation to
# following steps.
copyToAwsS3(){
if (( UPLOAD_LOGS > 0 )); then
copyToAwsS3() {
build_ts=$(date +%s)
if ((UPLOAD_LOGS > 0)); then
for t in "${tests[@]}"; do
echo "Copy logs-$t to s3://wire-server-test-logs/test-logs-$VERSION/$t-$VERSION.log"
aws s3 cp "logs-$t" "s3://wire-server-test-logs/test-logs-$VERSION/$t-$VERSION.log"
echo "Copy logs-$t to s3://wire-server-test-logs/test-logs-$VERSION/$t-$VERSION-$build_ts.log"
aws s3 cp "logs-$t" "s3://wire-server-test-logs/test-logs-$VERSION/$t-$VERSION-$build_ts.log"
done
fi
}
Expand Down Expand Up @@ -89,7 +90,7 @@ if ((exit_code > 0)); then
x=$(cat "stat-$t")
if ((x > 0)); then
echo "=== (relevant) logs for failed $t-integration ==="
"$DIR/integration-logs-relevant-bits.sh" < "logs-$t"
"$DIR/integration-logs-relevant-bits.sh" <"logs-$t"
fi
done
summary
Expand Down