Skip to content

Commit

Permalink
Adopt updated camouflage-server & fix test_dfp_mlflow_model_writer (#…
Browse files Browse the repository at this point in the history
…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: #1195
  • Loading branch information
dagardner-nv authored Sep 18, 2023
1 parent 59d6c09 commit aab0d96
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion ci/runner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions ci/scripts/github/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion ci/scripts/run_ci_local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:-""}

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/conda/environments/cuda11.8_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/source/developer_guide/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion scripts/validation/kafka_testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}
```
Expand Down

0 comments on commit aab0d96

Please sign in to comment.