From c3f67c08f988c31a7c75a723c606c033872e2663 Mon Sep 17 00:00:00 2001
From: David Gardner <96306125+dagardner-nv@users.noreply.github.com>
Date: Tue, 11 Apr 2023 08:23:43 -0700
Subject: [PATCH] Use newly built CI images with CUDA 11.8 (#311)

* Use newly built CI images with CUDA 11.8
* Use the version of gcov installed via conda

Authors:
  - David Gardner (https://github.com/dagardner-nv)

Approvers:
  - Christopher Harris (https://github.com/cwharris)

URL: https://github.com/nv-morpheus/MRC/pull/311
---
 .github/workflows/ci_pipe.yml      | 1 +
 .github/workflows/pull_request.yml | 4 ++--
 ci/scripts/github/build.sh         | 9 +++++----
 external/utilities                 | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml
index fe5cdc6a6..879602de1 100644
--- a/.github/workflows/ci_pipe.yml
+++ b/.github/workflows/ci_pipe.yml
@@ -182,6 +182,7 @@ jobs:
         NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }}
         PARALLEL_LEVEL: '10'
       image: ${{ inputs.test_container }}
+      options: "--cap-add=sys_nice --cap-add=sys_ptrace"
     strategy:
       fail-fast: true
 
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index e310aa2d1..b777370d7 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -48,8 +48,8 @@ jobs:
     with:
       run_check: ${{ startsWith(github.ref_name, 'pull-request/') }}
       run_package_conda: ${{ !startsWith(github.ref_name, 'pull-request/') }}
-      container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-driver-230315
-      test_container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-test-230315
+      container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-driver-230410
+      test_container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-test-230410
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       CONDA_TOKEN: ${{ secrets.CONDA_TOKEN }}
diff --git a/ci/scripts/github/build.sh b/ci/scripts/github/build.sh
index c1eae4d58..e63f04eef 100755
--- a/ci/scripts/github/build.sh
+++ b/ci/scripts/github/build.sh
@@ -30,13 +30,14 @@ sccache --version
 
 if [[ "${BUILD_CC}" == "gcc" ]]; then
     rapids-logger "Building with GCC"
-    gcc --version
-    g++ --version
+    x86_64-conda-linux-gnu-cc --version
+    x86_64-conda-linux-gnu-c++ --version
     CMAKE_FLAGS="${CMAKE_BUILD_ALL_FEATURES} ${CMAKE_CACHE_FLAGS}"
 elif [[ "${BUILD_CC}" == "gcc-coverage" ]]; then
     rapids-logger "Building with GCC with gcov profile '-g -fprofile-arcs -ftest-coverage"
-    gcc --version
-    g++ --version
+    x86_64-conda-linux-gnu-cc --version
+    x86_64-conda-linux-gnu-c++ --version
+    x86_64-conda-linux-gnu-gcov --version
     CMAKE_FLAGS="${CMAKE_BUILD_ALL_FEATURES} ${CMAKE_BUILD_WITH_CODECOV} ${CMAKE_CACHE_FLAGS}"
 else
     rapids-logger "Building with Clang"
diff --git a/external/utilities b/external/utilities
index e0f496baa..a7360a69a 160000
--- a/external/utilities
+++ b/external/utilities
@@ -1 +1 @@
-Subproject commit e0f496baab032f08a230c37253a792cf1817fe46
+Subproject commit a7360a69a12edd16063b756d47c8d2e2d1ad38a2