Skip to content

Commit e5a24d8

Browse files
gagikgagik
committed
Merge branch 'main' of github.com:mongodb-js/mongosh into gagik/add-foliage
2 parents a3953a8 + 5e8542a commit e5a24d8

File tree

29 files changed

+462
-69
lines changed

29 files changed

+462
-69
lines changed

‎.evergreen.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7580,7 +7580,7 @@ functions:
75807580
{
75817581
export NODE_JS_VERSION=${node_js_version}
75827582
source .evergreen/setup-env.sh
7583-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
7583+
export PUPPETEER_SKIP_DOWNLOAD="true"
75847584
npm run evergreen-release draft
75857585
}
75867586

@@ -7598,7 +7598,7 @@ functions:
75987598
node_js_version: ${node_js_version}
75997599
script: |
76007600
set -e
7601-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
7601+
export PUPPETEER_SKIP_DOWNLOAD="true"
76027602
.evergreen/run-evergreen-release.sh download-and-list-artifacts
76037603
- command: shell.exec
76047604
params:
@@ -7627,7 +7627,7 @@ functions:
76277627
node_js_version: ${node_js_version}
76287628
script: |
76297629
set -e
7630-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
7630+
export PUPPETEER_SKIP_DOWNLOAD="true"
76317631
.evergreen/run-evergreen-release.sh publish -- --dry-run
76327632

76337633
release_publish:
@@ -7646,7 +7646,7 @@ functions:
76467646
node_js_version: ${node_js_version}
76477647
script: |
76487648
set -e
7649-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
7649+
export PUPPETEER_SKIP_DOWNLOAD="true"
76507650
.evergreen/run-evergreen-release.sh publish
76517651

76527652
run_perf_tests:
@@ -16325,8 +16325,8 @@ buildvariants:
1632516325
tasks:
1632616326
- name: compile_artifact
1632716327
- name: linux_ppc64le_build
16328-
display_name: "RHEL 8.1 PPC (build)"
16329-
run_on: rhel81-power8-small
16328+
display_name: "RHEL 8 PPC (build)"
16329+
run_on: rhel8-power-small
1633016330
expansions:
1633116331
executable_os_id: linux-ppc64le
1633216332
tasks:
@@ -16512,9 +16512,9 @@ buildvariants:
1651216512
tasks:
1651316513
- name: e2e_tests_linux_arm64
1651416514
- name: e2e_tests_linux_arm64_openssl3
16515-
- name: e2e_rhel81_ppc64le
16516-
display_name: "RHEL 8.1 PPC (E2E Tests)"
16517-
run_on: rhel81-power8-small
16515+
- name: e2e_rhel8_ppc64le
16516+
display_name: "RHEL 8 PPC (E2E Tests)"
16517+
run_on: rhel8-power-small
1651816518
tasks:
1651916519
- name: e2e_tests_linux_ppc64le
1652016520
- name: e2e_rhel7_s390x
@@ -16722,9 +16722,9 @@ buildvariants:
1672216722
run_on: rhel8-zseries-small
1672316723
tasks:
1672416724
- name: pkg_test_rpmextract_rpm_s390x
16725-
- name: pkg_smoke_tests_rhel81_ppc64le
16726-
display_name: "package smoke tests (RHEL 8.1 ppc64le)"
16727-
run_on: rhel81-power8-small
16725+
- name: pkg_smoke_tests_rhel8_ppc64le
16726+
display_name: "package smoke tests (RHEL 8 ppc64le)"
16727+
run_on: rhel8-power-small
1672816728
tasks:
1672916729
- name: pkg_test_rpmextract_rpm_ppc64le
1673016730

‎.evergreen/compilation-context-expansions.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel7-zseries|rhel81-power8|amazon2-arm64|macos)"
1+
export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel7-zseries|rhel8-power|amazon2-arm64|macos)"
22
export COMPILING_CONTEXT_FILE="$(pwd)/../tmp/compiling-context.yml"
33

44
if ! [[ "$DISTRO_ID" =~ $DISTRO_UPLOADLIST_REGEX ]]; then

‎.evergreen/compilation-context-expansions.test.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ rhel7-zseries-large=true
3131
rhel7-zseries-small=true
3232
rhel76-large=false
3333
rhel80-small=false
34-
rhel81-power8-small=true
34+
rhel81-power8-small=false
35+
rhel8-power-small=true
3536
rhel82-arm64-small=false
3637
rhel83-fips=false
3738
rhel83-zseries-small=false

‎.evergreen/compile-artifact.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ elif [ -n "$MONGOSH_SHARED_OPENSSL" ]; then
7373
export LD_LIBRARY_PATH=/tmp/m/opt/lib
7474
fi
7575

76-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
76+
export PUPPETEER_SKIP_DOWNLOAD="true"
7777
npm run evergreen-release compile
7878
dist/mongosh --version
7979
dist/mongosh --build-info

‎.evergreen/evergreen.yml.in‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ functions:
990990
{
991991
export NODE_JS_VERSION=${node_js_version}
992992
source .evergreen/setup-env.sh
993-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
993+
export PUPPETEER_SKIP_DOWNLOAD="true"
994994
npm run evergreen-release draft
995995
}
996996

@@ -1008,7 +1008,7 @@ functions:
10081008
node_js_version: ${node_js_version}
10091009
script: |
10101010
set -e
1011-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
1011+
export PUPPETEER_SKIP_DOWNLOAD="true"
10121012
.evergreen/run-evergreen-release.sh download-and-list-artifacts
10131013
- command: shell.exec
10141014
params:
@@ -1037,7 +1037,7 @@ functions:
10371037
node_js_version: ${node_js_version}
10381038
script: |
10391039
set -e
1040-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
1040+
export PUPPETEER_SKIP_DOWNLOAD="true"
10411041
.evergreen/run-evergreen-release.sh publish -- --dry-run
10421042

10431043
release_publish:
@@ -1056,7 +1056,7 @@ functions:
10561056
node_js_version: ${node_js_version}
10571057
script: |
10581058
set -e
1059-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
1059+
export PUPPETEER_SKIP_DOWNLOAD="true"
10601060
.evergreen/run-evergreen-release.sh publish
10611061

10621062
run_perf_tests:
@@ -1706,8 +1706,8 @@ buildvariants:
17061706
tasks:
17071707
- name: compile_artifact
17081708
- name: linux_ppc64le_build
1709-
display_name: "RHEL 8.1 PPC (build)"
1710-
run_on: rhel81-power8-small
1709+
display_name: "RHEL 8 PPC (build)"
1710+
run_on: rhel8-power-small
17111711
expansions:
17121712
executable_os_id: linux-ppc64le
17131713
tasks:
@@ -1893,9 +1893,9 @@ buildvariants:
18931893
tasks:
18941894
- name: e2e_tests_linux_arm64
18951895
- name: e2e_tests_linux_arm64_openssl3
1896-
- name: e2e_rhel81_ppc64le
1897-
display_name: "RHEL 8.1 PPC (E2E Tests)"
1898-
run_on: rhel81-power8-small
1896+
- name: e2e_rhel8_ppc64le
1897+
display_name: "RHEL 8 PPC (E2E Tests)"
1898+
run_on: rhel8-power-small
18991899
tasks:
19001900
- name: e2e_tests_linux_ppc64le
19011901
- name: e2e_rhel7_s390x
@@ -2034,9 +2034,9 @@ buildvariants:
20342034
run_on: rhel8-zseries-small
20352035
tasks:
20362036
- name: pkg_test_rpmextract_rpm_s390x
2037-
- name: pkg_smoke_tests_rhel81_ppc64le
2038-
display_name: "package smoke tests (RHEL 8.1 ppc64le)"
2039-
run_on: rhel81-power8-small
2037+
- name: pkg_smoke_tests_rhel8_ppc64le
2038+
display_name: "package smoke tests (RHEL 8 ppc64le)"
2039+
run_on: rhel8-power-small
20402040
tasks:
20412041
- name: pkg_test_rpmextract_rpm_ppc64le
20422042

‎.evergreen/install-node-source.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ EVGDIR="$ROOT_DIR/.evergreen"
77
NVM_DIR="$EVGDIR/.nvm"
88
ORIGINAL_PATH="${PATH}"
99

10+
OS_ARCH="$(uname "-m")"
11+
if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ] ; then
12+
echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
13+
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
14+
else
15+
echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
16+
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
17+
fi
18+
export PATH="$TOOLCHAIN_PATH:/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
19+
1020
export PATH="/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
1121
export CC=gcc
1222
export CXX=g++

‎.evergreen/package-and-upload-artifact.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ "$(uname)" == Linux ]; then
1313
cp "$(pwd)/../tmp/expansions.yaml" tmp/expansions.yaml
1414
(cd scripts/docker && bash "$BASEDIR/retry-with-backoff.sh" docker build -t rocky8-package -f rocky8-package.Dockerfile .)
1515
echo Starting Docker container packaging
16-
docker run -e PUPPETEER_SKIP_CHROMIUM_DOWNLOAD \
16+
docker run -e PUPPETEER_SKIP_DOWNLOAD \
1717
-e EVERGREEN_EXPANSIONS_PATH=/tmp/build/tmp/expansions.yaml \
1818
-e NODE_JS_VERSION \
1919
-e PACKAGE_VARIANT \

‎.evergreen/run-evergreen-release.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ echo "//registry.npmjs.org/:_authToken=${devtoolsbot_npm_token}" > .npmrc
55
set -x
66
export NODE_JS_VERSION=${node_js_version}
77
source .evergreen/setup-env.sh
8-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
8+
export PUPPETEER_SKIP_DOWNLOAD="true"
99
npm run evergreen-release $@

‎.evergreen/setup-env.sh‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
set -e
22
set -x
33

4+
OS_ARCH="$(uname "-m")"
5+
if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ] ; then
6+
echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
7+
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
8+
else
9+
echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
10+
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
11+
fi
12+
413
export BASEDIR="$PWD/.evergreen"
5-
export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/cygdrive/c/Python311/Scripts:/cygdrive/c/Python311:/opt/python/3.6/bin:$BASEDIR/mingit/cmd:$BASEDIR/mingit/mingw64/libexec/git-core:$BASEDIR/git-2:$BASEDIR/npm-10/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:/opt/chefdk/gitbin:/cygdrive/c/cmake/bin:/opt/mongodbtoolchain/v3/bin:$PATH"
14+
export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/cygdrive/c/Python311/Scripts:/cygdrive/c/Python311:/opt/python/3.6/bin:$BASEDIR/mingit/cmd:$BASEDIR/mingit/mingw64/libexec/git-core:$BASEDIR/git-2:$BASEDIR/npm-10/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:/opt/chefdk/gitbin:/cygdrive/c/cmake/bin:$TOOLCHAIN_PATH:$PATH"
615

716
export MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT=100000
817
export IS_MONGOSH_EVERGREEN_CI=1

‎.github/workflows/homebrew.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: "Smoke Test Homebrew install"
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * *"
6+
7+
jobs:
8+
smoke-test-homebrew:
9+
name: Test on ${{ matrix.runner }}
10+
runs-on: ${{ matrix.runner}}
11+
strategy:
12+
matrix:
13+
runner: [macos-13, macos-14, macos-15]
14+
fail-fast: false
15+
steps:
16+
- name: Install mongosh
17+
run: brew install mongosh
18+
19+
- name: Run smoke tests
20+
run: npx --yes mongodb-runner exec -- sh -c 'env MONGOSH_SMOKE_TEST_SERVER=$MONGODB_URI mongosh --smokeTests'
21+
22+
- name: Report failure
23+
if: ${{ failure() }}
24+
env:
25+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_MONGOSH_DEVEL_WEBHOOK_URL }}
26+
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
27+
uses: slackapi/[email protected]
28+
with:
29+
payload: |
30+
{
31+
"text": "Homebrew smoke test failed on ${{ matrix.runner }}",
32+
"blocks": [
33+
{
34+
"type": "section",
35+
"text": {
36+
"type": "mrkdwn",
37+
"text": "Homebrew smoke test failed on ${{ matrix.runner }}: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.run_id }}>"
38+
}
39+
}
40+
]
41+
}

0 commit comments

Comments
 (0)