Skip to content

Commit 21064bb

Browse files
gagikgagik
authored
Merge branch 'main' into gagik/fix-vscode-test
2 parents 6589a2b + 5e8542a commit 21064bb

35 files changed

+618
-69
lines changed

‎.evergreen.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7132,7 +7132,7 @@ functions:
71327132
{
71337133
export NODE_JS_VERSION=${node_js_version}
71347134
source .evergreen/setup-env.sh
7135-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
7135+
export PUPPETEER_SKIP_DOWNLOAD="true"
71367136
npm run evergreen-release draft
71377137
}
71387138

@@ -7150,7 +7150,7 @@ functions:
71507150
node_js_version: ${node_js_version}
71517151
script: |
71527152
set -e
7153-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
7153+
export PUPPETEER_SKIP_DOWNLOAD="true"
71547154
.evergreen/run-evergreen-release.sh download-and-list-artifacts
71557155
- command: shell.exec
71567156
params:
@@ -7179,7 +7179,7 @@ functions:
71797179
node_js_version: ${node_js_version}
71807180
script: |
71817181
set -e
7182-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
7182+
export PUPPETEER_SKIP_DOWNLOAD="true"
71837183
.evergreen/run-evergreen-release.sh publish -- --dry-run
71847184

71857185
release_publish:
@@ -7198,7 +7198,7 @@ functions:
71987198
node_js_version: ${node_js_version}
71997199
script: |
72007200
set -e
7201-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
7201+
export PUPPETEER_SKIP_DOWNLOAD="true"
72027202
.evergreen/run-evergreen-release.sh publish
72037203

72047204
run_perf_tests:
@@ -17183,8 +17183,8 @@ buildvariants:
1718317183
tasks:
1718417184
- name: compile_artifact
1718517185
- name: linux_ppc64le_build
17186-
display_name: "RHEL 8.1 PPC (build)"
17187-
run_on: rhel81-power8-small
17186+
display_name: "RHEL 8 PPC (build)"
17187+
run_on: rhel8-power-small
1718817188
expansions:
1718917189
executable_os_id: linux-ppc64le
1719017190
tasks:
@@ -17370,9 +17370,9 @@ buildvariants:
1737017370
tasks:
1737117371
- name: e2e_tests_linux_arm64
1737217372
- name: e2e_tests_linux_arm64_openssl3
17373-
- name: e2e_rhel81_ppc64le
17374-
display_name: "RHEL 8.1 PPC (E2E Tests)"
17375-
run_on: rhel81-power8-small
17373+
- name: e2e_rhel8_ppc64le
17374+
display_name: "RHEL 8 PPC (E2E Tests)"
17375+
run_on: rhel8-power-small
1737617376
tasks:
1737717377
- name: e2e_tests_linux_ppc64le
1737817378
- name: e2e_rhel7_s390x
@@ -17750,9 +17750,9 @@ buildvariants:
1775017750
run_on: rhel8-zseries-small
1775117751
tasks:
1775217752
- name: pkg_test_rpmextract_rpm_s390x
17753-
- name: pkg_smoke_tests_rhel81_ppc64le
17754-
display_name: "package smoke tests (RHEL 8.1 ppc64le)"
17755-
run_on: rhel81-power8-small
17753+
- name: pkg_smoke_tests_rhel8_ppc64le
17754+
display_name: "package smoke tests (RHEL 8 ppc64le)"
17755+
run_on: rhel8-power-small
1775617756
tasks:
1775717757
- name: pkg_test_rpmextract_rpm_ppc64le
1775817758

‎.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
@@ -967,7 +967,7 @@ functions:
967967
{
968968
export NODE_JS_VERSION=${node_js_version}
969969
source .evergreen/setup-env.sh
970-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
970+
export PUPPETEER_SKIP_DOWNLOAD="true"
971971
npm run evergreen-release draft
972972
}
973973

@@ -985,7 +985,7 @@ functions:
985985
node_js_version: ${node_js_version}
986986
script: |
987987
set -e
988-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
988+
export PUPPETEER_SKIP_DOWNLOAD="true"
989989
.evergreen/run-evergreen-release.sh download-and-list-artifacts
990990
- command: shell.exec
991991
params:
@@ -1014,7 +1014,7 @@ functions:
10141014
node_js_version: ${node_js_version}
10151015
script: |
10161016
set -e
1017-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
1017+
export PUPPETEER_SKIP_DOWNLOAD="true"
10181018
.evergreen/run-evergreen-release.sh publish -- --dry-run
10191019

10201020
release_publish:
@@ -1033,7 +1033,7 @@ functions:
10331033
node_js_version: ${node_js_version}
10341034
script: |
10351035
set -e
1036-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
1036+
export PUPPETEER_SKIP_DOWNLOAD="true"
10371037
.evergreen/run-evergreen-release.sh publish
10381038

10391039
run_perf_tests:
@@ -1676,8 +1676,8 @@ buildvariants:
16761676
tasks:
16771677
- name: compile_artifact
16781678
- name: linux_ppc64le_build
1679-
display_name: "RHEL 8.1 PPC (build)"
1680-
run_on: rhel81-power8-small
1679+
display_name: "RHEL 8 PPC (build)"
1680+
run_on: rhel8-power-small
16811681
expansions:
16821682
executable_os_id: linux-ppc64le
16831683
tasks:
@@ -1863,9 +1863,9 @@ buildvariants:
18631863
tasks:
18641864
- name: e2e_tests_linux_arm64
18651865
- name: e2e_tests_linux_arm64_openssl3
1866-
- name: e2e_rhel81_ppc64le
1867-
display_name: "RHEL 8.1 PPC (E2E Tests)"
1868-
run_on: rhel81-power8-small
1866+
- name: e2e_rhel8_ppc64le
1867+
display_name: "RHEL 8 PPC (E2E Tests)"
1868+
run_on: rhel8-power-small
18691869
tasks:
18701870
- name: e2e_tests_linux_ppc64le
18711871
- name: e2e_rhel7_s390x
@@ -2015,9 +2015,9 @@ buildvariants:
20152015
run_on: rhel8-zseries-small
20162016
tasks:
20172017
- name: pkg_test_rpmextract_rpm_s390x
2018-
- name: pkg_smoke_tests_rhel81_ppc64le
2019-
display_name: "package smoke tests (RHEL 8.1 ppc64le)"
2020-
run_on: rhel81-power8-small
2018+
- name: pkg_smoke_tests_rhel8_ppc64le
2019+
display_name: "package smoke tests (RHEL 8 ppc64le)"
2020+
run_on: rhel8-power-small
20212021
tasks:
20222022
- name: pkg_test_rpmextract_rpm_ppc64le
20232023

‎.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)