From 4fb368816b7a22022d9d7245346b7ed74a099814 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 16 Apr 2024 13:40:37 -0700 Subject: [PATCH 1/2] Add removal of lttng-modules-dkms package as it is currently causing microbenchmarking runs to fail. --- eng/pipelines/coreclr/templates/run-performance-job.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/run-performance-job.yml b/eng/pipelines/coreclr/templates/run-performance-job.yml index 65b1cb3b78443c..563853547eaadd 100644 --- a/eng/pipelines/coreclr/templates/run-performance-job.yml +++ b/eng/pipelines/coreclr/templates/run-performance-job.yml @@ -69,6 +69,7 @@ jobs: # nodejs installation steps from https://github.com/nodesource/distributions - HelixPreCommandsWasmOnLinux: >- export RestoreAdditionalProjectSources=$HELIX_CORRELATION_PAYLOAD/built-nugets && + sudo apt-get remove -y lttng-modules-dkms && sudo apt-get -y remove nodejs && sudo apt-get update && sudo apt-get install -y ca-certificates curl gnupg && @@ -93,6 +94,7 @@ jobs: echo "** Installing prerequistes **"; echo "** Waiting for dpkg to unlock (up to 2 minutes) **" && timeout 2m bash -c 'while sudo fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1; do if [ -z "$printed" ]; then echo "Waiting for dpkg lock to be released... Lock is held by: $(ps -o cmd= -p $(sudo fuser /var/lib/dpkg/lock-frontend))"; printed=1; fi; echo "Waiting 5 seconds to check again"; sleep 5; done;' && + sudo apt-get remove -y lttng-modules-dkms && sudo apt-get -y install python3-pip && python3 -m pip install --user -U pip && sudo apt-get -y install python3-venv && @@ -194,4 +196,4 @@ jobs: WorkItemDirectory: '$(WorkItemDirectory)' # WorkItemDirectory can not be empty, so we send it some docs to keep it happy CorrelationPayloadDirectory: '$(PayloadDirectory)' # it gets checked out to a folder with shorter path than WorkItemDirectory so we can avoid file name too long exceptions ProjectFile: ${{ parameters.projectFile }} - osGroup: ${{ parameters.osGroup }} \ No newline at end of file + osGroup: ${{ parameters.osGroup }} From a031dd169a9fa4368f4127fa000aa24aac2e9ad4 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 16 Apr 2024 15:12:26 -0700 Subject: [PATCH 2/2] Removed unnecessary remove call as the WasmOnLinux commands are also run as part of the regular linux commands. --- eng/pipelines/coreclr/templates/run-performance-job.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/run-performance-job.yml b/eng/pipelines/coreclr/templates/run-performance-job.yml index 563853547eaadd..2b61558e2fc97f 100644 --- a/eng/pipelines/coreclr/templates/run-performance-job.yml +++ b/eng/pipelines/coreclr/templates/run-performance-job.yml @@ -69,7 +69,6 @@ jobs: # nodejs installation steps from https://github.com/nodesource/distributions - HelixPreCommandsWasmOnLinux: >- export RestoreAdditionalProjectSources=$HELIX_CORRELATION_PAYLOAD/built-nugets && - sudo apt-get remove -y lttng-modules-dkms && sudo apt-get -y remove nodejs && sudo apt-get update && sudo apt-get install -y ca-certificates curl gnupg &&