fix utils scenario tests

Author: trxcllnt

.github/workflows/build-all-rapids-repos.yml

@@ -62,7 +62,7 @@ jobs:
         done
 
         # Install the latest sccache client
-        devcontainer-utils-install-sccache --repo trxcllnt/sccache --version latest;
+        devcontainer-utils-install-sccache --repo trxcllnt/sccache;
 
         # Configure the sccache client to talk to the build cluster
         devcontainer-utils-init-sccache-dist         \

features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh

@@ -27,7 +27,7 @@ get_num_archs_jobs_and_load() {
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'get-num-archs-jobs-and-load';
 
-    # nproc --all returns 2x the number of physical cores in Ubuntu24.04+,
+    # nproc --all returns 2x the number of threads in Ubuntu24.04+,
     # so instead we cound the number of processors in /proc/cpuinfo
     local -r n_cpus="$(grep -cP 'processor\s+:' /proc/cpuinfo)";
 

features/src/utils/opt/devcontainer/bin/post-attach-command.sh

@@ -4,31 +4,27 @@ if ! test -n "${SKIP_DEVCONTAINER_UTILS_POST_ATTACH_COMMAND:+x}"; then
     # shellcheck disable=SC1091
     . devcontainer-utils-init-git-interactive;
 
+    # Reset sccache-dist configuration
+    devcontainer-utils-init-sccache-dist;
+
+    # Initialize the GitHub CLI with the appropriate user scopes
+    # shellcheck disable=SC1091
+    . devcontainer-utils-creds-s3-init;
+
     # Update sccache client configuration to enable/disable sccache-dist
     if test -n "${DEVCONTAINER_UTILS_ENABLE_SCCACHE_DIST:+x}"; then
         if test -n "${SCCACHE_DIST_TOKEN:+x}"; then
-            devcontainer-utils-install-sccache --repo trxcllnt/sccache --version latest;
+            devcontainer-utils-install-sccache --repo trxcllnt/sccache;
             # Update ~/.config/sccache/config to use $SCCACHE_DIST_TOKEN
             devcontainer-utils-init-sccache-dist     \
                 --enable-sccache-dist - <<< "        \
                 --auth-type 'token'                  \
                 --auth-token '${SCCACHE_DIST_TOKEN}' \
             ";
-        else
-            # Initialize the GitHub CLI with the appropriate user scopes
-            # shellcheck disable=SC1091
-            . devcontainer-utils-init-github-cli;
-            if gh auth status >/dev/null 2>&1; then
-                devcontainer-utils-install-sccache --repo trxcllnt/sccache --version latest;
-                # Update ~/.config/sccache/config to use gh token auth
-                devcontainer-utils-init-sccache-dist --enable-with-github-auth;
-            fi
+        elif gh auth status >/dev/null 2>&1; then
+            devcontainer-utils-install-sccache --repo trxcllnt/sccache;
+            # Update ~/.config/sccache/config to use gh token auth
+            devcontainer-utils-init-sccache-dist --enable-with-github-auth;
         fi
-    else
-        # Delete sccache-dist configuration from ~/.config/sccache/config
-        devcontainer-utils-init-sccache-dist;
     fi
-
-    # shellcheck disable=SC1091
-    . devcontainer-utils-creds-s3-init;
 fi

features/test/utils/ubuntu18.04.sh

@@ -50,18 +50,20 @@ reset_state() {
     unset AWS_SESSION_TOKEN;
     unset AWS_SECRET_ACCESS_KEY;
 
+    while pgrep sccache >/dev/null 2>&1; do
+        devcontainer-utils-stop-sccache --kill-all;
+    done
+
     rm -rf ~/.aws/ ~/.config/gh/ ~/.config/sccache/config;
     cp /tmp/.bashrc-clean ~/.bashrc;
     sudo cp /usr/bin/sccache{.orig,};
     echo "#! /usr/bin/env bash" | sudo tee "${utils_profile_script}" >/dev/null;
     sudo chmod +x "${utils_profile_script}";
     . ~/.bashrc;
-
-    devcontainer-utils-stop-sccache --kill-all;
 }
 
 write_bad_creds() {
-    devcontainer-utils-vault-s3-creds-persist <<< "
+    devcontainer-utils-creds-s3-persist <<< "
         --stamp='$(date '+%s')'
         --bucket='${rw_sccache_bucket:-}'
         --region='${rw_sccache_region:-}'
@@ -84,7 +86,7 @@ expect_local_disk_cache_is_used() {
 }
 
 expect_sccache_dist_auth_token_is_gh_token() {
-    set -ex;
+    set -e;
     test -f ~/.config/sccache/config;
     grep -qE "[dist.auth]" ~/.config/sccache/config;
     grep -qE "type = \"token\"" ~/.config/sccache/config;

features/test/utils/ubuntu20.04.sh

@@ -50,18 +50,20 @@ reset_state() {
     unset AWS_SESSION_TOKEN;
     unset AWS_SECRET_ACCESS_KEY;
 
+    while pgrep sccache >/dev/null 2>&1; do
+        devcontainer-utils-stop-sccache --kill-all;
+    done
+
     rm -rf ~/.aws/ ~/.config/gh/ ~/.config/sccache/config;
     cp /tmp/.bashrc-clean ~/.bashrc;
     sudo cp /usr/bin/sccache{.orig,};
     echo "#! /usr/bin/env bash" | sudo tee "${utils_profile_script}" >/dev/null;
     sudo chmod +x "${utils_profile_script}";
     . ~/.bashrc;
-
-    devcontainer-utils-stop-sccache --kill-all;
 }
 
 write_bad_creds() {
-    devcontainer-utils-vault-s3-creds-persist <<< "
+    devcontainer-utils-creds-s3-persist <<< "
         --stamp='$(date '+%s')'
         --bucket='${rw_sccache_bucket:-}'
         --region='${rw_sccache_region:-}'
@@ -84,7 +86,7 @@ expect_local_disk_cache_is_used() {
 }
 
 expect_sccache_dist_auth_token_is_gh_token() {
-    set -ex;
+    set -e;
     test -f ~/.config/sccache/config;
     grep -qE "[dist.auth]" ~/.config/sccache/config;
     grep -qE "type = \"token\"" ~/.config/sccache/config;

features/test/utils/ubuntu22.04.sh

@@ -50,18 +50,20 @@ reset_state() {
     unset AWS_SESSION_TOKEN;
     unset AWS_SECRET_ACCESS_KEY;
 
+    while pgrep sccache >/dev/null 2>&1; do
+        devcontainer-utils-stop-sccache --kill-all;
+    done
+
     rm -rf ~/.aws/ ~/.config/gh/ ~/.config/sccache/config;
     cp /tmp/.bashrc-clean ~/.bashrc;
     sudo cp /usr/bin/sccache{.orig,};
     echo "#! /usr/bin/env bash" | sudo tee "${utils_profile_script}" >/dev/null;
     sudo chmod +x "${utils_profile_script}";
     . ~/.bashrc;
-
-    devcontainer-utils-stop-sccache --kill-all;
 }
 
 write_bad_creds() {
-    devcontainer-utils-vault-s3-creds-persist <<< "
+    devcontainer-utils-creds-s3-persist <<< "
         --stamp='$(date '+%s')'
         --bucket='${rw_sccache_bucket:-}'
         --region='${rw_sccache_region:-}'
@@ -84,7 +86,7 @@ expect_local_disk_cache_is_used() {
 }
 
 expect_sccache_dist_auth_token_is_gh_token() {
-    set -ex;
+    set -e;
     test -f ~/.config/sccache/config;
     grep -qE "[dist.auth]" ~/.config/sccache/config;
     grep -qE "type = \"token\"" ~/.config/sccache/config;