From 7544365e9a87f1494c5061ab4447df2fa865cec0 Mon Sep 17 00:00:00 2001
From: ashors1 <71393111+ashors1@users.noreply.github.com>
Date: Wed, 11 Oct 2023 22:28:39 -0700
Subject: [PATCH] Fix docker tags for nightly upstream pax and t5x tests (#296)

The containers used to run nightly Pax and T5X upstream mgmn tests were
not updated following the container renaming, so the nightly tests were
erroneously using the rosetta-{pax, t5x} containers. This caused a test
failure with today's Pax nightly because the upstream tests ran with
yesterday's rosetta-pax container, which had an outdated version of
`test-pax.sh`.
---
 .github/workflows/_test_pax.yaml             | 4 ++--
 .github/workflows/_test_pax_rosetta.yaml     | 2 +-
 .github/workflows/_test_t5x.yaml             | 4 ++--
 .github/workflows/nightly-pax-test-mgmn.yaml | 6 +++---
 .github/workflows/nightly-t5x-test-mgmn.yaml | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/_test_pax.yaml b/.github/workflows/_test_pax.yaml
index 3f40d4545..b70e3c87a 100644
--- a/.github/workflows/_test_pax.yaml
+++ b/.github/workflows/_test_pax.yaml
@@ -5,8 +5,8 @@ on:
     inputs:
       PAX_IMAGE:
         type: string
-        description: PAX image from ghcr.io/nvidia/pax
-        default: latest
+        description: PAX image from ghcr.io/nvidia
+        default: ghcr.io/nvidia/upstream-pax:latest
         required: false
       EXTRA_TEST_ARGS:
         type: string
diff --git a/.github/workflows/_test_pax_rosetta.yaml b/.github/workflows/_test_pax_rosetta.yaml
index d498dec1a..c69736a4c 100644
--- a/.github/workflows/_test_pax_rosetta.yaml
+++ b/.github/workflows/_test_pax_rosetta.yaml
@@ -6,7 +6,7 @@ on:
       PAX_IMAGE:
         type: string
         description: PAX image from ghcr.io/nvidia/pax
-        default: latest
+        default: ghcr.io/nvidia/pax:latest
         required: false
       EXTRA_TEST_ARGS:
         type: string
diff --git a/.github/workflows/_test_t5x.yaml b/.github/workflows/_test_t5x.yaml
index 5b8b0529e..8eef2a778 100644
--- a/.github/workflows/_test_t5x.yaml
+++ b/.github/workflows/_test_t5x.yaml
@@ -5,8 +5,8 @@ on:
     inputs:
       T5X_IMAGE:
         type: string
-        description: T5X image from ghcr.io/nvidia/t5x
-        default: 'ghcr.io/nvidia/t5x:latest'
+        description: T5X image from ghcr.io/nvidia
+        default: 'ghcr.io/nvidia/upstream-t5x:latest'
         required: false
       BATCH_SIZE_PER_GPU:
         type: number
diff --git a/.github/workflows/nightly-pax-test-mgmn.yaml b/.github/workflows/nightly-pax-test-mgmn.yaml
index 671300986..5d785163f 100644
--- a/.github/workflows/nightly-pax-test-mgmn.yaml
+++ b/.github/workflows/nightly-pax-test-mgmn.yaml
@@ -10,7 +10,7 @@ on:
       PAX_IMAGE:
         type: string
         description: Pax container
-        default: 'ghcr.io/nvidia/pax:latest'
+        default: 'ghcr.io/nvidia/upstream-pax:latest'
         required: true
       PUBLISH:
         type: boolean
@@ -25,7 +25,7 @@ permissions:
   issues:   write # to create issues
 
 env:
-  DEFAULT_PAX_IMAGE: 'ghcr.io/nvidia/pax:latest'
+  DEFAULT_PAX_IMAGE: 'ghcr.io/nvidia/upstream-pax:latest'
 
 jobs:
 
@@ -165,4 +165,4 @@ jobs:
     runs-on: ubuntu-latest
     if: (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'failure') && github.event_name != 'workflow_dispatch'
     steps:
-      - run: echo 'Upstream workflow failed, aborting run' && exit 1
\ No newline at end of file
+      - run: echo 'Upstream workflow failed, aborting run' && exit 1
diff --git a/.github/workflows/nightly-t5x-test-mgmn.yaml b/.github/workflows/nightly-t5x-test-mgmn.yaml
index e3305c33a..d13b68ce3 100644
--- a/.github/workflows/nightly-t5x-test-mgmn.yaml
+++ b/.github/workflows/nightly-t5x-test-mgmn.yaml
@@ -10,7 +10,7 @@ on:
       T5X_IMAGE:
         type: string
         description: T5X container
-        default: 'ghcr.io/nvidia/t5x:latest'
+        default: 'ghcr.io/nvidia/upstream-t5x:latest'
         required: true
       PUBLISH:
         type: boolean
@@ -25,7 +25,7 @@ permissions:
   issues: write   # to create issues
 
 env:
-  DEFAULT_T5X_IMAGE: 'ghcr.io/nvidia/t5x:latest'
+  DEFAULT_T5X_IMAGE: 'ghcr.io/nvidia/upstream-t5x:latest'
 
 jobs:
 
@@ -127,4 +127,4 @@ jobs:
     runs-on: ubuntu-latest
     if: (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'failure') && github.event_name != 'workflow_dispatch'
     steps:
-      - run: echo 'Upstream workflow failed, aborting run' && exit 1
\ No newline at end of file
+      - run: echo 'Upstream workflow failed, aborting run' && exit 1