From 5517e88975a0f14a0397752878f0ba18ba7801ab Mon Sep 17 00:00:00 2001
From: Anuradha Karuppiah <anuradhak@nvidia.com>
Date: Tue, 1 Oct 2024 02:40:00 +0000
Subject: [PATCH] Update the github workflow to use the conda split package
 script

Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
---
 .github/workflows/ci_pipe.yml | 42 ++---------------------------------
 .github/workflows/pr.yaml     |  2 +-
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml
index a1b2738620..2b0d7a642e 100644
--- a/.github/workflows/ci_pipe.yml
+++ b/.github/workflows/ci_pipe.yml
@@ -201,7 +201,7 @@ jobs:
         run: ./morpheus/ci/scripts/github/docs.sh
 
   package-core:
-    name: Package Core
+    name: Conda Package
     if: ${{ inputs.conda_run_build }}
     needs: [documentation, test]
     runs-on: linux-amd64-cpu16
@@ -236,42 +236,4 @@ jobs:
           CONDA_TOKEN: "${{ secrets.CONDA_TOKEN }}"
           SCRIPT_ARGS: "${{ inputs.conda_upload_label != '' && 'upload' || '' }}"
           CONDA_PKG_LABEL: "${{ inputs.conda_upload_label }}"
-        run: ./morpheus/ci/scripts/github/conda_core.sh $SCRIPT_ARGS
-
-  package-dfp:
-    name: Package DFP library
-    if: ${{ inputs.conda_run_build }}
-    needs: [package-core]
-    runs-on: linux-amd64-cpu16
-    timeout-minutes: 60
-    container:
-      credentials:
-        username: '$oauthtoken'
-        password: ${{ secrets.NGC_API_KEY }}
-      image: ${{ inputs.container }}
-    strategy:
-      fail-fast: true
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          lfs: false
-          path: 'morpheus'
-          fetch-depth: 0
-          submodules: 'recursive'
-
-      - name: Get AWS credentials using OIDC
-        uses: aws-actions/configure-aws-credentials@v1-node16
-        with:
-          role-to-assume: ${{ vars.AWS_ROLE_ARN }}
-          aws-region: ${{ vars.AWS_REGION }}
-          role-duration-seconds: 43200 # 12h
-
-      - name: Build morpheus-dfp conda package
-        shell: bash
-        env:
-          CONDA_TOKEN: "${{ secrets.CONDA_TOKEN }}"
-          SCRIPT_ARGS: "${{ inputs.conda_upload_label != '' && 'upload' || '' }}"
-          CONDA_PKG_LABEL: "${{ inputs.conda_upload_label }}"
-        run: ./morpheus/ci/scripts/github/conda_dfp.sh $SCRIPT_ARGS
+        run: ./morpheus/ci/scripts/github/conda_libs.sh $SCRIPT_ARGS
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index bb67ad474e..07ec5ca9e9 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -92,7 +92,7 @@ jobs:
       # Build conda packages for all the morpheus libraries - core, dfp, llm. This is
       # done for main/dev branches and for PRs with the conda-build label
       conda_run_build: ${{ !fromJSON(needs.prepare.outputs.is_pr) || fromJSON(needs.prepare.outputs.has_conda_build_label) }}
-      # Upload morpheus-core conda package only for non PR branches. Use 'main' for main branch and 'dev' for all other branches
+      # Upload morpheus conda packages only for non PR branches. Use 'main' for main branch and 'dev' for all other branches
       conda_upload_label: ${{ !fromJSON(needs.prepare.outputs.is_pr) && (fromJSON(needs.prepare.outputs.is_main_branch) && 'main' || 'dev') || '' }}
       container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-240614
       test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-240614