Skip to content

Commit 11c60ff

Browse files
authored
Merge pull request #5032 from StackStorm/update_ci_mongo
Update ST2 CircleCI and Travis to use mongodb 4.0 instead of 3.4
2 parents 0e83fc5 + d041e81 commit 11c60ff

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Setup in CircleCI account the following ENV variables:
2-
# PACKAGECLOUD_ORGANIZATION (default: stackstorm)
2+
# PACKAGECLOUD_ORGANIZATION (default: stackstorm)
33
# PACKAGECLOUD_TOKEN
44
version: 2
55
jobs:
@@ -44,7 +44,7 @@ jobs:
4444
integration:
4545
docker:
4646
- image: circleci/python:2.7
47-
- image: mongo:3.4
47+
- image: mongo:4.0
4848
- image: rabbitmq:3
4949
working_directory: ~/st2
5050
steps:
@@ -57,8 +57,8 @@ jobs:
5757
name: Install Mongo Shell
5858
command: |
5959
set -x
60-
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
61-
echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.4 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
60+
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
61+
echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/4.0 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.0.list
6262
sudo apt-get -qq -y update
6363
sudo apt-get -qq -y install mongodb-org-shell
6464
- run:
@@ -80,7 +80,7 @@ jobs:
8080
lint:
8181
docker:
8282
- image: circleci/python:2.7
83-
- image: mongo:3.4
83+
- image: mongo:4.0
8484
- image: rabbitmq:3
8585
working_directory: ~/st2
8686
steps:

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
# If you rename or reorder make targets in TASK, you may need to adjust:
3737
# scripts/travis/install-requirements.sh
3838
# scripts/travis/run-nightly-make-task-if-exists.sh
39-
- name: "Unit Tests (Python 2.7 MongoDB 3.4)"
39+
- name: "Unit Tests (Python 2.7 MongoDB 4.0)"
4040
python: 2.7
4141
env: TASK=ci-unit CACHE_NAME=py2 COMMAND_THRESHOLD=700
4242

@@ -59,11 +59,11 @@ jobs:
5959
addons:
6060
apt:
6161
sources:
62-
- sourceline: 'deb [arch=amd64] http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.4 multiverse'
63-
key_url: 'https://www.mongodb.org/static/pgp/server-3.4.asc'
62+
- sourceline: 'deb [arch=amd64] http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/4.0 multiverse'
63+
key_url: 'https://www.mongodb.org/static/pgp/server-4.0.asc'
6464
packages:
65-
- mongodb-org-server=3.4.*
66-
- mongodb-org-shell=3.4.*
65+
- mongodb-org-server=4.0.*
66+
- mongodb-org-shell=4.0.*
6767
- rabbitmq-server
6868
- libffi-dev
6969

@@ -92,7 +92,7 @@ install:
9292
before_script:
9393
# Use a custom mongod.conf which uses various speed optimizations
9494
- sudo cp scripts/travis/mongod.conf /etc/mongod.conf
95-
# Clean up any old MongoDB 3.4 data files laying around and make sure mongodb user can write to it
95+
# Clean up any old MongoDB 4.0 data files laying around and make sure mongodb user can write to it
9696
- sudo rm -rf /var/lib/mongodb ; sudo mkdir /var/lib/mongodb ; sudo chown -R mongodb:mongodb /var/lib/mongodb
9797
- sudo service mongod restart ; sleep 5
9898
- sudo service mongod status

0 commit comments

Comments
 (0)