Skip to content

Commit 49c39d3

Browse files
committed
rather retry the whole create-sbom.sh script
1 parent ac015b2 commit 49c39d3

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

.evergreen/create-sbom.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ trap_handler() {
1818
}
1919
trap trap_handler ERR EXIT
2020

21-
bash "./retry-with-backoff.sh" scp -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" .sbom/dependencies.json /tmp/silkbomb.env /tmp/artifactory_password "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/
22-
bash "./retry-with-backoff.sh" ssh -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -p "$SIGNING_SERVER_PORT" "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME" \
21+
scp -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" .sbom/dependencies.json /tmp/silkbomb.env /tmp/artifactory_password "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/
22+
ssh -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -p "$SIGNING_SERVER_PORT" "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME" \
2323
"(cat /tmp/dependencies.json | jq -r '.[] | "'"pkg:npm/" + .name + "@" + .version'"' > /tmp/purls.txt) && \
2424
echo "pkg:generic/mongo_crypt_shared@${CRYPT_SHARED_VERSION}" >> /tmp/purls.txt && \
2525
(cat /tmp/artifactory_password | docker login artifactory.corp.mongodb.com --username '${ARTIFACTORY_USERNAME}' --password-stdin ; rm -f /tmp/artifactor_password ) && \
@@ -30,4 +30,4 @@ bash "./retry-with-backoff.sh" ssh -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -
3030
--silk-asset-group "${SILK_ASSET_GROUP}" --sbom-in /tmp/sbom-lite.json && \
3131
docker run --env-file /tmp/silkbomb.env --rm -v /tmp:/tmp artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 download \
3232
--silk-asset-group "${SILK_ASSET_GROUP}" --sbom-out /tmp/sbom.json"
33-
bash "./retry-with-backoff.sh" scp -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/{sbom-lite.json,sbom.json,purls.txt} .sbom/
33+
scp -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/{sbom-lite.json,sbom.json,purls.txt} .sbom/

.evergreen/functions.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ functions:
443443
script: |
444444
set -e
445445
446-
.evergreen/create-sbom.sh
446+
bash ".evergreen/retry-with-backoff.sh" .evergreen/create-sbom.sh
447447
- command: shell.exec
448448
params:
449449
working_dir: src
@@ -659,6 +659,26 @@ functions:
659659
660660
npm run --unsafe-perm --workspace compass-e2e-tests test-packaged-ci
661661
662+
get-compass-mongodb-com:
663+
- command: shell.exec
664+
type: setup
665+
params:
666+
working_dir: src
667+
shell: bash
668+
script: |
669+
set -e
670+
git clone https://github.com/10gen/compass-mongodb-com.git ../compass-mongodb-com
671+
cd ../compass-mongodb-com
672+
echo "Using node version:";
673+
node -v;
674+
echo "Using npm version:";
675+
npm -v;
676+
echo "Using gcc version:"
677+
gcc --version;
678+
echo "Using g++ version:"
679+
g++ --version;
680+
npm ci --engine-strict=false
681+
662682
smoketest-packaged-app:
663683
- command: shell.exec
664684
# Fail the task if it's idle for 10 mins

0 commit comments

Comments
 (0)