From e8f92a8f388d01828b101ddf4839a95403d3ecf6 Mon Sep 17 00:00:00 2001 From: Claudio Matsuoka Date: Thu, 16 Jan 2025 13:14:17 -0300 Subject: [PATCH] instrumentation Signed-off-by: Claudio Matsuoka --- requirements-devel.txt | 2 +- requirements.txt | 2 +- setup.py | 2 +- .../core24-suites/scriptlets/scriptlet-failures/task.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements-devel.txt b/requirements-devel.txt index 80311eea29..1a4a2f7b84 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -59,7 +59,7 @@ craft-grammar==2.0.1 # via # craft-application # snapcraft (setup.py) -craft-parts @ git+https://github.com/canonical/craft-parts@CRAFT-3828-Capture-error-in-step-scriptlet-execution +craft-parts @ git+https://github.com/cmatsuoka/craft-parts@craft-3828-instrumentation # via # craft-application # snapcraft (setup.py) diff --git a/requirements.txt b/requirements.txt index 234802da32..e4eb1af0aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,7 +41,7 @@ craft-grammar==2.0.1 # via # craft-application # snapcraft (setup.py) -craft-parts @ git+https://github.com/canonical/craft-parts@CRAFT-3828-Capture-error-in-step-scriptlet-execution +craft-parts @ git+https://github.com/cmatsuoka/craft-parts@craft-3828-instrumentation # via # craft-application # snapcraft (setup.py) diff --git a/setup.py b/setup.py index 59fbdd65a8..146e19dba8 100755 --- a/setup.py +++ b/setup.py @@ -102,7 +102,7 @@ def recursive_data_files(directory, install_directory): "craft-archives~=2.0", "craft-cli~=2.9", "craft-grammar>=2.0.1,<3.0.0", - "craft-parts @ git+https://github.com/canonical/craft-parts@CRAFT-3828-Capture-error-in-step-scriptlet-execution", + "craft-parts @ git+https://github.com/cmatsuoka/craft-parts@craft-3828-instrumentation", "craft-platforms~=0.4", "craft-providers>=2.0.4,<3.0.0", "craft-store>=3.0.2,<4.0.0", diff --git a/tests/spread/core24-suites/scriptlets/scriptlet-failures/task.yaml b/tests/spread/core24-suites/scriptlets/scriptlet-failures/task.yaml index 0aa6782800..bc51215293 100644 --- a/tests/spread/core24-suites/scriptlets/scriptlet-failures/task.yaml +++ b/tests/spread/core24-suites/scriptlets/scriptlet-failures/task.yaml @@ -5,7 +5,7 @@ restore: | # If this next line fails, delete it and replace it with the one fol rm -f ./*.snap execute: | - snapcraft_log="$(snapcraft build 2>&1 || true)" + snapcraft_log="$(snapcraft build --verbose 2>&1 || true)" echo "${snapcraft_log}" | NOMATCH "^should have failed set-version" echo "${snapcraft_log}" | NOMATCH "^should have failed build"