Skip to content

Commit 29f27fd

Browse files
committed
Drop obsolete test scripts
This drops the legacy VM environment and remnants of the travis-ci config
1 parent 3257ebd commit 29f27fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+8
-21700
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ php.ini
4848
.*
4949
!.github/
5050
!tests/utils/*.php
51-
!.travis.yml
52-
!.travis.scripts/
5351
!.evergreen
5452
.evergreen/atlas-uris.txt
5553

CONTRIBUTING.md

Lines changed: 8 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,15 @@ run in as many environments as possible. To paraphrase the
8989
Consider that a well-crafted `EXPECTF` section may allow a `SKIPIF` section to
9090
be less restrictive.
9191

92-
### Local Mongo Orchestration (and Travis CI)
92+
### Local Mongo Orchestration (and CI platforms)
9393

9494
The test suite depends on [Mongo Orchestration](https://github.com/10gen/mongo-orchestration).
9595
Mongo Orchestration is an HTTP server that provides a REST API for maintaining
96-
MongoDB configurations. These configurations are located in ``scripts/presets``
97-
and for Travis CI in ``scripts/presets/travis``. The presets for Travis CI can
98-
also be spun-up locally, and that is the preferred testing method. An older way
99-
using a specific VM is also still available (see further down).
96+
MongoDB configurations. These configurations are provided by the
97+
[drivers-evergreen-tools](https://github.com/mongodb-labs/drivers-evergreen-tools)
98+
repository. These configurations can be run locally. Alternatively, you can use
99+
the GitHub Actions workflow if you don't want to set up a local development
100+
environment.
100101

101102
Mongo Orchestration expects that the ``mongod`` (and ``mongos``) binaries are
102103
available in the ``PATH``.
@@ -107,71 +108,12 @@ Once installed, Mongo Orchestration can be started with
107108
~/.local/bin/mongo-orchestration start --no-fork --enable-majority-read-concern
108109
```
109110

110-
The Travis CI setup uses
111-
[deployments](https://github.com/mongodb/mongo-php-driver/blob/master/.travis.scripts/setup_mo.sh)
112-
to test different topologies. Currently, it supports ``STANDALONE``,
113-
``STANDALONE_OLD`` (for MongoDB versions before 3.6), ``STANDALONE_SSL``,
114-
``REPLICASET`` and ``SHARDED_CLUSTER``.
115-
116111
The test suite uses the ``MONGODB_URI`` environment variable as connection
117-
string to run all tests. In order to make the URI available to the test suite,
118-
you can run the following for a "deployment" in the *root* of the MongoDB
119-
Driver GIT checkout:
120-
121-
```
122-
export TRAVIS_BUILD_DIR=`pwd`
123-
DEPLOYMENT=STANDALONE_AUTH .travis.scripts/setup_mo.sh
124-
export MONGODB_URI=`cat /tmp/uri.txt`
125-
```
112+
string to run all tests. If not set, tests assume MongoDB is listening on the
113+
default MongoDB port (27017) on localhost.
126114

127115
With this set-up, the tests can be run with `make test`.
128116

129-
### VM-based Mongo Orchestration (legacy set-up)
130-
131-
Alternative to the Travis CI set-up, our test suite also includes scripts to configure test environments
132-
with [Vagrant](https://www.vagrantup.com/) and
133-
[Mongo Orchestration](https://github.com/10gen/mongo-orchestration).
134-
The deployments started in this Vagrant image have hard coded URLs to be used
135-
with the ``MONGODB_URI`` environment variable:
136-
137-
Deployment | URI
138-
--------------------------- | ---
139-
Standalone (MongoDB 4.0) | `mongodb://192.168.112.10:2000`
140-
Standalone (MongoDB 3.0) | `mongodb://192.168.112.10:2700`
141-
Standalone with SSL | `mongodb://192.168.112.10:2100`
142-
Standalone with Auth | `mongodb://root:[email protected]:2200/?authSource=admin`
143-
Standalone with X509 Auth | `mongodb://C=US,ST=New York,L=New York City,O=MongoDB,OU=KernelUser,[email protected]:2300/?authSource=$external&authMechanism=MONGODB-X509`
144-
Standalone with Plain Auth | `mongodb://root:[email protected]:2400/?authSource=admin`
145-
Replicaset (MongoDB 4.0) | `mongodb://192.168.112.10:3000,192.168.112.10:3001,192.168.112.10:3002/?replicaSet=REPLICASET`
146-
Replicaset (MongoDB 3.0) | `mongodb://192.168.112.10:3100,192.168.112.10:3101,192.168.112.10:3102/?replicaSet=REPLICASET_30`
147-
Replicaset (MongoDB 3.6) | `mongodb://192.168.112.10:3200,192.168.112.10:3201,192.168.112.10:3202/?replicaSet=REPLICASET_36`
148-
149-
The Vagrant images can be started by using:
150-
151-
```
152-
$ make vm # Starts the test VMs with Vagrant
153-
$ make test-bootstrap # Starts the mongod servers within the test VM
154-
```
155-
156-
After this set-up is completed, you need to export the `MONGODB_URI`
157-
environment variables with one of the values from the table above. The `test`
158-
make target may be used to execute the test suite:
159-
160-
```
161-
$ make test # Executes the test suite against the VMs
162-
```
163-
164-
To find out which VM servers are running at a later point in time, you can run
165-
`make test-bootstrap` to obtain a list of deployments and their URIs.
166-
167-
#### Restarting Mongo Orchestration
168-
169-
If something goes awry in the test VM, you can reload it by running:
170-
171-
```
172-
make test-bootstrap
173-
```
174-
175117
## Updating libmongoc, libbson, and libmongocrypt
176118

177119
The PHP driver can use either system libraries or bundled versions of

Makefile.frag

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,17 @@ MONGODB_MINOR=$(shell echo $(MONGODB_VERSION) | cut -d. -f1,2)
1111
MONGODB_STABILITY=$(shell php -n -dextension=modules/mongodb.so -r 'echo MONGODB_STABILITY;')
1212

1313
help:
14-
@echo -e "\t$$ make vm"
15-
@echo -e "\t - Launches VMs for running multiple MongoDB variations"
16-
@echo -e "\t$$ make list-servers"
17-
@echo -e "\t - Lists running servers, and their URIs"
18-
@echo -e "\t$$ make test-bootstrap"
19-
@echo -e "\t - Starts up MongoDB through mongo-orchestration"
20-
2114
@echo ""
2215
@echo -e "\t$$ make coveralls"
2316
@echo -e "\t - Creates code coverage report using coveralls"
2417
@echo -e "\t$$ make coverage"
2518
@echo -e "\t - Creates code coverage report using gcov"
2619

27-
@echo ""
28-
@echo -e "\t$$ make distcheck"
29-
@echo -e "\t - Builds the archive, runs the virtual tests"
30-
3120
@echo ""
3221
@echo -e "\t$$ make package.xml"
3322
@echo -e "\t - Creates a package.xml file with empty release notes"
3423
@echo -e "\t$$ make package"
3524
@echo -e "\t - Creates the pecl archive to use for provisioning"
36-
@echo -e "\t$$ make test-virtual"
37-
@echo -e "\t - Provisions some VMs, installs the pecl archive and executes the tests"
3825

3926

4027
mv-coverage:
@@ -56,19 +43,6 @@ coverage: mv-coverage lcov-local
5643
coveralls: mv-coverage lcov-coveralls
5744
coveralls --exclude src/libbson --exclude src/libmongoc --exclude src/contrib --exclude lib --exclude tests
5845

59-
vm:
60-
@command -v vagrant >/dev/null 2>&1 || { echo >&2 "Vagrant needs to be installed to run vms"; exit 1; }
61-
@vagrant up ldap mo
62-
63-
list-servers:
64-
php scripts/list-servers.php
65-
66-
test-bootstrap:
67-
vagrant reload mo
68-
vagrant ssh mo -c 'sudo rm -f /home/vagrant/server.pid'
69-
vagrant ssh mo -c 'sudo mongo-orchestration -f mongo-orchestration-config.json -b 192.168.112.10 --enable-majority-read-concern start'
70-
php scripts/start-servers.php
71-
7246
format:
7347
$(top_srcdir)/scripts/clang-format.sh
7448

@@ -78,13 +52,6 @@ format-changed:
7852
format-check:
7953
$(top_srcdir)/scripts/clang-format.sh check
8054

81-
distcheck: package test-virtual
82-
83-
test-virtual: package
84-
sh ./scripts/run-tests-on.sh freebsd
85-
sh ./scripts/run-tests-on.sh precise32
86-
sh ./scripts/run-tests-on.sh precise64
87-
8855
test-clean:
8956
find $(top_srcdir)/tests -not \( -path $(top_srcdir)/tests/utils -prune \) -type f -name "*.diff" -o -name "*.exp" -o -name "*.log" -o -name "*.mem" -o -name "*.out" -o -name "*.php" -o -name "*.sh" | xargs -r rm
9057

bin/prep-release.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ function get_files() {
7171
"Vagrantfile",
7272

7373
"scripts/*/*.{sh}",
74-
"scripts/*/ldap/*.{conf,ldif,py,sh}",
75-
"scripts/centos/ldap/users",
76-
"scripts/presets/*.{json}",
7774
"scripts/ssl/*.pem",
7875
"scripts/*.{json,php,py,sh}",
7976
"tests/utils/*.{inc,json.gz,php}",

scripts/centos/essentials.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

scripts/centos/ldap/Domain.ldif

Lines changed: 0 additions & 5 deletions
This file was deleted.

scripts/centos/ldap/Users.ldif

Lines changed: 0 additions & 3 deletions
This file was deleted.

scripts/centos/ldap/basics.ldif

Lines changed: 0 additions & 10 deletions
This file was deleted.

scripts/centos/ldap/install.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

scripts/centos/ldap/ldapconfig.py

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)