Merge pull request #119 from UnderGreen/debian_9_official

Added support of MongoDB 3.6 for Debian Stretch
UnderGreen · Jul 13, 2018 · db1e4cd · db1e4cd
2 parents 4cceeef + b751c07
commit db1e4cd
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,10 +31,15 @@ env:
     DISTRIBUTION=ubuntu-upstart
     DIST_VERSION=14.04
     MONGODB_VERSION=3.2
+  - >
+    DISTRIBUTION=debian
+    DIST_VERSION=9-builded
+    MONGODB_VERSION=3.6
   - >
     DISTRIBUTION=debian
     DIST_VERSION=9-builded
     MONGODB_VERSION=3.2
+    MONGODB_PACKAGE=mongodb
   - >
     DISTRIBUTION=debian
     DIST_VERSION=8-builded
@@ -71,9 +76,6 @@ env:
     DISTRIBUTION=centos
     DIST_VERSION=7-builded
     MONGODB_VERSION=3.2
-#  - >
-#    distribution=debian
-#    version=7
 
 services:
   - docker

diff --git a/tasks/install.debian.yml b/tasks/install.debian.yml
@@ -11,20 +11,23 @@
     mongodb_is_systemd: "{{ sbin_init.stat.islnk is defined and sbin_init.stat.islnk }}"
     mongodb_major_version: "{{ mongodb_version[0:3] }}"
 
-- name: Overwrite mongodb_version especially for Debian 9
-  set_fact:
-    mongodb_major_version: "3.2"
-  when: ansible_distribution_release == "stretch"
-
 - name: Add APT key
   apt_key:
     keyserver: "{{ mongodb_apt_keyserver }}"
     id: "{{ mongodb_apt_key_id[mongodb_major_version] }}"
   when: mongodb_package == 'mongodb-org'
 
+- name: Fail when used wrong mongodb_version variable with Debian Stretch
+  fail:
+    msg: "mongodb_version variable should be '3.2' or '3.6' for Debian Stretch"
+  when: (mongodb_package == 'mongodb-org' and
+        (mongodb_version is not defined
+         or mongodb_repository[mongodb_major_version] is not defined
+         or mongodb_version != "3.6") and ansible_distribution_release == "stretch")
+
 - name: Fail when used wrong mongodb_version variable
   fail:
-    msg: "mongodb_version variable should be '2.6', '3.0' or '3.2'"
+    msg: "mongodb_version variable should be '3.2', '3.4' or '3.6'"
   when: (mongodb_package == 'mongodb-org' and
         (mongodb_version is not defined
          or mongodb_repository[mongodb_major_version] is not defined))

diff --git a/tests/group_vars/all.yml b/tests/group_vars/all.yml
@@ -1,6 +1,7 @@
 ---
 
 image_name: "ubuntu-upstart:14.04"
+mongodb_package: mongodb-org
 mongodb_version: "3.6"
 mongodb_storage_dbpath: /var/lib/mongodb
 mongodb_net_bindip: 0.0.0.0

diff --git a/tests/scripts/before_install.sh b/tests/scripts/before_install.sh
@@ -2,7 +2,7 @@
 # -*- mode: sh; -*-
 
 # File: before_install.sh
-# Time-stamp: <2018-02-15 15:54:06>
+# Time-stamp: <2018-07-12 18:05:37>
 # Copyright (C) 2018 Sergei Antipov
 # Description:
 

diff --git a/tests/scripts/test.sh b/tests/scripts/test.sh
@@ -2,48 +2,49 @@
 # -*- mode: sh; -*-
 
 # File: test.sh
-# Time-stamp: <2018-02-26 16:04:24>
+# Time-stamp: <2018-07-13 11:05:31>
 # Copyright (C) 2018 Sergei Antipov
 # Description:
 
 # set -o xtrace
 set -o nounset
 set -o errexit
 
+package=${MONGODB_PACKAGE:-mongodb-org}
 # Test 1
-echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION}"
-ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION}
+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}"
+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}
 # Idempotence test
-ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION} | \
+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} | \
     grep -q 'changed=0.*failed=0' && \
     (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)
 # Delete all containers
 docker kill mongo{1,2,3} && docker rm mongo{1,2,3}
 
 # Test 2
-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'"
-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'
+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'"
+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'
 # Idempotence test
-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' \
+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' \
     | grep -q 'changed=0.*failed=0' \
     && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)
 # Delete all containers
 docker kill mongo{1,2,3} && docker rm mongo{1,2,3}
 
 # Test 3
-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'"
-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'
+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'"
+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'
 # Idempotence test
-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' \
+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' \
     | grep -q 'changed=0.*failed=0' \
     && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)
 # Delete all containers
 docker kill mongo{1,2,3} && docker rm mongo{1,2,3}
 
 # Test 4
-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'"
-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'
+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'"
+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'
 # Idempotence test
-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' \
+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' \
     | grep -q 'changed=0.*failed=0' \
     && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)
diff --git a/vars/stretch.yml b/vars/stretch.yml