From bc0c25c4b581a77dc38dd72375019cb796655181 Mon Sep 17 00:00:00 2001
From: Frederic Bastien <fbastien@nvidia.com>
Date: Wed, 19 Apr 2023 08:26:04 -0700
Subject: [PATCH] pytest* just got removed. The CI don't need them anymore, so
 remove that requirement.

---
 .github/workflows/nightly-ci-multiprocess-gpu.yml         | 1 -
 .github/workflows/slurm_job_scripts/run_e2e_t5x_tests.sub | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/nightly-ci-multiprocess-gpu.yml b/.github/workflows/nightly-ci-multiprocess-gpu.yml
index c593c7b13..c3d06a632 100644
--- a/.github/workflows/nightly-ci-multiprocess-gpu.yml
+++ b/.github/workflows/nightly-ci-multiprocess-gpu.yml
@@ -80,7 +80,6 @@ jobs:
           ssh ${CONFIG} headnode "rm -rf ${GITHUB_WORKSPACE_REMOTE} && mkdir -p ${GITHUB_WORKSPACE_REMOTE}"
           scp ${CONFIG} -r ./.github     headnode:${GITHUB_WORKSPACE_REMOTE}/.github
           scp ${CONFIG} -r ./tests       headnode:${GITHUB_WORKSPACE_REMOTE}/tests
-          scp ${CONFIG} -r ./pytest*     headnode:${GITHUB_WORKSPACE_REMOTE}/
 
       - name: T5X end-to-end tests
         timeout-minutes: 25
diff --git a/.github/workflows/slurm_job_scripts/run_e2e_t5x_tests.sub b/.github/workflows/slurm_job_scripts/run_e2e_t5x_tests.sub
index dc8675cd7..65be54fbe 100644
--- a/.github/workflows/slurm_job_scripts/run_e2e_t5x_tests.sub
+++ b/.github/workflows/slurm_job_scripts/run_e2e_t5x_tests.sub
@@ -39,11 +39,10 @@ MOUNTS="--container-mounts=$BASE_OUTPUT_DIR:$OUTPUT_DIR"
 EXPORTS="--export=ALL,PYTHONPATH=${T5X_DIR}"
 #-------------------------------------------------------------------------------
 
-# Setup command to be run before the actual pytest command
+# Setup command to be run before the actual test command
 # We remove cudf from the container as a temporary WAR to a protobuf
 # dependency issue between cudf and tensorflow-cpu that t5x try to
 # install.
-# Note, we need to take the yesterday date as the current nightly isn't build.
 read -r -d '' setup_cmd <<EOF
 rm -rf ${E2E_TESTS_WORKSPACE_DIR}/* \
 && mkdir -p ${E2E_TESTS_WORKSPACE_DIR} \
@@ -75,7 +74,7 @@ EOF
 # Count errors
 errors=0 && trap errors=1 ERR
 
-# Run any setup commands before the actual pytest command to make sure
+# Run any setup commands before the actual test command to make sure
 # that the processes are launched together
 echo "$setup_cmd"
 srun -o "$OUTFILE" -e "$OUTFILE" \
@@ -88,7 +87,7 @@ srun -o "$OUTFILE" -e "$OUTFILE" \
     "$EXPORTS" \
     timeout -v -k 0.5m 9m bash -c "${setup_cmd}"
 
-# Run the actual pytest command
+# Run the actual test command
 echo "$cmd"
 srun -o "$OUTFILE" -e "$OUTFILE" \
     -t 00:15:00 \