Skip to content

Commit 04076fa

Browse files
committed
Use the new toolchain
1 parent 9ce8f90 commit 04076fa

13 files changed

+137
-13
lines changed

.evergreen/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ functions:
341341
"upload test results":
342342
- command: attach.xunit_results
343343
params:
344-
file: ./src/rspec.xml
344+
file: ./src/tmp/*.xml
345345

346346
"delete private environment":
347347
- command: shell.exec

.evergreen/config/common.yml.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ functions:
338338
"upload test results":
339339
- command: attach.xunit_results
340340
params:
341-
file: ./src/rspec.xml
341+
file: ./src/tmp/*.xml
342342

343343
"delete private environment":
344344
- command: shell.exec

.evergreen/run-tests-atlas-full.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,19 @@ set -ex
88

99
set_env_vars
1010
set_env_python
11-
set_env_ruby
11+
12+
# Install rbenv and download the requested ruby version
13+
rm -rf ~/.rbenv
14+
git clone https://github.com/rbenv/rbenv.git ~/.rbenv
15+
rm -rf ~/.rbenv/versions/
16+
curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
17+
export PATH="$HOME/.rbenv/bin:$PATH"
18+
eval "$(rbenv init - bash)"
19+
export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
20+
rbenv global $FULL_RUBY_VERSION
21+
22+
export JAVA_HOME=/opt/java/jdk21
23+
export JAVACMD=$JAVA_HOME/bin/java
1224

1325
bundle_install
1426

.evergreen/run-tests-atlas.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,19 @@ set -ex
88

99
set_env_vars
1010
set_env_python
11-
set_env_ruby
11+
12+
# Install rbenv and download the requested ruby version
13+
rm -rf ~/.rbenv
14+
git clone https://github.com/rbenv/rbenv.git ~/.rbenv
15+
rm -rf ~/.rbenv/versions/
16+
curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
17+
export PATH="$HOME/.rbenv/bin:$PATH"
18+
eval "$(rbenv init - bash)"
19+
export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
20+
rbenv global $FULL_RUBY_VERSION
21+
22+
export JAVA_HOME=/opt/java/jdk21
23+
export JAVACMD=$JAVA_HOME/bin/java
1224

1325
bundle_install
1426

.evergreen/run-tests-azure.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,19 @@ set -ex
88

99
set_env_vars
1010
set_env_python
11-
set_env_ruby
11+
12+
# Install rbenv and download the requested ruby version
13+
rm -rf ~/.rbenv
14+
git clone https://github.com/rbenv/rbenv.git ~/.rbenv
15+
rm -rf ~/.rbenv/versions/
16+
curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
17+
export PATH="$HOME/.rbenv/bin:$PATH"
18+
eval "$(rbenv init - bash)"
19+
export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
20+
rbenv global $FULL_RUBY_VERSION
21+
22+
export JAVA_HOME=/opt/java/jdk21
23+
export JAVACMD=$JAVA_HOME/bin/java
1224

1325
sudo apt-get -y install libyaml-dev cmake
1426

.evergreen/run-tests-deployed-lambda.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,20 @@ set -ex
88

99
set_env_vars
1010
set_env_python
11-
set_env_ruby
11+
12+
13+
# Install rbenv and download the requested ruby version
14+
rm -rf ~/.rbenv
15+
git clone https://github.com/rbenv/rbenv.git ~/.rbenv
16+
rm -rf ~/.rbenv/versions/
17+
curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
18+
export PATH="$HOME/.rbenv/bin:$PATH"
19+
eval "$(rbenv init - bash)"
20+
export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
21+
rbenv global $FULL_RUBY_VERSION
22+
23+
export JAVA_HOME=/opt/java/jdk21
24+
export JAVACMD=$JAVA_HOME/bin/java
1225

1326
export MONGODB_URI=${MONGODB_URI}
1427
export CLUSTER_PREFIX="ruby-driver-"

.evergreen/run-tests-ecs.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,20 @@ show_local_instructions
1717
set_home
1818
set_env_vars
1919
set_env_python
20-
set_env_ruby
20+
21+
22+
# Install rbenv and download the requested ruby version
23+
rm -rf ~/.rbenv
24+
git clone https://github.com/rbenv/rbenv.git ~/.rbenv
25+
rm -rf ~/.rbenv/versions/
26+
curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
27+
export PATH="$HOME/.rbenv/bin:$PATH"
28+
eval "$(rbenv init - bash)"
29+
export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
30+
rbenv global $FULL_RUBY_VERSION
31+
32+
export JAVA_HOME=/opt/java/jdk21
33+
export JAVACMD=$JAVA_HOME/bin/java
2134

2235
bundle install --quiet
2336

.evergreen/run-tests-gcp.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,19 @@ set -ex
99

1010
set_env_vars
1111
set_env_python
12-
set_env_ruby
12+
13+
# Install rbenv and download the requested ruby version
14+
rm -rf ~/.rbenv
15+
git clone https://github.com/rbenv/rbenv.git ~/.rbenv
16+
rm -rf ~/.rbenv/versions/
17+
curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
18+
export PATH="$HOME/.rbenv/bin:$PATH"
19+
eval "$(rbenv init - bash)"
20+
export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
21+
rbenv global $FULL_RUBY_VERSION
22+
23+
export JAVA_HOME=/opt/java/jdk21
24+
export JAVACMD=$JAVA_HOME/bin/java
1325

1426
sudo apt-get -y install libyaml-dev cmake
1527

.evergreen/run-tests-kerberos-integration.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,19 @@ show_local_instructions
1919

2020
set_env_vars
2121
set_env_python
22-
set_env_ruby
22+
23+
# Install rbenv and download the requested ruby version
24+
rm -rf ~/.rbenv
25+
git clone https://github.com/rbenv/rbenv.git ~/.rbenv
26+
rm -rf ~/.rbenv/versions/
27+
curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
28+
export PATH="$HOME/.rbenv/bin:$PATH"
29+
eval "$(rbenv init - bash)"
30+
export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
31+
rbenv global $FULL_RUBY_VERSION
32+
33+
export JAVA_HOME=/opt/java/jdk21
34+
export JAVACMD=$JAVA_HOME/bin/java
2335

2436
# Note that:
2537
#

.evergreen/run-tests-kerberos-unit.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,21 @@ show_local_instructions
1616

1717
set_env_vars
1818
set_env_python
19-
set_env_ruby
2019

20+
21+
# Install rbenv and download the requested ruby version
22+
rm -rf ~/.rbenv
23+
git clone https://github.com/rbenv/rbenv.git ~/.rbenv
24+
rm -rf ~/.rbenv/versions/
25+
curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
26+
export PATH="$HOME/.rbenv/bin:$PATH"
27+
eval "$(rbenv init - bash)"
28+
export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
29+
rbenv global $FULL_RUBY_VERSION
30+
31+
export JAVA_HOME=/opt/java/jdk21
32+
33+
export JAVACMD=$JAVA_HOME/bin/java
2134
export BUNDLE_GEMFILE=gemfiles/mongo_kerberos.gemfile
2235
bundle_install
2336

0 commit comments

Comments
 (0)