summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Gomez <agomez@igalia.com>2020-04-30 22:49:58 +0300
committerEric Engestrom <eric@engestrom.ch>2020-05-13 14:44:56 +0200
commitd1e3c0b430cd97d8098123da61e58bdf871365ef (patch)
tree1d6f39a3458f71216c299512e02fdbc3e613f0d2
parent97e2965b07c64bca841e82e153ef2b8320ea27b0 (diff)
gitlab-ci: create always the "results" directory with tracie
Otherwise, we will fail when the traces description file doesn't contain any checksum for the specified device. Fixes: efbbf8bb81e ("tracie: Print results in a machine readable format") Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Rohan Garg <rohan.garg@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4839> (cherry picked from commit 8546d1dd789b58bd0aff5ca0a231efb35c09c1ac)
-rwxr-xr-x.gitlab-ci/tracie/tests/test.sh1
-rw-r--r--.gitlab-ci/tracie/tracie.py1
-rw-r--r--.pick_status.json2
3 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci/tracie/tests/test.sh b/.gitlab-ci/tracie/tests/test.sh
index 5030e31e049..2f667fb8c60 100755
--- a/.gitlab-ci/tracie/tests/test.sh
+++ b/.gitlab-ci/tracie/tests/test.sh
@@ -86,6 +86,7 @@ tracie_fails_on_image_mismatch() {
}
tracie_skips_traces_without_checksum() {
+ echo "traces:" > "$TEST_DIR/tests/traces.yml"
echo " - path: trace1/red.testtrace" >> "$TEST_DIR/tests/traces.yml"
echo " expectations:" >> "$TEST_DIR/tests/traces.yml"
echo " - device: bla" >> "$TEST_DIR/tests/traces.yml"
diff --git a/.gitlab-ci/tracie/tracie.py b/.gitlab-ci/tracie/tracie.py
index 8a494c2f56d..6e640b41ec1 100644
--- a/.gitlab-ci/tracie/tracie.py
+++ b/.gitlab-ci/tracie/tracie.py
@@ -165,6 +165,7 @@ def main():
all_ok = all_ok and ok
results.update(result)
+ os.makedirs(RESULTS_PATH, exist_ok=True)
with open(os.path.join(RESULTS_PATH, 'results.yml'), 'w') as f:
yaml.safe_dump(results, f, default_flow_style=False)
diff --git a/.pick_status.json b/.pick_status.json
index b2e29f87f02..45282fb4657 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -31,7 +31,7 @@
"description": "gitlab-ci: create always the \"results\" directory with tracie",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "efbbf8bb81e97a2b2d2e6e018750ef36cd460676"
},