Merge branch 'main' into rkalani/translate

Author: ayushdg

.github/actions/build-container/action.yml

@@ -15,22 +15,12 @@
 name: Build container
 
 inputs:
-  azure-client-id:
-    description: "Azure Client ID"
-    required: true
-  azure-tenant-id:
-    description: "Azure Tenant ID"
-    required: true
-  azure-subscription-id:
-    description: "Azure Subscription ID"
+  container-registry:
+    description: "Container registry to push/pull images"
     required: true
   dockerfile-path:
     description: "Path to dockerfile to build"
     required: true
-  has-azure-credentials:
-    description: "Has Azure credentials"
-    required: false
-    default: "false"
   PAT:
     description: "GitHub Personal Access Token"
     required: true
@@ -39,9 +29,6 @@ inputs:
     required: true
     type: string
 
-env:
-  container-registry: nemoci.azurecr.io
-
 runs:
   using: "composite"
   steps:
@@ -58,26 +45,6 @@ runs:
       if: startsWith(github.ref, 'refs/heads/pull-request/')
       uses: nv-gha-runners/get-pr-info@main
 
-    - name: Install Azure CLI
-      shell: bash
-      run: |
-        echo "::group::Install Azure CLI"
-        # Create systemd override for proper dependencies
-        curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
-        echo "::endgroup::"
-
-    - name: Azure Login
-      uses: azure/login@v2
-      with:
-        client-id: ${{ inputs.azure-client-id }}
-        tenant-id: ${{ inputs.azure-tenant-id }}
-        subscription-id: ${{ inputs.azure-subscription-id }}
-
-    - name: Azure ACR Login
-      shell: bash
-      run: |
-        az acr login --name nemoci
-
     - name: Install GH CLI
       shell: bash
       run: |
@@ -91,8 +58,10 @@ runs:
       shell: bash
       env:
         REPO: ${{ inputs.repo-name }}
+        REGISTRY: ${{ inputs.container-registry }}
       run: |
         echo "REPO_LOWER=${REPO,,}" >> "$GITHUB_ENV"
+        echo "container-registry=${REGISTRY}" >> "$GITHUB_ENV"
 
     - name: Get last merged PR
       shell: bash

.github/actions/test-template/action.yml

@@ -35,19 +35,6 @@ inputs:
     description: "Run tests on CPU only"
     required: false
     default: "false"
-  azure-client-id:
-    description: "Azure Client ID"
-    required: true
-  azure-tenant-id:
-    description: "Azure Tenant ID"
-    required: true
-  azure-subscription-id:
-    description: "Azure Subscription ID"
-    required: true
-  has-azure-credentials:
-    description: "Has Azure credentials"
-    required: false
-    default: "false"
   HF_TOKEN:
     description: "Hugging Face Token"
     required: true
@@ -74,30 +61,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Install Azure CLI
-      if: ${{ inputs.has-azure-credentials == 'true' }}
-      shell: bash
-      run: |
-        for i in 1 2 3; do
-          curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash && break
-          echo "Attempt $i failed, retrying in 10s..."
-          sleep 10
-        done
-
-    - name: Azure Login
-      if: ${{ inputs.has-azure-credentials == 'true' }}
-      uses: azure/login@v2
-      with:
-        client-id: ${{ inputs.azure-client-id }}
-        tenant-id: ${{ inputs.azure-tenant-id }}
-        subscription-id: ${{ inputs.azure-subscription-id }}
-
-    - name: Azure ACR Login
-      if: ${{ inputs.has-azure-credentials == 'true' }}
-      shell: bash
-      run: |
-        az acr login --name nemoci
-
     - name: Install uuidgen
       shell: bash -x -e -u -o pipefail {0}
       if: ${{ contains(inputs.runner, 'aws') }}
@@ -113,8 +76,6 @@ runs:
       env:
         HF_TOKEN: ${{ inputs.HF_TOKEN }}
       run: |
-        MNT_PATH=${{ steps.azure-fileshare.outputs.mnt_path }}
-
         ARG=("")
         if [[ "${{ inputs.cpu-only }}" == "false" ]]; then
           ARG=("--runtime=nvidia --gpus all")

.github/workflows/cicd-main.yml

@@ -31,7 +31,7 @@ permissions:
   actions: write  # Required for gh run cancel
 
 env:
-  container-registry: nemoci.azurecr.io
+  container-registry: ${{ vars.DEFAULT_CONTAINER_REGISTRY }}
   UV_HTTP_TIMEOUT: 60
 
 jobs:
@@ -138,11 +138,8 @@ jobs:
       - name: main
         uses: ./.github/actions/build-container
         with:
-          azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          container-registry: ${{ env.container-registry }}
           dockerfile-path: "./docker/Dockerfile"
-          has-azure-credentials: "true"
           PAT: ${{ secrets.PAT }}
           repo-name: "Curator"
 
@@ -198,10 +195,6 @@ jobs:
         with:
           script: L0_Unit_Test_GPU
           is_unit_test: "false"
-          has-azure-credentials: "true"
-          azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           HF_TOKEN: ${{ secrets.HF_TOKEN }}
           PAT: ${{ secrets.PAT }}
           timeout: 40