Skip to content

Commit db1e4cd

Browse files
authored
Merge pull request #119 from UnderGreen/debian_9_official
Added support of MongoDB 3.6 for Debian Stretch
2 parents 4cceeef + b751c07 commit db1e4cd

File tree

6 files changed

+30
-26
lines changed

6 files changed

+30
-26
lines changed

.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,15 @@ env:
3131
DISTRIBUTION=ubuntu-upstart
3232
DIST_VERSION=14.04
3333
MONGODB_VERSION=3.2
34+
- >
35+
DISTRIBUTION=debian
36+
DIST_VERSION=9-builded
37+
MONGODB_VERSION=3.6
3438
- >
3539
DISTRIBUTION=debian
3640
DIST_VERSION=9-builded
3741
MONGODB_VERSION=3.2
42+
MONGODB_PACKAGE=mongodb
3843
- >
3944
DISTRIBUTION=debian
4045
DIST_VERSION=8-builded
@@ -71,9 +76,6 @@ env:
7176
DISTRIBUTION=centos
7277
DIST_VERSION=7-builded
7378
MONGODB_VERSION=3.2
74-
# - >
75-
# distribution=debian
76-
# version=7
7779
7880
services:
7981
- docker

tasks/install.debian.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,23 @@
1111
mongodb_is_systemd: "{{ sbin_init.stat.islnk is defined and sbin_init.stat.islnk }}"
1212
mongodb_major_version: "{{ mongodb_version[0:3] }}"
1313

14-
- name: Overwrite mongodb_version especially for Debian 9
15-
set_fact:
16-
mongodb_major_version: "3.2"
17-
when: ansible_distribution_release == "stretch"
18-
1914
- name: Add APT key
2015
apt_key:
2116
keyserver: "{{ mongodb_apt_keyserver }}"
2217
id: "{{ mongodb_apt_key_id[mongodb_major_version] }}"
2318
when: mongodb_package == 'mongodb-org'
2419

20+
- name: Fail when used wrong mongodb_version variable with Debian Stretch
21+
fail:
22+
msg: "mongodb_version variable should be '3.2' or '3.6' for Debian Stretch"
23+
when: (mongodb_package == 'mongodb-org' and
24+
(mongodb_version is not defined
25+
or mongodb_repository[mongodb_major_version] is not defined
26+
or mongodb_version != "3.6") and ansible_distribution_release == "stretch")
27+
2528
- name: Fail when used wrong mongodb_version variable
2629
fail:
27-
msg: "mongodb_version variable should be '2.6', '3.0' or '3.2'"
30+
msg: "mongodb_version variable should be '3.2', '3.4' or '3.6'"
2831
when: (mongodb_package == 'mongodb-org' and
2932
(mongodb_version is not defined
3033
or mongodb_repository[mongodb_major_version] is not defined))

tests/group_vars/all.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22

33
image_name: "ubuntu-upstart:14.04"
4+
mongodb_package: mongodb-org
45
mongodb_version: "3.6"
56
mongodb_storage_dbpath: /var/lib/mongodb
67
mongodb_net_bindip: 0.0.0.0

tests/scripts/before_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- mode: sh; -*-
33

44
# File: before_install.sh
5-
# Time-stamp: <2018-02-15 15:54:06>
5+
# Time-stamp: <2018-07-12 18:05:37>
66
# Copyright (C) 2018 Sergei Antipov
77
# Description:
88

tests/scripts/test.sh

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,49 @@
22
# -*- mode: sh; -*-
33

44
# File: test.sh
5-
# Time-stamp: <2018-02-26 16:04:24>
5+
# Time-stamp: <2018-07-13 11:05:31>
66
# Copyright (C) 2018 Sergei Antipov
77
# Description:
88

99
# set -o xtrace
1010
set -o nounset
1111
set -o errexit
1212

13+
package=${MONGODB_PACKAGE:-mongodb-org}
1314
# Test 1
14-
echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION}"
15-
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION}
15+
echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_package=${package} -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION}"
16+
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_package=${package} -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION}
1617
# Idempotence test
17-
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION} | \
18+
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_package=${package} -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION} | \
1819
grep -q 'changed=0.*failed=0' && \
1920
(echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)
2021
# Delete all containers
2122
docker kill mongo{1,2,3} && docker rm mongo{1,2,3}
2223

2324
# Test 2
24-
echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_security_authorization='enabled'"
25-
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_security_authorization='enabled'
25+
echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_package=${package} -e mongodb_version=${MONGODB_VERSION} -e mongodb_security_authorization='enabled'"
26+
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_package=${package} -e mongodb_version=${MONGODB_VERSION} -e mongodb_security_authorization='enabled'
2627
# Idempotence test
27-
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_security_authorization='enabled' \
28+
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_package=${package} -e mongodb_version=${MONGODB_VERSION} -e mongodb_security_authorization='enabled' \
2829
| grep -q 'changed=0.*failed=0' \
2930
&& (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)
3031
# Delete all containers
3132
docker kill mongo{1,2,3} && docker rm mongo{1,2,3}
3233

3334
# Test 3
34-
echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs'"
35-
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs'
35+
echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_package=${package} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs'"
36+
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_package=${package} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs'
3637
# Idempotence test
37-
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' \
38+
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_package=${package} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' \
3839
| grep -q 'changed=0.*failed=0' \
3940
&& (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)
4041
# Delete all containers
4142
docker kill mongo{1,2,3} && docker rm mongo{1,2,3}
4243

4344
# Test 4
44-
echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' -e mongodb_security_authorization='enabled'"
45-
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' -e mongodb_security_authorization='enabled'
45+
echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_package=${package} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' -e mongodb_security_authorization='enabled'"
46+
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_package=${package} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' -e mongodb_security_authorization='enabled'
4647
# Idempotence test
47-
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' -e mongodb_security_authorization='enabled' \
48+
ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_package=${package} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' -e mongodb_security_authorization='enabled' \
4849
| grep -q 'changed=0.*failed=0' \
4950
&& (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)

vars/stretch.yml

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

0 commit comments

Comments
 (0)