opendev/system-config
Code Issues Proposed changes

Merge "system-config-run-borg-backup: add jammy test host"

Browse Source
This commit is contained in:
Zuul 2022-08-11 05:32:30 +00:00 committed by Gerrit Code Review
commit 00df4d06c0
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/zuul/templates/gate-groups.yaml.j2
View File

@ -20,6 +20,7 @@ groups:
backup: backup:
- backup-test01.opendev.org - backup-test01.opendev.org
- backup-test02.opendev.org - backup-test02.opendev.org
- backup-test03.opendev.org
borg-backup-server: borg-backup-server:
- borg-backup01.region.provider.opendev.org - borg-backup01.region.provider.opendev.org
@ -27,6 +28,7 @@ groups:
borg-backup: borg-backup:
- borg-backup-test01.opendev.org - borg-backup-test01.opendev.org
- borg-backup-test02.opendev.org - borg-backup-test02.opendev.org
- borg-backup-test03.opendev.org
kerberos-kdc: kerberos-kdc:
- kdc-primary.opendev.org - kdc-primary.opendev.org

7
testinfra/test_borg_backups.py
View File

@ -17,7 +17,8 @@ import pytest
testinfra_hosts = ['borg-backup01.region.provider.opendev.org', testinfra_hosts = ['borg-backup01.region.provider.opendev.org',
'borg-backup-test01.opendev.org', 'borg-backup-test01.opendev.org',
'borg-backup-test02.opendev.org'] 'borg-backup-test02.opendev.org',
'borg-backup-test03.opendev.org']
def test_borg_installed(host): def test_borg_installed(host):
@ -35,7 +36,9 @@ def test_borg_server_users(host):
if hostname.startswith('borg-backup-test'): if hostname.startswith('borg-backup-test'):
pytest.skip() pytest.skip()
for username in 'borg-borg-backup-test01', 'borg-borg-backup-test02': for username in ('borg-borg-backup-test01',
'borg-borg-backup-test02',
'borg-borg-backup-test03'):
homedir = os.path.join('/opt/backups/', username) homedir = os.path.join('/opt/backups/', username)
borg_repo = os.path.join(homedir, 'backup') borg_repo = os.path.join(homedir, 'backup')
authorized_keys = os.path.join(homedir, '.ssh', 'authorized_keys') authorized_keys = os.path.join(homedir, '.ssh', 'authorized_keys')

6
zuul.d/system-config-run.yaml
View File

@ -382,6 +382,8 @@
label: ubuntu-focal label: ubuntu-focal
- name: borg-backup-test02.opendev.org - name: borg-backup-test02.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
- name: borg-backup-test03.opendev.org
label: ubuntu-jammy
vars: vars:
run_playbooks: run_playbooks:
- playbooks/service-borg-backup.yaml - playbooks/service-borg-backup.yaml
@ -406,7 +408,9 @@
borg-backup-test02.opendev.org: borg-backup-test02.opendev.org:
host_copy_output: host_copy_output:
'/var/log/borg-backup-borg-backup01.region.provider.opendev.org.log': logs '/var/log/borg-backup-borg-backup01.region.provider.opendev.org.log': logs
borg-backup-test03.opendev.org:
host_copy_output:
'/var/log/borg-backup-borg-backup01.region.provider.opendev.org.log': logs
- job: - job:
name: system-config-run-mirror-base name: system-config-run-mirror-base