Skip to content

Commit 9812d67

Browse files
committed
Upgrade VM to trusty64 and revise mo installation
This also removes unused server versions.
1 parent 9f9fe60 commit 9812d67

File tree

9 files changed

+20084
-52
lines changed

9 files changed

+20084
-52
lines changed

CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ URIs and resemble the following:
3030
```
3131
{
3232
"STANDALONE": "mongodb:\/\/192.168.112.10:2000",
33-
"STANDALONE_26": "mongodb:\/\/192.168.112.10:2600",
3433
"STANDALONE_30": "mongodb:\/\/192.168.112.10:2700",
3534
"STANDALONE_SSL": "mongodb:\/\/192.168.112.10:2100",
3635
"STANDALONE_AUTH": "mongodb:\/\/root:[email protected]:2200\/?authSource=admin",

Vagrantfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@ Vagrant.configure(2) do |config|
1818
config.vm.define "mo", primary: true do |mo|
1919
mo.vm.network "private_network", ip: "192.168.112.10"
2020

21-
mo.vm.box = "http://files.vagrantup.com/precise64.box"
22-
mo.vm.provider "vmware_workstation" do |vmware, override|
23-
override.vm.box_url = 'http://files.vagrantup.com/precise64_vmware.box'
24-
override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
25-
end
21+
mo.vm.box = "ubuntu/trusty64"
2622

2723
mo.vm.provision "shell", path: "scripts/ubuntu/essentials.sh", privileged: true
24+
mo.vm.provision "file", source: "scripts/ubuntu/get-pip.py", destination: "get-pip.py"
2825
mo.vm.provision "file", source: "scripts/ubuntu/mongo-orchestration-config.json", destination: "mongo-orchestration-config.json"
2926
mo.vm.provision "shell", path: "scripts/ubuntu/mongo-orchestration.sh", privileged: true
3027
mo.vm.provision "shell", path: "scripts/ubuntu/ldap/install.sh", privileged: true

bin/prep-release.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function get_files() {
6262
"scripts/centos/ldap/users",
6363
"scripts/presets/*.{json}",
6464
"scripts/ssl/*.pem",
65-
"scripts/*.{json,php,sh}",
65+
"scripts/*.{json,php,py,sh}",
6666
"tests/utils/*.{inc,json.gz,php}",
6767
"tests/**/*.{phpt}",
6868
),

scripts/presets/standalone-26.json

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

scripts/start-servers.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ function lap() {
1919
$PRESETS = [
2020
"standalone" => [
2121
"scripts/presets/standalone.json",
22-
"scripts/presets/standalone-26.json",
2322
"scripts/presets/standalone-30.json",
2423
"scripts/presets/standalone-ssl.json",
2524
"scripts/presets/standalone-auth.json",

scripts/ubuntu/get-pip.py

Lines changed: 20061 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"releases": {
3-
"36-release": "/home/vagrant/3.6.0/usr/bin",
4-
"32-release": "/home/vagrant/3.2.0/usr/bin",
5-
"30-release": "/home/vagrant/3.0.3/usr/bin",
6-
"26-release": "/home/vagrant/2.6.9/usr/bin"
3+
"36-release": "/home/vagrant/3.6/usr/bin",
4+
"30-release": "/home/vagrant/3.0/usr/bin"
75
}
86
}
Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,28 @@
1-
# Enable MongoDB Enterprise repo
1+
# 3.0
22
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
3-
# 3.2 key
4-
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927
5-
# testing key
6-
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 58712A2291FA4AD5
7-
echo 'deb http://repo.mongodb.com/apt/ubuntu precise/mongodb-enterprise/3.2 multiverse' | sudo tee /etc/apt/sources.list.d/mongodb-enterprise-3.2.list
8-
echo 'deb http://repo.mongodb.com/apt/ubuntu precise/mongodb-enterprise/3.0 multiverse' | sudo tee /etc/apt/sources.list.d/mongodb-enterprise-3.0.list
9-
echo 'deb http://repo.mongodb.com/apt/ubuntu precise/mongodb-enterprise/2.6 multiverse' | sudo tee /etc/apt/sources.list.d/mongodb-enterprise-2.6.list
10-
echo 'deb http://repo.mongodb.com/apt/ubuntu precise/mongodb-enterprise/3.6 multiverse' | sudo tee /etc/apt/sources.list.d/mongodb-enterprise-3.6.list
11-
apt-get update
123

13-
apt-get install -y libsnmp15 libgsasl7 libcurl4-openssl-dev
4+
# 3.6
5+
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
6+
7+
echo 'deb http://repo.mongodb.com/apt/ubuntu trusty/mongodb-enterprise/3.0 multiverse' | tee /etc/apt/sources.list.d/mongodb-enterprise-3.0.list
8+
echo 'deb http://repo.mongodb.com/apt/ubuntu trusty/mongodb-enterprise/3.6 multiverse' | tee /etc/apt/sources.list.d/mongodb-enterprise-3.6.list
149

15-
sudo apt-get download mongodb-enterprise-server=3.2.0
16-
sudo apt-get download mongodb-enterprise-mongos=3.2.0
17-
sudo apt-get download mongodb-enterprise-server=3.0.3
18-
sudo apt-get download mongodb-enterprise-server=2.6.9
19-
sudo apt-get download mongodb-enterprise-server=3.6.0
20-
dpkg -x mongodb-enterprise-server_2.6.9_amd64.deb 2.6.9
21-
dpkg -x mongodb-enterprise-server_3.0.3_amd64.deb 3.0.3
22-
dpkg -x mongodb-enterprise-server_3.2.0_amd64.deb 3.2.0
23-
dpkg -x mongodb-enterprise-mongos_3.2.0_amd64.deb 3.2.0
24-
dpkg -x mongodb-enterprise-server_3.6.0_amd64.deb 3.6.0
10+
apt-get update
2511

12+
apt-get install -y libsnmp30 libgsasl7 libcurl4-openssl-dev
13+
14+
apt-get download mongodb-enterprise-server=3.0.15
15+
apt-get download mongodb-enterprise-server=3.6.1
16+
apt-get download mongodb-enterprise-mongos=3.6.1
17+
dpkg -x mongodb-enterprise-server_3.0.15_amd64.deb 3.0
18+
dpkg -x mongodb-enterprise-server_3.6.1_amd64.deb 3.6
19+
dpkg -x mongodb-enterprise-mongos_3.6.1_amd64.deb 3.6
2620

2721
# Python stuff for mongo-orchestration
28-
apt-get install -y python python-dev python-pip
22+
apt-get install -y python python-dev
23+
python get-pip.py
2924

30-
pip install --index-url=https://pypi.python.org/simple/ --upgrade 'git+https://github.com/10gen/mongo-orchestration.git#egg=mongo_orchestration'
25+
pip install --upgrade mongo-orchestration
3126

3227
# Launch mongo-orchestration
3328
mongo-orchestration -f mongo-orchestration-config.json -b 192.168.112.10 --enable-majority-read-concern start
34-

tests/utils/basic.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ if (!$config) {
1313

1414
$servers = array(
1515
"STANDALONE" => "",
16-
"STANDALONE_26" => "",
1716
"STANDALONE_30" => "",
1817
"STANDALONE_SSL" => "",
1918
"STANDALONE_AUTH" => "",

0 commit comments

Comments
 (0)