Skip to content

Commit

Permalink
ci(NODE-4662): remove ubuntu in favor of rhel8 (#3423)
Browse files Browse the repository at this point in the history
  • Loading branch information
baileympearson authored Sep 28, 2022
1 parent 492456b commit 6b1cf88
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions .evergreen/config.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ tasks:
commands:
- func: install dependencies
vars:
NODE_LTS_NAME: gallium
NODE_LTS_NAME: hydrogen
- func: bootstrap mongo-orchestration
vars:
VERSION: rapid
Expand Down Expand Up @@ -965,6 +965,6 @@ ignore:
buildvariants:
- name: performance-tests
display_name: Performance Test
run_on: ubuntu1804-large
run_on: rhel80-large
tasks:
- run-spec-benchmark-tests
44 changes: 22 additions & 22 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ tasks:
commands:
- func: install dependencies
vars:
NODE_LTS_NAME: gallium
NODE_LTS_NAME: hydrogen
- func: bootstrap mongo-orchestration
vars:
VERSION: rapid
Expand Down Expand Up @@ -2246,12 +2246,12 @@ ignore:
buildvariants:
- name: performance-tests
display_name: Performance Test
run_on: ubuntu1804-large
run_on: rhel80-large
tasks:
- run-spec-benchmark-tests
- name: ubuntu-18.04-erbium
display_name: Ubuntu 18.04 Node Erbium
run_on: ubuntu1804-large
- name: rhel80-large-erbium
display_name: rhel8 Node Erbium
run_on: rhel80-large
expansions:
NODE_LTS_NAME: erbium
CLIENT_ENCRYPTION: true
Expand Down Expand Up @@ -2297,9 +2297,9 @@ buildvariants:
- test-tls-support-5.0
- test-tls-support-4.4
- test-tls-support-4.2
- name: ubuntu-18.04-fermium
display_name: Ubuntu 18.04 Node Fermium
run_on: ubuntu1804-large
- name: rhel80-large-fermium
display_name: rhel8 Node Fermium
run_on: rhel80-large
expansions:
NODE_LTS_NAME: fermium
CLIENT_ENCRYPTION: true
Expand Down Expand Up @@ -2345,9 +2345,9 @@ buildvariants:
- test-tls-support-5.0
- test-tls-support-4.4
- test-tls-support-4.2
- name: ubuntu-18.04-gallium
display_name: Ubuntu 18.04 Node Gallium
run_on: ubuntu1804-large
- name: rhel80-large-gallium
display_name: rhel8 Node Gallium
run_on: rhel80-large
expansions:
NODE_LTS_NAME: gallium
CLIENT_ENCRYPTION: true
Expand Down Expand Up @@ -2525,7 +2525,7 @@ buildvariants:
- test-rapid-server
- name: lint
display_name: lint
run_on: ubuntu1804-large
run_on: rhel80-large
tasks:
- run-unit-tests
- run-lint-checks
Expand All @@ -2534,12 +2534,12 @@ buildvariants:
- run-typescript-next
- name: mongosh_integration_tests
display_name: mongosh integration tests
run_on: ubuntu1804-test
run_on: ubuntu1804-large
tasks:
- run-mongosh-integration-tests
- name: ubuntu1804-test-mongodb-aws
display_name: MONGODB-AWS Auth test
run_on: ubuntu1804-test
run_on: ubuntu1804-large
expansions:
NODE_LTS_NAME: erbium
tasks:
Expand Down Expand Up @@ -2567,9 +2567,9 @@ buildvariants:
- aws-4.4-auth-test-run-aws-auth-test-with-aws-credentials-as-environment-variables
- aws-4.4-auth-test-run-aws-auth-test-with-aws-credentials-and-session-token-as-environment-variables
- aws-4.4-auth-test-run-aws-ECS-auth-test
- name: ubuntu1804-custom-dependency-tests
- name: rhel8-custom-dependency-tests
display_name: Custom Dependency Version Test
run_on: ubuntu1804-large
run_on: rhel80-large
tasks:
- run-custom-snappy-tests
- run-bson-ext-integration
Expand All @@ -2580,16 +2580,16 @@ buildvariants:
- run-custom-csfle-tests-rapid-master
- run-custom-csfle-tests-latest-pinned-commit
- run-custom-csfle-tests-latest-master
- name: ubuntu1804-test-serverless
- name: rhel8-test-serverless
display_name: Serverless Test
run_on: ubuntu1804-test
run_on: rhel80-large
expansions:
NODE_LTS_NAME: erbium
tasks:
- serverless_task_group
- name: ubuntu1804-no-auth-tests
- name: rhel8-no-auth-tests
display_name: No Auth Tests
run_on: ubuntu1804-large
run_on: rhel80-large
expansions:
CLIENT_ENCRYPTION: true
tasks:
Expand Down Expand Up @@ -2617,9 +2617,9 @@ buildvariants:
- test-3.6-server-noauth
- test-3.6-replica_set-noauth
- test-3.6-sharded_cluster-noauth
- name: ubuntu1804-test-lambda
- name: rhel8-test-lambda
display_name: AWS Lambda handler tests
run_on: ubuntu1804-test
run_on: rhel80-large
tasks:
- test-lambda-example
- test-lambda-aws-auth-example
24 changes: 12 additions & 12 deletions .evergreen/generate_evergreen_tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ const TOPOLOGIES = ['server', 'replica_set', 'sharded_cluster'];
const AWS_AUTH_VERSIONS = ['latest', '6.0', '5.0', '4.4'];
const TLS_VERSIONS = ['latest', '6.0', '5.0', '4.4', '4.2'];

const DEFAULT_OS = 'ubuntu1804-large';
const DEFAULT_OS = 'rhel80-large';

const OPERATING_SYSTEMS = [
{
name: 'ubuntu-18.04',
display_name: 'Ubuntu 18.04',
run_on: 'ubuntu1804-large'
name: 'rhel80-large',
display_name: 'rhel8',
run_on: DEFAULT_OS
},
{
name: 'windows-64-vs2019',
Expand Down Expand Up @@ -496,15 +496,15 @@ SINGLETON_TASKS.push({
BUILD_VARIANTS.push({
name: 'mongosh_integration_tests',
display_name: 'mongosh integration tests',
run_on: 'ubuntu1804-test',
run_on: 'ubuntu1804-large',
tasks: ['run-mongosh-integration-tests']
});

// special case for MONGODB-AWS authentication
BUILD_VARIANTS.push({
name: 'ubuntu1804-test-mongodb-aws',
display_name: 'MONGODB-AWS Auth test',
run_on: 'ubuntu1804-test',
run_on: 'ubuntu1804-large',
expansions: {
NODE_LTS_NAME: LOWEST_LTS
},
Expand Down Expand Up @@ -602,25 +602,25 @@ const coverageTask = {
SINGLETON_TASKS.push(...oneOffFuncAsTasks);

BUILD_VARIANTS.push({
name: 'ubuntu1804-custom-dependency-tests',
name: 'rhel8-custom-dependency-tests',
display_name: 'Custom Dependency Version Test',
run_on: DEFAULT_OS,
tasks: oneOffFuncAsTasks.map(({ name }) => name)
});

// special case for serverless testing
BUILD_VARIANTS.push({
name: 'ubuntu1804-test-serverless',
name: 'rhel8-test-serverless',
display_name: 'Serverless Test',
run_on: 'ubuntu1804-test',
run_on: DEFAULT_OS,
expansions: {
NODE_LTS_NAME: LOWEST_LTS
},
tasks: ['serverless_task_group']
});

BUILD_VARIANTS.push({
name: 'ubuntu1804-no-auth-tests',
name: 'rhel8-no-auth-tests',
display_name: 'No Auth Tests',
run_on: DEFAULT_OS,
expansions: {
Expand All @@ -630,9 +630,9 @@ BUILD_VARIANTS.push({
});

BUILD_VARIANTS.push({
name: 'ubuntu1804-test-lambda',
name: 'rhel8-test-lambda',
display_name: 'AWS Lambda handler tests',
run_on: 'ubuntu1804-test',
run_on: DEFAULT_OS,
tasks: ['test-lambda-example', 'test-lambda-aws-auth-example']
});

Expand Down

0 comments on commit 6b1cf88

Please sign in to comment.