diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2020-07-21 14:04:42 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-07-22 05:57:41 +0000 |
| commit | 87e0b2c1c248def40d655616acc89f85e949cea0 (patch) | |
| tree | 8bbbbb1d5994adf49686756c475e021dc3726aa7 /.gitlab-ci | |
| parent | ed5374ff508f6e351a64a46c89bcc676eabe797d (diff) | |
ci: Prefix tracie artifacts with the device name
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6008>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/tracie/tracie.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci/tracie/tracie.py b/.gitlab-ci/tracie/tracie.py index 02797c0c887..0eceffacfaa 100644 --- a/.gitlab-ci/tracie/tracie.py +++ b/.gitlab-ci/tracie/tracie.py @@ -68,14 +68,14 @@ def sign_with_hmac(key, message): return base64.encodebytes(signature).strip().decode() -def upload_artifact(file_name, content_type): +def upload_artifact(file_name, content_type, device_name): with open('.minio_credentials', 'r') as f: credentials = json.load(f)["minio-packet.freedesktop.org"] minio_key = credentials["AccessKeyId"] minio_secret = credentials["SecretAccessKey"] minio_token = credentials["SessionToken"] - resource = '/artifacts/%s/%s/%s' % (os.environ['CI_PROJECT_PATH'], os.environ['CI_PIPELINE_ID'], os.path.basename(file_name)) + resource = '/artifacts/%s/%s/%s/%s' % (os.environ['CI_PROJECT_PATH'], os.environ['CI_PIPELINE_ID'], device_name, os.path.basename(file_name)) date = formatdate(timeval=None, localtime=False, usegmt=True) url = 'https://minio-packet.freedesktop.org%s' % (resource) to_sign = "PUT\n\n%s\n%s\nx-amz-security-token:%s\n%s" % (content_type, date, minio_token, resource) @@ -120,7 +120,7 @@ def gitlab_check_trace(project_url, device_name, trace, expectation): os.makedirs(results_path, exist_ok=True) shutil.move(log_file, os.path.join(results_path, os.path.split(log_file)[1])) if not ok and os.environ.get('TRACIE_UPLOAD_TO_MINIO', '0') == '1': - upload_artifact(image_file, 'image/png') + upload_artifact(image_file, 'image/png', device_name) if not ok or os.environ.get('TRACIE_STORE_IMAGES', '0') == '1': image_name = os.path.split(image_file)[1] shutil.move(image_file, os.path.join(results_path, image_name)) @@ -156,7 +156,7 @@ def run(filename, device_name): with open(os.path.join(RESULTS_PATH, 'results.yml'), 'w') as f: yaml.safe_dump(results, f, default_flow_style=False) if os.environ.get('TRACIE_UPLOAD_TO_MINIO', '0') == '1': - upload_artifact(os.path.join(RESULTS_PATH, 'results.yml'), 'text/yaml') + upload_artifact(os.path.join(RESULTS_PATH, 'results.yml'), 'text/yaml', device_name) return all_ok |