From ed331ebc7e1df8bfe4fd188c3713c4683e998bad Mon Sep 17 00:00:00 2001 From: Anuradha Karuppiah Date: Thu, 26 Sep 2024 15:58:37 +0000 Subject: [PATCH] Drop conda-lib-build label 1. conda-build is used for building conda pacakge for the morpheus libraries. 2. Dropped the conda package with "all components". This will be replaced with the individual conda packages. Signed-off-by: Anuradha Karuppiah --- .github/workflows/ci_pipe.yml | 44 +++-------------------------------- .github/workflows/pr.yaml | 10 +++----- 2 files changed, 6 insertions(+), 48 deletions(-) diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml index ccfc29cabf..a1b2738620 100644 --- a/.github/workflows/ci_pipe.yml +++ b/.github/workflows/ci_pipe.yml @@ -21,16 +21,12 @@ on: run_check: required: true type: boolean - conda_lib_build: - description: 'Runs the stage to build the conda packages for all morpheus libraries - core, dfp etc.' - required: true - type: boolean 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' + description: 'Runs the conda-build stage to build the morpheus conda packages' required: true type: boolean container: @@ -206,7 +202,7 @@ jobs: package-core: name: Package Core - if: ${{ inputs.conda_lib_build }} + if: ${{ inputs.conda_run_build }} needs: [documentation, test] runs-on: linux-amd64-cpu16 timeout-minutes: 60 @@ -244,7 +240,7 @@ jobs: package-dfp: name: Package DFP library - if: ${{ inputs.conda_lib_build }} + if: ${{ inputs.conda_run_build }} needs: [package-core] runs-on: linux-amd64-cpu16 timeout-minutes: 60 @@ -279,37 +275,3 @@ jobs: SCRIPT_ARGS: "${{ inputs.conda_upload_label != '' && 'upload' || '' }}" CONDA_PKG_LABEL: "${{ inputs.conda_upload_label }}" run: ./morpheus/ci/scripts/github/conda_dfp.sh $SCRIPT_ARGS - - package: - name: Package All - if: ${{ inputs.conda_run_build }} - needs: [check, documentation, test] - 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: conda - shell: bash - run: ./morpheus/ci/scripts/github/conda.sh diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 203c9185ea..bb67ad474e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -68,7 +68,6 @@ jobs: is_main_branch: ${{ github.ref_name == 'main' }} is_dev_branch: ${{ startsWith(github.ref_name, 'branch-') }} has_conda_build_label: ${{ steps.get-pr-info.outcome == 'success' && contains(fromJSON(steps.get-pr-info.outputs.pr-info).labels.*.name, 'conda-build') || false }} - has_conda_lib_build_label: ${{ steps.get-pr-info.outcome == 'success' && contains(fromJSON(steps.get-pr-info.outputs.pr-info).labels.*.name, 'conda-lib-build') || false }} has_skip_ci_label: ${{ steps.get-pr-info.outcome == 'success' && contains(fromJSON(steps.get-pr-info.outputs.pr-info).labels.*.name, 'skip-ci') || false }} pr_info: ${{ steps.get-pr-info.outcome == 'success' && steps.get-pr-info.outputs.pr-info || '' }} @@ -90,14 +89,11 @@ jobs: with: # Run checks for any PR branch run_check: ${{ fromJSON(needs.prepare.outputs.is_pr) }} - # Build conda packages for all the morpheus libraries - core, dfp, llm. This is done for - # main/dev branches and for PRs with the conda-lib-build label - conda_lib_build: ${{ !fromJSON(needs.prepare.outputs.is_pr) || fromJSON(needs.prepare.outputs.has_conda_lib_build_label) }} + # 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 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) }} container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-240614 test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-240614 secrets: