1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

[stable-1] Add ubuntu2004, upgrade CI to be more similar to main (#1792)

* Add Ubuntu 20.04 to CI (#1658)

* Add Ubuntu 20.04 to CI.

* Skip mqtt test on Ubuntu 20.04.

* Use explicit disable instead of aliases.

* Add Ubuntu 20.04 specific config for setup_postgresql_db.

* Fix postgres version.

(cherry picked from commit 4223f48d38)

* Adjust AZP config.

* Remove some tests.

* Make more similar to config fromm main branch.
This commit is contained in:
Felix Fontein 2021-02-12 08:23:31 +01:00 committed by GitHub
parent be8022c743
commit 248128f282
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 25 deletions

View file

@ -13,7 +13,7 @@ pr:
- stable-* - stable-*
schedules: schedules:
- cron: 0 9 * * * - cron: 0 8 * * *
displayName: Nightly displayName: Nightly
always: true always: true
branches: branches:
@ -179,9 +179,6 @@ stages:
groups: groups:
- 1 - 1
- 2 - 2
- 3
- 4
- 5
- stage: Remote_2_9 - stage: Remote_2_9
displayName: Remote 2.9 displayName: Remote 2.9
dependsOn: [] dependsOn: []
@ -192,14 +189,11 @@ stages:
targets: targets:
- name: RHEL 8.2 - name: RHEL 8.2
test: rhel/8.2 test: rhel/8.2
#- name: FreeBSD 12.0 - name: FreeBSD 12.0
# test: freebsd/12.0 test: freebsd/12.0
groups: groups:
- 1 - 1
- 2 - 2
- 3
- 4
- 5
### Docker ### Docker
- stage: Docker_devel - stage: Docker_devel
@ -226,6 +220,8 @@ stages:
test: opensuse15 test: opensuse15
- name: Ubuntu 18.04 - name: Ubuntu 18.04
test: ubuntu1804 test: ubuntu1804
- name: Ubuntu 20.04
test: ubuntu2004
groups: groups:
- 1 - 1
- 2 - 2
@ -240,18 +236,15 @@ stages:
parameters: parameters:
testFormat: 2.10/linux/{0} testFormat: 2.10/linux/{0}
targets: targets:
#- name: CentOS 8 - name: CentOS 8
# test: centos8 test: centos8
- name: Fedora 32 - name: Fedora 32
test: fedora32 test: fedora32
- name: openSUSE 15 py3 - name: openSUSE 15 py3
test: opensuse15 test: opensuse15
- name: Ubuntu 16.04 - name: Ubuntu 16.04
test: ubuntu1604 test: ubuntu1604
#- name: Ubuntu 18.04
# test: ubuntu1804
groups: groups:
- 1
- 2 - 2
- 3 - 3
- 4 - 4
@ -264,16 +257,13 @@ stages:
parameters: parameters:
testFormat: 2.9/linux/{0} testFormat: 2.9/linux/{0}
targets: targets:
#- name: CentOS 8 - name: CentOS 8
# test: centos8 test: centos8
#- name: Fedora 31 - name: Fedora 31
# test: fedora31 test: fedora31
#- name: openSUSE 15 py3 - name: openSUSE 15 py3
# test: opensuse15 test: opensuse15
- name: Ubuntu 18.04
test: ubuntu1804
groups: groups:
- 1
- 2 - 2
- 3 - 3
- 4 - 4
@ -310,7 +300,7 @@ stages:
nameFormat: Python {0} nameFormat: Python {0}
testFormat: 2.9/cloud/{0}/1 testFormat: 2.9/cloud/{0}/1
targets: targets:
- test: 2.7 - test: 3.6
- stage: Summary - stage: Summary
condition: succeededOrFailed() condition: succeededOrFailed()
dependsOn: dependsOn:

View file

@ -6,4 +6,4 @@
- include: ubuntu.yml - include: ubuntu.yml
when: when:
- ansible_distribution == 'Ubuntu' - ansible_distribution == 'Ubuntu'
- ansible_distribution_release != 'trusty' - ansible_distribution_release not in ['trusty', 'focal']

View file

@ -0,0 +1,8 @@
postgresql_packages:
- "postgresql"
- "postgresql-common"
- "python3-psycopg2"
pg_hba_location: "/etc/postgresql/12/main/pg_hba.conf"
pg_dir: "/var/lib/postgresql/12/main"
pg_ver: 12