Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-08-07 13:44:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch security-britney britney to use v3 swift auth. Work-around issues with ps5 deployment.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2023-11-22 03:19:32 +01:00
parent 9c09500d72
commit 761942c917
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
britney2/policies/autopkgtest.py
View File

@ -271,7 +271,7 @@ class AutopkgtestPolicy(BasePolicy):
import swiftclient import swiftclient
if '/v2.0' not in self.options.adt_swift_auth_url: if '/v3' not in self.options.adt_swift_auth_url:
raise RuntimeError('Unsupported swift auth version') raise RuntimeError('Unsupported swift auth version')
self.logger.info('Creating an authenticated swift connection for user %s', self.options.adt_swift_user) self.logger.info('Creating an authenticated swift connection for user %s', self.options.adt_swift_user)
@ -279,10 +279,12 @@ class AutopkgtestPolicy(BasePolicy):
authurl=self.options.adt_swift_auth_url, authurl=self.options.adt_swift_auth_url,
user=self.options.adt_swift_user, user=self.options.adt_swift_user,
key=self.options.adt_swift_pass, key=self.options.adt_swift_pass,
tenant_name=self.options.adt_swift_tenant, auth_version='3.0',
auth_version='2.0', os_options={
os_options={'region_name': self.options.adt_swift_region} 'region_name': self.options.adt_swift_region,
) 'project_name': self.options.adt_swift_project,
'object_storage_url': self.options.adt_swift_url,
})
else: else:
if any('@' in ppa for ppa in self.adt_ppas): if any('@' in ppa for ppa in self.adt_ppas):
raise RuntimeError('Private PPA configured but no swift credentials given') raise RuntimeError('Private PPA configured but no swift credentials given')
@ -988,7 +990,8 @@ class AutopkgtestPolicy(BasePolicy):
result_paths = [p['subdir'] for p in returned_paths] result_paths = [p['subdir'] for p in returned_paths]
else: else:
url = os.path.join(swift_url, self.swift_container) url = os.path.join(swift_url, self.swift_container)
url += '?' + urllib.parse.urlencode(query) # XXX: Workaround for PS5 swift deployment - container name needs to be suffixed with /
url += '/?' + urllib.parse.urlencode(query)
f = None f = None
try: try:
f = self.download_retry(url) f = self.download_retry(url)