File tree Expand file tree Collapse file tree 7 files changed +57
-25
lines changed Expand file tree Collapse file tree 7 files changed +57
-25
lines changed Original file line number Diff line number Diff line change 9
9
- master
10
10
11
11
jobs :
12
- python2 :
12
+ python3 :
13
13
runs-on : ubuntu-latest
14
14
strategy :
15
15
matrix :
29
29
run : pip install -r requirements.txt
30
30
- name : Run default test
31
31
run : molecule test
32
+ env :
33
+ PY_COLORS : ' 1'
34
+ ANSIBLE_FORCE_COLOR : ' 1'
32
35
- name : Run default test with enabled authentication
33
36
run : AUTH_STATE=enabled molecule test
37
+ env :
38
+ PY_COLORS : ' 1'
39
+ ANSIBLE_FORCE_COLOR : ' 1'
34
40
- name : Run cluster test
35
41
run : molecule test -s cluster
42
+ env :
43
+ PY_COLORS : ' 1'
44
+ ANSIBLE_FORCE_COLOR : ' 1'
36
45
- name : Run cluster test with enabled authentication
37
46
run : AUTH_STATE=enabled molecule test -s cluster
47
+ env :
48
+ PY_COLORS : ' 1'
49
+ ANSIBLE_FORCE_COLOR : ' 1'
Original file line number Diff line number Diff line change 9
9
- master
10
10
11
11
jobs :
12
- python2 :
12
+ python3 :
13
13
runs-on : ubuntu-latest
14
14
strategy :
15
15
matrix :
30
30
run : pip install -r requirements.txt
31
31
- name : Run default test
32
32
run : molecule test
33
+ env :
34
+ PY_COLORS : ' 1'
35
+ ANSIBLE_FORCE_COLOR : ' 1'
33
36
- name : Run default test with enabled authentication
34
37
run : AUTH_STATE=enabled molecule test
38
+ env :
39
+ PY_COLORS : ' 1'
40
+ ANSIBLE_FORCE_COLOR : ' 1'
35
41
- name : Run cluster test
36
42
run : molecule test -s cluster
43
+ env :
44
+ PY_COLORS : ' 1'
45
+ ANSIBLE_FORCE_COLOR : ' 1'
37
46
- name : Run cluster test with enabled authentication
38
47
run : AUTH_STATE=enabled molecule test -s cluster
48
+ env :
49
+ PY_COLORS : ' 1'
50
+ ANSIBLE_FORCE_COLOR : ' 1'
Original file line number Diff line number Diff line change 9
9
- master
10
10
11
11
jobs :
12
- python2 :
12
+ python3 :
13
13
runs-on : ubuntu-latest
14
14
strategy :
15
15
matrix :
35
35
run : pip install -r requirements.txt
36
36
- name : Run default test
37
37
run : molecule test
38
+ env :
39
+ PY_COLORS : ' 1'
40
+ ANSIBLE_FORCE_COLOR : ' 1'
38
41
- name : Run default test with enabled authentication
39
42
run : AUTH_STATE=enabled molecule test
43
+ env :
44
+ PY_COLORS : ' 1'
45
+ ANSIBLE_FORCE_COLOR : ' 1'
40
46
- name : Run cluster test
41
47
run : molecule test -s cluster
48
+ env :
49
+ PY_COLORS : ' 1'
50
+ ANSIBLE_FORCE_COLOR : ' 1'
42
51
- name : Run cluster test with enabled authentication
43
52
run : AUTH_STATE=enabled molecule test -s cluster
53
+ env :
54
+ PY_COLORS : ' 1'
55
+ ANSIBLE_FORCE_COLOR : ' 1'
Original file line number Diff line number Diff line change @@ -13,9 +13,8 @@ mongodb_pidfile_path: "{{ '/var/run/mongodb/mongod.pid' if ('mongodb-org' in mon
13
13
14
14
yum_lock_timeout : 180
15
15
16
- mongodb_pymongo_package : " {{ 'python3-pymongo' if ansible_python_interpreter is search('python3') | bool else 'python-pymongo' }}"
16
+ mongodb_pymongo_package : " {{ 'python3-pymongo' if ansible_facts['python'].version.major == 3 else 'python-pymongo' }}"
17
17
mongodb_pymongo_deps :
18
- - " {{ 'python3-devel' if ansible_python_interpreter is search('python3') | bool else 'python-devel' }}"
19
- - " {{ 'python3-pip' if ansible_python_interpreter is search('python3') | bool else 'python-pip' }}"
20
- mongodb_pip_executable : " {{ 'pip3' if ansible_python_interpreter is search('python3') | bool else 'pip' }}"
21
-
18
+ - " {{ 'python3-devel' if ansible_facts['python'].version.major == 3 else 'python-devel' }}"
19
+ - " {{ 'python3-pip' if ansible_facts['python'].version.major == 3 else 'python-pip' }}"
20
+ mongodb_pip_executable : " {{ 'pip3' if ansible_facts['python'].version.major == 3 else 'pip' }}"
Original file line number Diff line number Diff line change @@ -4,10 +4,9 @@ mongodb_repository:
4
4
" 4.0 " : " deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/4.0 main"
5
5
" 4.2 " : " deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/4.2 main"
6
6
7
- mongodb_pymongo_package : " {{ 'python3-pymongo' if ansible_python_interpreter is search('python3') | bool else 'python-pymongo' }}"
7
+ mongodb_pymongo_package : " {{ 'python3-pymongo' if ansible_facts['python'].version.major == 3 else 'python-pymongo' }}"
8
8
mongodb_pymongo_deps :
9
- - " {{ 'python3-dev' if ansible_python_interpreter is search('python3') | bool else 'python-dev' }}"
10
- - " {{ 'python3-pip' if ansible_python_interpreter is search('python3') | bool else 'python-pip' }}"
11
- mongodb_python_setuptools : " {{ 'python3-setuptools' if ansible_python_interpreter is search('python3') | bool else 'python-setuptools' }}"
12
- mongodb_pip_executable : " {{ 'pip3' if ansible_python_interpreter is search('python3') | bool else 'pip' }}"
13
-
9
+ - " {{ 'python3-dev' if ansible_facts['python'].version.major == 3 else 'python-dev' }}"
10
+ - " {{ 'python3-pip' if ansible_facts['python'].version.major == 3 else 'python-pip' }}"
11
+ mongodb_python_setuptools : " {{ 'python3-setuptools' if ansible_facts['python'].version.major == 3 else 'python-setuptools' }}"
12
+ mongodb_pip_executable : " {{ 'pip3' if ansible_facts['python'].version.major == 3 else 'pip' }}"
Original file line number Diff line number Diff line change @@ -13,9 +13,8 @@ mongodb_pidfile_path: "{{ '/var/run/mongodb/mongod.pid' if ('mongodb-org' in mon
13
13
14
14
yum_lock_timeout : 180
15
15
16
- mongodb_pymongo_package : " {{ 'python3-pymongo' if ansible_python_interpreter is search('python3') | bool else 'python-pymongo' }}"
16
+ mongodb_pymongo_package : " {{ 'python3-pymongo' if ansible_facts['python'].version.major == 3 else 'python-pymongo' }}"
17
17
mongodb_pymongo_deps :
18
- - " {{ 'python3-devel' if ansible_python_interpreter is search('python3') | bool else 'python-devel' }}"
19
- - " {{ 'python3-pip' if ansible_python_interpreter is search('python3') | bool else 'python-pip' }}"
20
- mongodb_pip_executable : " {{ 'pip3' if ansible_python_interpreter is search('python3') | bool else 'pip' }}"
21
-
18
+ - " {{ 'python3-devel' if ansible_facts['python'].version.major == 3 else 'python-devel' }}"
19
+ - " {{ 'python3-pip' if ansible_facts['python'].version.major == 3 else 'python-pip' }}"
20
+ mongodb_pip_executable : " {{ 'pip3' if ansible_facts['python'].version.major == 3 else 'pip' }}"
Original file line number Diff line number Diff line change @@ -4,10 +4,9 @@ mongodb_repository:
4
4
" 4.0 " : " deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.0 multiverse"
5
5
" 4.2 " : " deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.2 multiverse"
6
6
7
- mongodb_pymongo_package : " {{ 'python3-pymongo' if ansible_python_interpreter is search('python3') | bool else 'python-pymongo' }}"
7
+ mongodb_pymongo_package : " {{ 'python3-pymongo' if ansible_facts['python'].version.major == 3 else 'python-pymongo' }}"
8
8
mongodb_pymongo_deps :
9
- - " {{ 'python3-dev' if ansible_python_interpreter is search('python3') | bool else 'python-dev' }}"
10
- - " {{ 'python3-pip' if ansible_python_interpreter is search('python3') | bool else 'python-pip' }}"
11
- mongodb_python_setuptools : " {{ 'python3-setuptools' if ansible_python_interpreter is search('python3') | bool else 'python-setuptools' }}"
12
- mongodb_pip_executable : " {{ 'pip3' if ansible_python_interpreter is search('python3') | bool else 'pip' }}"
13
-
9
+ - " {{ 'python3-dev' if ansible_facts['python'].version.major == 3 else 'python-dev' }}"
10
+ - " {{ 'python3-pip' if ansible_facts['python'].version.major == 3 else 'python-pip' }}"
11
+ mongodb_python_setuptools : " {{ 'python3-setuptools' if ansible_facts['python'].version.major == 3 else 'python-setuptools' }}"
12
+ mongodb_pip_executable : " {{ 'pip3' if ansible_facts['python'].version.major == 3 else 'pip' }}"
You can’t perform that action at this time.
0 commit comments