Skip to content

Commit 7fc62fa

Browse files
Remove egos (#2715)
1 parent 2803b97 commit 7fc62fa

File tree

2 files changed

+12
-45
lines changed

2 files changed

+12
-45
lines changed

.evergreen/config.yml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ command_type: system
1616
# Protect ourself against rogue test case, or curl gone wild, that runs forever.
1717
exec_timeout_secs: 3600
1818

19-
2019
# What to do when evergreen hits the timeout (`post:` tasks are run automatically)
2120
timeout:
2221
- command: shell.exec
@@ -38,20 +37,6 @@ functions:
3837
3938
git submodule update --init --recursive
4039
41-
"fetch egos":
42-
- command: shell.exec
43-
params:
44-
working_dir: "src"
45-
script: |
46-
set -e
47-
48-
# Python version:
49-
#curl -sfLo egos https://raw.githubusercontent.com/p-mongo/egos/master/egos
50-
51-
# C version:
52-
curl --retry 3 -sfLo egos.c https://raw.githubusercontent.com/p-mongo/egos/master/egos.c
53-
gcc -O2 -g -oegos -lrt egos.c
54-
5540
"create expansions":
5641
# Make an evergreen expansion file with dynamic values
5742
- command: shell.exec
@@ -383,7 +368,7 @@ functions:
383368
script: |
384369
${PREPARE_SHELL}
385370
set -x
386-
./egos stdbuf -i0 -o0 -e0 .evergreen/test-on-docker -d ${os} MONGODB_VERSION=${mongodb-version} TOPOLOGY=${topology} RVM_RUBY=${ruby} -s .evergreen/run-tests.sh TEST_CMD=true ${PRELOAD_ARG}
371+
.evergreen/test-on-docker -d ${os} MONGODB_VERSION=${mongodb-version} TOPOLOGY=${topology} RVM_RUBY=${ruby} -s .evergreen/run-tests.sh TEST_CMD=true ${PRELOAD_ARG}
387372
388373
"run tests":
389374
- command: shell.exec
@@ -393,7 +378,7 @@ functions:
393378
working_dir: "src"
394379
script: |
395380
${PREPARE_SHELL}
396-
./egos stdbuf -i0 -o0 -e0 .evergreen/run-tests.sh
381+
.evergreen/run-tests.sh
397382
398383
"run tests via docker":
399384
- command: shell.exec
@@ -403,7 +388,7 @@ functions:
403388
working_dir: "src"
404389
script: |
405390
${PREPARE_SHELL}
406-
./egos stdbuf -i0 -o0 -e0 .evergreen/run-tests-docker.sh
391+
.evergreen/run-tests-docker.sh
407392
408393
"run AWS auth tests":
409394
- command: shell.exec
@@ -413,7 +398,7 @@ functions:
413398
working_dir: "src"
414399
script: |
415400
${PREPARE_SHELL}
416-
./egos stdbuf -i0 -o0 -e0 .evergreen/run-tests-aws-auth.sh
401+
.evergreen/run-tests-aws-auth.sh
417402
418403
"run Kerberos unit tests":
419404
- command: shell.exec
@@ -423,7 +408,7 @@ functions:
423408
working_dir: "src"
424409
script: |
425410
${PREPARE_SHELL}
426-
./egos stdbuf -i0 -o0 -e0 .evergreen/run-tests-kerberos-unit.sh
411+
.evergreen/run-tests-kerberos-unit.sh
427412
428413
"run Kerberos integration tests":
429414
- command: shell.exec
@@ -433,7 +418,7 @@ functions:
433418
working_dir: "src"
434419
script: |
435420
${PREPARE_SHELL}
436-
./egos stdbuf -i0 -o0 -e0 .evergreen/run-tests-kerberos-integration.sh
421+
.evergreen/run-tests-kerberos-integration.sh
437422
438423
"run Atlas tests":
439424
- command: shell.exec
@@ -472,7 +457,6 @@ functions:
472457
473458
pre:
474459
- func: "fetch source"
475-
- func: "fetch egos"
476460
- func: "create expansions"
477461

478462
post:

.evergreen/config/common.yml.erb

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ command_type: system
1313
# Protect ourself against rogue test case, or curl gone wild, that runs forever.
1414
exec_timeout_secs: 3600
1515

16-
<% egos_wrap = "./egos stdbuf -i0 -o0 -e0" %>
17-
1816
# What to do when evergreen hits the timeout (`post:` tasks are run automatically)
1917
timeout:
2018
- command: shell.exec
@@ -36,20 +34,6 @@ functions:
3634

3735
git submodule update --init --recursive
3836

39-
"fetch egos":
40-
- command: shell.exec
41-
params:
42-
working_dir: "src"
43-
script: |
44-
set -e
45-
46-
# Python version:
47-
#curl -sfLo egos https://raw.githubusercontent.com/p-mongo/egos/master/egos
48-
49-
# C version:
50-
curl --retry 3 -sfLo egos.c https://raw.githubusercontent.com/p-mongo/egos/master/egos.c
51-
gcc -O2 -g -oegos -lrt egos.c
52-
5337
"create expansions":
5438
# Make an evergreen expansion file with dynamic values
5539
- command: shell.exec
@@ -381,7 +365,7 @@ functions:
381365
script: |
382366
${PREPARE_SHELL}
383367
set -x
384-
<%= egos_wrap %> .evergreen/test-on-docker -d ${os} MONGODB_VERSION=${mongodb-version} TOPOLOGY=${topology} RVM_RUBY=${ruby} -s .evergreen/run-tests.sh TEST_CMD=true ${PRELOAD_ARG}
368+
.evergreen/test-on-docker -d ${os} MONGODB_VERSION=${mongodb-version} TOPOLOGY=${topology} RVM_RUBY=${ruby} -s .evergreen/run-tests.sh TEST_CMD=true ${PRELOAD_ARG}
385369

386370
"run tests":
387371
- command: shell.exec
@@ -391,7 +375,7 @@ functions:
391375
working_dir: "src"
392376
script: |
393377
${PREPARE_SHELL}
394-
<%= egos_wrap %> .evergreen/run-tests.sh
378+
.evergreen/run-tests.sh
395379

396380
"run tests via docker":
397381
- command: shell.exec
@@ -401,7 +385,7 @@ functions:
401385
working_dir: "src"
402386
script: |
403387
${PREPARE_SHELL}
404-
<%= egos_wrap %> .evergreen/run-tests-docker.sh
388+
.evergreen/run-tests-docker.sh
405389

406390
"run AWS auth tests":
407391
- command: shell.exec
@@ -411,7 +395,7 @@ functions:
411395
working_dir: "src"
412396
script: |
413397
${PREPARE_SHELL}
414-
<%= egos_wrap %> .evergreen/run-tests-aws-auth.sh
398+
.evergreen/run-tests-aws-auth.sh
415399

416400
"run Kerberos unit tests":
417401
- command: shell.exec
@@ -421,7 +405,7 @@ functions:
421405
working_dir: "src"
422406
script: |
423407
${PREPARE_SHELL}
424-
<%= egos_wrap %> .evergreen/run-tests-kerberos-unit.sh
408+
.evergreen/run-tests-kerberos-unit.sh
425409

426410
"run Kerberos integration tests":
427411
- command: shell.exec
@@ -431,7 +415,7 @@ functions:
431415
working_dir: "src"
432416
script: |
433417
${PREPARE_SHELL}
434-
<%= egos_wrap %> .evergreen/run-tests-kerberos-integration.sh
418+
.evergreen/run-tests-kerberos-integration.sh
435419

436420
"run Atlas tests":
437421
- command: shell.exec
@@ -470,7 +454,6 @@ functions:
470454

471455
pre:
472456
- func: "fetch source"
473-
- func: "fetch egos"
474457
- func: "create expansions"
475458

476459
post:

0 commit comments

Comments
 (0)