Consolidate upload of all conda packages with the "conda_upload_label"

Updated the "morpheus" conda-package job to not upload (it was earlier relying on conda_upload_label being empty to skip upload). Signed-off-by: Anuradha Karuppiah <[email protected]>
nv-morpheus · Sep 6, 2024 · 759337e · 759337e
1 parent 0badf40
commit 759337e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml
@@ -25,18 +25,14 @@ on:
         description: 'Runs the stage to build the morpheus-core conda package'
         required: true
         type: boolean
-      conda_core_upload_label:
-        description: 'The label to use when uploading the morpheus-core conda package. Leave empty to disable uploading'
+      conda_upload_label:
+        description: 'The label to use when uploading the morpheus conda packages. Leave empty to disable uploading'
         required: true
         type: string
       conda_run_build:
         description: 'Runs the conda-build stage to build the conda package with all morpheus components'
         required: true
         type: boolean
-      conda_upload_label:
-        description: 'The label to use when uploading the conda package. Leave empty to disable uploading'
-        required: true
-        type: string
       container:
         required: true
         type: string
@@ -242,8 +238,8 @@ jobs:
         shell: bash
         env:
           CONDA_TOKEN: "${{ secrets.CONDA_TOKEN }}"
-          SCRIPT_ARGS: "${{ inputs.conda_core_upload_label != '' && 'upload' || '' }}"
-          CONDA_PKG_LABEL: "${{ inputs.conda_core_upload_label }}"
+          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:
@@ -278,8 +274,4 @@ jobs:
 
       - name: conda
         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.sh $SCRIPT_ARGS
+        run: ./morpheus/ci/scripts/github/conda.sh
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -94,12 +94,10 @@ jobs:
       # for PRs with the conda-core-build label
       conda_core_run_build: ${{ !fromJSON(needs.prepare.outputs.is_pr) || fromJSON(needs.prepare.outputs.has_conda_core_build_label) }}
       # Upload morpheus-core conda package only for non PR branches. Use 'main' for main branch and 'dev' for all other branches
-      conda_core_upload_label: ${{ !fromJSON(needs.prepare.outputs.is_pr) && (fromJSON(needs.prepare.outputs.is_main_branch) && 'main' || 'dev') || '' }}
+      conda_upload_label: ${{ !fromJSON(needs.prepare.outputs.is_pr) && (fromJSON(needs.prepare.outputs.is_main_branch) && 'main' || 'dev') || '' }}
       # Run morpheus conda package, with all components. 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) }}
-      # Disable conda upload for now, once we have morpheus packages in conda forge set the value to
-      conda_upload_label: ""
       container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-240614
       test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-240614
     secrets: