From aab0d96f76d2cd0b9403e5d149a46f2feeab132e Mon Sep 17 00:00:00 2001 From: David Gardner <96306125+dagardner-nv@users.noreply.github.com> Date: Mon, 18 Sep 2023 06:13:21 -0700 Subject: [PATCH] Adopt updated camouflage-server & fix test_dfp_mlflow_model_writer (#1195) * Adopt camouflage-server 0.15, previously we've been locked on v0.9 due to outstanding bugs introduced in versions 0.10 - 0.14.1 : - testinggospels/camouflage#203 - testinggospels/camouflage#223 - testinggospels/camouflage#227 - testinggospels/camouflage#229 * Includes unrelated fix to running CI locally * Restrict mlflow to versions prior to 2.7 closes #967 Fixes #1192 ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes. Authors: - David Gardner (https://github.com/dagardner-nv) Approvers: - Christopher Harris (https://github.com/cwharris) URL: https://github.com/nv-morpheus/Morpheus/pull/1195 --- .github/workflows/pull_request.yml | 4 ++-- ci/runner/Dockerfile | 2 +- ci/scripts/github/common.sh | 8 +++++--- ci/scripts/run_ci_local.sh | 2 +- docker/Dockerfile | 2 +- docker/conda/environments/cuda11.8_dev.yml | 2 +- docs/source/developer_guide/contributing.md | 2 +- scripts/validation/kafka_testing.md | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index eb791243c1..52f513d6f5 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -46,7 +46,7 @@ jobs: uses: ./.github/workflows/ci_pipe.yml with: run_check: ${{ startsWith(github.ref_name, 'pull-request/') }} - container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-230828 - test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-230828 + container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-230913 + test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-230913 secrets: NGC_API_KEY: ${{ secrets.NGC_API_KEY }} diff --git a/ci/runner/Dockerfile b/ci/runner/Dockerfile index 7942224235..441b9b713d 100644 --- a/ci/runner/Dockerfile +++ b/ci/runner/Dockerfile @@ -68,7 +68,7 @@ COPY ./ci/scripts/download_kafka.py /tmp/scripts/download_kafka.py # Install camouflage needed for unittests to mock a triton server RUN source activate ${PROJ_NAME} && \ - npm install -g camouflage-server@0.9 && \ + npm install -g camouflage-server@0.15 && \ npm cache clean --force # Install Kafka diff --git a/ci/scripts/github/common.sh b/ci/scripts/github/common.sh index e598e64482..c60f091336 100644 --- a/ci/scripts/github/common.sh +++ b/ci/scripts/github/common.sh @@ -186,7 +186,9 @@ function download_artifact() { } function set_job_summary_preamble() { - msg="Note: NVIDIA VPN access is required to view these URLs." - echo $msg >> ${GITHUB_STEP_SUMMARY} - rapids-logger $msg + if [[ "${LOCAL_CI}" == "" ]]; then + msg="Note: NVIDIA VPN access is required to view these URLs." + echo $msg >> ${GITHUB_STEP_SUMMARY} + rapids-logger $msg + fi } diff --git a/ci/scripts/run_ci_local.sh b/ci/scripts/run_ci_local.sh index 88c3fa57c1..4b13ef4f7f 100755 --- a/ci/scripts/run_ci_local.sh +++ b/ci/scripts/run_ci_local.sh @@ -49,7 +49,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:-230828} +CONTAINER_VER=${CONTAINER_VER:-230913} CUDA_VER=${CUDA_VER:-11.8} DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""} diff --git a/docker/Dockerfile b/docker/Dockerfile index e8c2f8a7fc..3f82e5b17b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -291,7 +291,7 @@ RUN --mount=type=cache,id=apt,target=/var/cache/apt \ # Install camouflage needed for unittests to mock a triton server # Pin to v0.9 until #967 is resolved RUN source activate morpheus && \ - npm install -g camouflage-server@0.9 && \ + npm install -g camouflage-server@0.15 && \ npm cache clean --force # Setup git to allow other users to access /workspace. Requires git 2.35.3 or diff --git a/docker/conda/environments/cuda11.8_dev.yml b/docker/conda/environments/cuda11.8_dev.yml index 9f835123c9..600827ffa6 100644 --- a/docker/conda/environments/cuda11.8_dev.yml +++ b/docker/conda/environments/cuda11.8_dev.yml @@ -64,7 +64,7 @@ dependencies: - jupyterlab - libgrpc>=1.49 - librdkafka=1.9.2 - - mlflow>=2.2.1,<3 + - mlflow>=2.2.1,<2.7 - mrc=23.11 - networkx=3.1 - ninja=1.10 diff --git a/docs/source/developer_guide/contributing.md b/docs/source/developer_guide/contributing.md index 54904e4f9e..2688d5d652 100644 --- a/docs/source/developer_guide/contributing.md +++ b/docs/source/developer_guide/contributing.md @@ -236,7 +236,7 @@ git submodule update --init --recursive 1. Optional: Run full end-to-end tests - Our end-to-end tests require the [camouflage](https://testinggospels.github.io/camouflage/) testing framework. Install camouflage with: ```bash - npm install -g camouflage-server + npm install -g camouflage-server@0.15 ``` Run all tests: diff --git a/scripts/validation/kafka_testing.md b/scripts/validation/kafka_testing.md index c9d09d662b..b2ede161b9 100644 --- a/scripts/validation/kafka_testing.md +++ b/scripts/validation/kafka_testing.md @@ -18,7 +18,7 @@ limitations under the License. This document walks through manual testing of the Kafka functionality in Morpheus. There are also several automated tests which are run as part of the CI process. To run the tests locally we will need to install a few dependencies needed for the tests: ```bash mamba install -c conda-forge "openjdk=11.0.15" -npm install -g camouflage-server@0.9 +npm install -g camouflage-server@0.15 python ${MORPHEUS_ROOT}/ci/scripts/download_kafka.py cd ${MORPHEUS_ROOT} ```