Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI to install DOCA and build Morpheus DOCA components. #1622

Merged
merged 16 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
# Disable conda upload for now, once we have morpheus packages in conda forge set the value to
# !fromJSON(needs.prepare.outputs.is_pr) && (fromJSON(needs.prepare.outputs.is_main_branch) && 'main' || 'dev') || ''
conda_upload_label: ""
container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-240221
test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-240221
container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-240524
test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-240524
secrets:
NGC_API_KEY: ${{ secrets.NGC_API_KEY }}
15 changes: 14 additions & 1 deletion ci/runner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ SHELL ["/bin/bash", "-c"]
# Create conda environment
COPY ./dependencies.yaml /tmp/conda/


# ============ build ==================
FROM base as build

Expand All @@ -56,6 +55,20 @@ RUN rapids-dependency-file-generator \
conda clean -afy && \
rm -rf /tmp/conda

ENV MORPHEUS_SUPPORT_DOCA=ON

COPY ./docker/optional_deps/doca.sh /tmp/doca/

RUN apt update && \
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \
apt install --no-install-recommends -y \
build-essential \
libtool \
automake && \
apt clean && \
/tmp/doca/doca.sh /tmp/doca && \
rm -rf /tmp/doca

# ============ test ==================
FROM base as test

Expand Down
4 changes: 4 additions & 0 deletions ci/scripts/github/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ fi
export CMAKE_BUILD_ALL_FEATURES="${_FLAGS[@]}"
unset _FLAGS

if [[ ${MORPHEUS_SUPPORT_DOCA} == @(TRUE|ON) ]]; then
export CMAKE_BUILD_ALL_FEATURES="${CMAKE_BUILD_ALL_FEATURES} -DMORPHEUS_SUPPORT_DOCA=ON"
fi

export FETCH_STATUS=0

print_env_vars
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/run_ci_local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ GIT_BRANCH=$(git branch --show-current)
GIT_COMMIT=$(git log -n 1 --pretty=format:%H)

LOCAL_CI_TMP=${LOCAL_CI_TMP:-${MORPHEUS_ROOT}/.tmp/local_ci_tmp}
CONTAINER_VER=${CONTAINER_VER:-240221}
CONTAINER_VER=${CONTAINER_VER:-240524}
CUDA_VER=${CUDA_VER:-12.1}
DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""}

Expand Down
Loading