mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Bump CI to FreeBSD 11.4, 12.2. (#1657)
* Bump CI to FreeBSD 11.4, 12.2. * Make FreeBSD Python package selection more future-proof.
This commit is contained in:
parent
a207298260
commit
c1eb0a232c
6 changed files with 9 additions and 9 deletions
|
@ -150,10 +150,10 @@ stages:
|
||||||
test: rhel/7.8
|
test: rhel/7.8
|
||||||
- name: RHEL 8.2
|
- name: RHEL 8.2
|
||||||
test: rhel/8.2
|
test: rhel/8.2
|
||||||
- name: FreeBSD 11.1
|
- name: FreeBSD 11.4
|
||||||
test: freebsd/11.1
|
test: freebsd/11.4
|
||||||
- name: FreeBSD 12.1
|
- name: FreeBSD 12.2
|
||||||
test: freebsd/12.1
|
test: freebsd/12.2
|
||||||
groups:
|
groups:
|
||||||
- 1
|
- 1
|
||||||
- 2
|
- 2
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
pyopenssl_package_name: py27-openssl
|
pyopenssl_package_name: py27-openssl
|
||||||
pyopenssl_package_name_python3: py36-openssl
|
pyopenssl_package_name_python3: "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-openssl"
|
||||||
openssl_package_name: openssl
|
openssl_package_name: openssl
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
postgresql_packages:
|
postgresql_packages:
|
||||||
- postgresql95-server
|
- postgresql95-server
|
||||||
- py36-psycopg2
|
- "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-psycopg2"
|
||||||
|
|
||||||
pg_dir: /usr/local/pgsql/data
|
pg_dir: /usr/local/pgsql/data
|
||||||
pg_hba_location: "{{ pg_dir }}/pg_hba.conf"
|
pg_hba_location: "{{ pg_dir }}/pg_hba.conf"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
postgresql_packages:
|
postgresql_packages:
|
||||||
- postgresql95-server
|
- postgresql95-server
|
||||||
- py36-psycopg2
|
- "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-psycopg2"
|
||||||
|
|
||||||
pg_dir: /usr/local/pgsql/data
|
pg_dir: /usr/local/pgsql/data
|
||||||
pg_hba_location: "{{ pg_dir }}/pg_hba.conf"
|
pg_hba_location: "{{ pg_dir }}/pg_hba.conf"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
postgresql_packages:
|
postgresql_packages:
|
||||||
- postgresql11-server
|
- postgresql11-server
|
||||||
- py36-psycopg2
|
- "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-psycopg2"
|
||||||
|
|
||||||
pg_dir: /var/db/postgres/data11
|
pg_dir: /var/db/postgres/data11
|
||||||
pg_hba_location: "{{ pg_dir }}/pg_hba.conf"
|
pg_hba_location: "{{ pg_dir }}/pg_hba.conf"
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
- name: Install lxml (FreeBSD)
|
- name: Install lxml (FreeBSD)
|
||||||
package:
|
package:
|
||||||
name: '{{ "py27-lxml" if ansible_python.version.major == 2 else "py36-lxml" }}'
|
name: 'py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-lxml'
|
||||||
state: present
|
state: present
|
||||||
when: ansible_os_family == "FreeBSD"
|
when: ansible_os_family == "FreeBSD"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue