Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-04-12 03:31:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit the work regarding private-results handling.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2021-05-06 15:20:00 +02:00
parent a21c904e61
commit d1549b9ca9
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
britney.conf
View File

@ -111,6 +111,7 @@ ADT_SWIFT_TENANT =
# List of launchpad users/teams that should have read access to any private
# result logs
ADT_PRIVATE_SHARED =
ADT_PRIVATE_URL = https://autopkgtest.ubuntu.com/private-results/
# Base URL for autopkgtest site, used for links in the excuses
ADT_CI_URL = https://autopkgtest.ubuntu.com/
ADT_HUGE = 20

1
britney.conf.template
View File

@ -133,6 +133,7 @@ ADT_SWIFT_TENANT =
# List of launchpad users/teams that should have read access to any private
# result logs
ADT_PRIVATE_SHARED =
ADT_PRIVATE_URL =
# Base URL for autopkgtest site, used for links in the excuses
ADT_CI_URL = https://example.com/
# Enable the huge queue for packages that trigger vast amounts of tests to not

4
britney2/policies/autopkgtest.py
View File

@ -1328,7 +1328,9 @@ class AutopkgtestPolicy(BasePolicy):
run_id,
'log.gz')
else:
url = os.path.join(self.options.adt_swift_url,
# Private runs have a different base url
results_url = self.options.adt_private_url if self.swift_conn else self.options.adt_swift_url
url = os.path.join(results_url,
self.swift_container,
self.options.series,
arch,

1
tests/__init__.py
View File

@ -400,6 +400,7 @@ ADT_SWIFT_PASS =
ADT_SWIFT_AUTH_URL =
ADT_SWIFT_TENANT =
ADT_PRIVATE_SHARED =
ADT_PRIVATE_URL =
ADT_CI_URL = https://autopkgtest.ubuntu.com/
ADT_HUGE = 20

16
tests/test_autopkgtest.py
View File

@ -2564,6 +2564,8 @@ class AT(TestAutopkgtestBase):
print('ADT_SWIFT_AUTH_URL = http://127.0.0.1:5000/v2.0/')
elif line.startswith('ADT_PRIVATE_SHARED'):
print('ADT_PRIVATE_SHARED = user1 team2')
elif line.startswith('ADT_PRIVATE_URL'):
print('ADT_PRIVATE_URL = http://localhost:18085/private-results/')
else:
sys.stdout.write(line)
@ -2600,18 +2602,18 @@ class AT(TestAutopkgtestBase):
{'lightgreen/2': {
'amd64': [
'PASS',
'http://localhost:18085/private-autopkgtest-testing-joe-foo/'
'http://localhost:18085/private-results/private-autopkgtest-testing-joe-foo/'
'testing/amd64/l/lightgreen/20150101_100101@/log.gz',
None,
'http://localhost:18085/private-autopkgtest-testing-joe-foo/'
'http://localhost:18085/private-results/private-autopkgtest-testing-joe-foo/'
'testing/amd64/l/lightgreen/20150101_100101@/artifacts.tar.gz',
None],
'i386': [
'REGRESSION',
'http://localhost:18085/private-autopkgtest-testing-joe-foo/'
'http://localhost:18085/private-results/private-autopkgtest-testing-joe-foo/'
'testing/i386/l/lightgreen/20150101_100100@/log.gz',
None,
'http://localhost:18085/private-autopkgtest-testing-joe-foo/'
'http://localhost:18085/private-results/private-autopkgtest-testing-joe-foo/'
'testing/i386/l/lightgreen/20150101_100100@/artifacts.tar.gz',
None]},
'verdict': 'REJECTED_PERMANENTLY'})
@ -2632,6 +2634,8 @@ class AT(TestAutopkgtestBase):
print('ADT_SWIFT_TENANT = tenant')
elif line.startswith('ADT_SWIFT_AUTH_URL'):
print('ADT_SWIFT_AUTH_URL = http://127.0.0.1:5000/v2.0/')
elif line.startswith('ADT_PRIVATE_URL'):
print('ADT_PRIVATE_URL = http://localhost:18085/private-results/')
else:
sys.stdout.write(line)
@ -2670,14 +2674,14 @@ class AT(TestAutopkgtestBase):
{'lightgreen/2': {
'amd64': [
'PASS',
'http://localhost:18085/private-autopkgtest-testing/'
'http://localhost:18085/private-results/private-autopkgtest-testing/'
'testing/amd64/l/lightgreen/20150101_100101@/log.gz',
'https://autopkgtest.ubuntu.com/packages/l/lightgreen/testing/amd64',
None,
None],
'i386': [
'REGRESSION',
'http://localhost:18085/private-autopkgtest-testing/'
'http://localhost:18085/private-results/private-autopkgtest-testing/'
'testing/i386/l/lightgreen/20150101_100100@/log.gz',
'https://autopkgtest.ubuntu.com/packages/l/lightgreen/testing/i386',
None,

1
tests/test_policy.py
View File

@ -48,6 +48,7 @@ def initialize_policy(test_name, policy_class, *args, **kwargs):
adt_swift_tenant='',
adt_swift_auth_url='',
adt_private_shared=[],
adt_private_url='',
adt_success_bounty=3,
adt_regression_penalty=False,
adt_retry_url_mech='run_id',