Skip to content

Commit 455cd8a

Browse files
authored
Fix for: Include links to the Evergreen build and to the driver security testing summary in the SSDLC report (#1433) (#1436)
This is a backport of #1433 to 5.1.x. JAVA-5500
1 parent f1f035b commit 455cd8a

File tree

2 files changed

+26
-9
lines changed

2 files changed

+26
-9
lines changed

.evergreen/.evg.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ functions:
150150
env:
151151
PRODUCT_NAME: ${product_name}
152152
PRODUCT_VERSION: ${product_version}
153-
PRODUCT_RELEASE_CREATOR: ${author}
154153
EVERGREEN_VERSION_ID: ${version_id}
155154
script: .evergreen/ssdlc-report.sh
156155
- command: ec2.assume_role

.evergreen/ssdlc-report.sh

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ set -eu
55
# Supported/used environment variables:
66
# PRODUCT_NAME
77
# PRODUCT_VERSION
8-
# PRODUCT_RELEASE_CREATOR
98
# EVERGREEN_VERSION_ID
109

1110
if [ -z "${PRODUCT_NAME}" ]; then
@@ -16,10 +15,6 @@ if [ -z "${PRODUCT_VERSION}" ]; then
1615
printf "\nPRODUCT_VERSION must be set to a non-empty string\n"
1716
exit 1
1817
fi
19-
if [ -z "${PRODUCT_RELEASE_CREATOR}" ]; then
20-
printf "\PRODUCT_RELEASE_CREATOR must be set to a non-empty string\n"
21-
exit 1
22-
fi
2318
if [ -z "${EVERGREEN_VERSION_ID}" ]; then
2419
printf "\EVERGREEN_VERSION_ID must be set to a non-empty string\n"
2520
exit 1
@@ -34,14 +29,37 @@ source "${RELATIVE_DIR_PATH}/javaConfig.bash"
3429
printf "\nCreating SSDLC reports\n"
3530
printf "\nProduct name: %s\n" "${PRODUCT_NAME}"
3631
printf "\nProduct version: %s\n" "${PRODUCT_VERSION}"
37-
printf "\nProduct release creator: %s\n" "${PRODUCT_RELEASE_CREATOR}"
38-
declare -r EVERGREEN_BUILD_URL="https://spruce.mongodb.com/version/${EVERGREEN_VERSION_ID}"
39-
printf "\nEvergreen build URL: %s\n" "${EVERGREEN_BUILD_URL}"
32+
4033
declare -r SSDLC_PATH="${RELATIVE_DIR_PATH}/../build/ssdlc"
4134
declare -r SSDLC_STATIC_ANALYSIS_REPORTS_PATH="${SSDLC_PATH}/static-analysis-reports"
4235
mkdir "${SSDLC_PATH}"
4336
mkdir "${SSDLC_STATIC_ANALYSIS_REPORTS_PATH}"
4437

38+
declare -r EVERGREEN_PROJECT_NAME_PREFIX="${PRODUCT_NAME//-/_}"
39+
declare -r EVERGREEN_BUILD_URL_PREFIX="https://spruce.mongodb.com/version"
40+
declare -r GIT_TAG="r${PRODUCT_VERSION}"
41+
GIT_COMMIT_HASH="$(git rev-list --ignore-missing -n 1 "${GIT_TAG}")"
42+
set +e
43+
GIT_BRANCH_MASTER="$(git branch -a --contains "${GIT_TAG}" | grep 'master$')"
44+
GIT_BRANCH_PATCH="$(git branch -a --contains "${GIT_TAG}" | grep '\.x$')"
45+
set -e
46+
if [ -n "${GIT_BRANCH_MASTER}" ]; then
47+
declare -r EVERGREEN_BUILD_URL="${EVERGREEN_BUILD_URL_PREFIX}/${EVERGREEN_PROJECT_NAME_PREFIX}_${GIT_COMMIT_HASH}"
48+
elif [ -n "${GIT_BRANCH_PATCH}" ]; then
49+
# strip out the patch version
50+
declare -r EVERGREEN_PROJECT_NAME_SUFFIX="${PRODUCT_VERSION%.*}"
51+
declare -r EVERGREEN_BUILD_URL="${EVERGREEN_BUILD_URL_PREFIX}/${EVERGREEN_PROJECT_NAME_PREFIX}_${EVERGREEN_PROJECT_NAME_SUFFIX}_${GIT_COMMIT_HASH}"
52+
elif [[ "${PRODUCT_NAME}" == *'-snapshot' ]]; then
53+
declare -r EVERGREEN_BUILD_URL="${EVERGREEN_BUILD_URL_PREFIX}/${EVERGREEN_VERSION_ID}"
54+
else
55+
printf "\nFailed to compute EVERGREEN_BUILD_URL\n"
56+
exit 1
57+
fi
58+
printf "\nEvergreen build URL: %s\n" "${EVERGREEN_BUILD_URL}"
59+
60+
PRODUCT_RELEASE_CREATOR="$(git log --ignore-missing "${GIT_TAG}"^.."${GIT_TAG}" --simplify-by-decoration --pretty='format:%aN')"
61+
printf "\nProduct release creator: %s\n" "${PRODUCT_RELEASE_CREATOR}"
62+
4563
printf "\nCreating SpotBugs SARIF reports\n"
4664
./gradlew -version
4765
set +e

0 commit comments

Comments
 (0)