From b780a9a6c17a78c4d4b1092d7362ce1e54f2206b Mon Sep 17 00:00:00 2001 From: mcasimir Date: Mon, 28 Feb 2022 12:39:04 +0100 Subject: [PATCH 1/6] test: move connectivity tests to EVG (without kerberos) --- .evergreen.yml | 64 +++++++++++++++++++++++ packages/data-service/src/connect.spec.ts | 6 +++ 2 files changed, 70 insertions(+) diff --git a/.evergreen.yml b/.evergreen.yml index ec442acefbf..1d37ddc348b 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -304,6 +304,54 @@ functions: DEBUG=${debug} MONGODB_VERSION=${mongodb_version|4} npm run --unsafe-perm --workspace compass-e2e-tests test-packaged-ci + test-connectivity: + - command: shell.exec + # Fail the task if it's idle for 10 mins + timeout_secs: 600 + params: + working_dir: src + shell: bash + env: + <<: *compass-env + COMPASS_APP_PATH: ${appPath} + COMPASS_APP_NAME: ${packagerOptions.name} + script: | + set -e + # Load environment variables + eval $(.evergreen/print-compass-env.sh) + + git clone https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs + cd test-envs + git checkout v1.2.4 + cd .. + docker-compose -f test-envs/docker/enterprise/docker-compose.yaml up -d + docker-compose -f test-envs/docker/ldap/docker-compose.yaml up -d + docker-compose -f test-envs/docker/scram/docker-compose.yaml up -d + docker-compose -f test-envs/docker/sharded/docker-compose.yaml up -d + docker-compose -f test-envs/docker/ssh/docker-compose.yaml up -d + docker-compose -f test-envs/docker/tls/docker-compose.yaml up -d + docker-compose -f test-envs/docker/kerberos/docker-compose.yaml up -d + + stop_all_docker_containers() { + docker-compose -f test-envs/docker/enterprise/docker-compose.yaml down -v --remove-orphans + docker-compose -f test-envs/docker/ldap/docker-compose.yaml down -v --remove-orphans + docker-compose -f test-envs/docker/scram/docker-compose.yaml down -v --remove-orphans + docker-compose -f test-envs/docker/sharded/docker-compose.yaml down -v --remove-orphans + docker-compose -f test-envs/docker/ssh/docker-compose.yaml down -v --remove-orphans + docker-compose -f test-envs/docker/tls/docker-compose.yaml down -v --remove-orphans + docker-compose -f test-envs/docker/kerberos/docker-compose.yaml down -v --remove-orphans + } + + trap "stop_all_docker_containers" ERR + + DEBUG=${debug} \ + MONGODB_VERSION=${mongodb_version|4} \ + SKIP_KERBEROS_TESTS=true \ + COMPASS_RUN_DOCKER_TESTS=true \ + npm run test --workspace mongodb-data-service + + stop_all_docker_containers + save-windows-artifacts: - <<: *save-artifact params: @@ -523,6 +571,16 @@ tasks: compass_distribution: compass-readonly variants: [ubuntu] + - name: test-connectivity + tags: ['required-for-publish'] + commands: + - func: prepare + - func: install + - func: bootstrap + - func: test-connectivity + vars: + debug: 'compass*,electron*,hadron*,mongo*' + # copied as test-packaged-app-macos due to depends_on variation - name: test-packaged-app tags: ['required-for-publish'] @@ -712,6 +770,12 @@ buildvariants: # everything in one go - name: publish + - name: ubuntu_connectivity_tests + display_name: Connectivity Tests + run_on: ubuntu1604-large + tasks: + - name: test-connectivity + - name: rhel display_name: RHEL run_on: rhel76-large diff --git a/packages/data-service/src/connect.spec.ts b/packages/data-service/src/connect.spec.ts index d0d5fd18649..4ab8e06c0b2 100644 --- a/packages/data-service/src/connect.spec.ts +++ b/packages/data-service/src/connect.spec.ts @@ -581,6 +581,12 @@ describe('connect', function () { }); describe('kerberos', function () { + before(function () { + if (process.env.SKIP_KERBEROS_TESTS === 'true') { + this.skip(); + } + }); + it('connects to kerberos', async function () { await testConnection(envs.getConnectionOptions('kerberos'), { authenticatedUserRoles: [ From 7bc609ba152c224d27434dc7d86953998c496230 Mon Sep 17 00:00:00 2001 From: mcasimir Date: Mon, 28 Feb 2022 12:40:45 +0100 Subject: [PATCH 2/6] remove unnecessary env --- .evergreen.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index 1d37ddc348b..26f11d0ac44 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -313,8 +313,6 @@ functions: shell: bash env: <<: *compass-env - COMPASS_APP_PATH: ${appPath} - COMPASS_APP_NAME: ${packagerOptions.name} script: | set -e # Load environment variables From 3e6ff179aec676cbfd0088fef3be2595a16704d2 Mon Sep 17 00:00:00 2001 From: mcasimir Date: Mon, 28 Feb 2022 15:11:56 +0100 Subject: [PATCH 3/6] move env to yaml --- .evergreen.yml | 4 ++-- packages/data-service/src/connect.spec.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index 26f11d0ac44..c44fe8cd448 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -313,6 +313,8 @@ functions: shell: bash env: <<: *compass-env + COMPASS_SKIP_KERBEROS_TESTS: 'true' + COMPASS_RUN_DOCKER_TESTS: 'true' script: | set -e # Load environment variables @@ -344,8 +346,6 @@ functions: DEBUG=${debug} \ MONGODB_VERSION=${mongodb_version|4} \ - SKIP_KERBEROS_TESTS=true \ - COMPASS_RUN_DOCKER_TESTS=true \ npm run test --workspace mongodb-data-service stop_all_docker_containers diff --git a/packages/data-service/src/connect.spec.ts b/packages/data-service/src/connect.spec.ts index 4ab8e06c0b2..bb4f2caaeb5 100644 --- a/packages/data-service/src/connect.spec.ts +++ b/packages/data-service/src/connect.spec.ts @@ -582,7 +582,7 @@ describe('connect', function () { describe('kerberos', function () { before(function () { - if (process.env.SKIP_KERBEROS_TESTS === 'true') { + if (process.env.COMPASS_SKIP_KERBEROS_TESTS === 'true') { this.skip(); } }); From ce0748b3b3714a3966e1c99f5b299b3b0e716880 Mon Sep 17 00:00:00 2001 From: Maurizio Casimirri Date: Tue, 1 Mar 2022 10:39:24 +0100 Subject: [PATCH 4/6] Update .evergreen.yml Co-authored-by: Sergey Petushkov --- .evergreen.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index c44fe8cd448..38e1b254cbb 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -320,10 +320,7 @@ functions: # Load environment variables eval $(.evergreen/print-compass-env.sh) - git clone https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs - cd test-envs - git checkout v1.2.4 - cd .. + git clone -b v1.2.4 https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs docker-compose -f test-envs/docker/enterprise/docker-compose.yaml up -d docker-compose -f test-envs/docker/ldap/docker-compose.yaml up -d docker-compose -f test-envs/docker/scram/docker-compose.yaml up -d From 1a3b2998c2628eae357d48318d151add9fd51514 Mon Sep 17 00:00:00 2001 From: mcasimir Date: Tue, 1 Mar 2022 10:43:35 +0100 Subject: [PATCH 5/6] env --- .evergreen.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index c44fe8cd448..f9d940bd432 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -315,6 +315,8 @@ functions: <<: *compass-env COMPASS_SKIP_KERBEROS_TESTS: 'true' COMPASS_RUN_DOCKER_TESTS: 'true' + MONGODB_VERSION: ${mongodb_version|4} + DEBUG: ${debug} script: | set -e # Load environment variables @@ -343,11 +345,7 @@ functions: } trap "stop_all_docker_containers" ERR - - DEBUG=${debug} \ - MONGODB_VERSION=${mongodb_version|4} \ - npm run test --workspace mongodb-data-service - + npm run test --workspace mongodb-data-service stop_all_docker_containers save-windows-artifacts: @@ -770,7 +768,7 @@ buildvariants: - name: ubuntu_connectivity_tests display_name: Connectivity Tests - run_on: ubuntu1604-large + run_on: ubuntu2004-large tasks: - name: test-connectivity From 44883d55ff21df47708e18677a217587501716c5 Mon Sep 17 00:00:00 2001 From: mcasimir Date: Tue, 1 Mar 2022 15:51:16 +0100 Subject: [PATCH 6/6] skip start server --- .evergreen.yml | 5 ++--- packages/data-service/package.json | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index 49f02f34cc5..dbee22d522b 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -315,7 +315,6 @@ functions: <<: *compass-env COMPASS_SKIP_KERBEROS_TESTS: 'true' COMPASS_RUN_DOCKER_TESTS: 'true' - MONGODB_VERSION: ${mongodb_version|4} DEBUG: ${debug} script: | set -e @@ -342,7 +341,7 @@ functions: } trap "stop_all_docker_containers" ERR - npm run test --workspace mongodb-data-service + npm run test-connectivity --workspace mongodb-data-service stop_all_docker_containers save-windows-artifacts: @@ -765,7 +764,7 @@ buildvariants: - name: ubuntu_connectivity_tests display_name: Connectivity Tests - run_on: ubuntu2004-large + run_on: ubuntu1604-large tasks: - name: test-connectivity diff --git a/packages/data-service/package.json b/packages/data-service/package.json index 5c7d6b28add..d5fd1071a34 100644 --- a/packages/data-service/package.json +++ b/packages/data-service/package.json @@ -45,6 +45,7 @@ "check-ci": "npm run check", "pretest": "mongodb-runner start --port=27018 && node ../../scripts/rebuild.js keytar", "test": "mocha", + "test-connectivity": "mocha ./src/connect.spec.ts", "posttest": "mongodb-runner stop --port=27018", "test-cov": "nyc -x \"**/*.spec.*\" --reporter=lcov --reporter=text --reporter=html npm run test", "test-watch": "npm run test -- --watch",