Revert "Switch to invoking camouflage via npx, allowing it to be inst…

…alled on-demand"

This reverts commit 8998fb2.

docker/Dockerfile

@@ -114,6 +114,7 @@ RUN --mount=type=cache,id=conda_pkgs,target=/opt/conda/pkgs,sharing=locked \
     # Install mamba, boa and git here. Conda build breaks with other git installs
     /opt/conda/bin/mamba install -y -n base -c conda-forge "boa" "git >=2.35.3" "python=${PYTHON_VER}" "tini=0.19" &&\
     source activate base
+    # conda clean -afy
 
 # ============ Stage: conda_env ============
 # Create the conda environment and install all dependencies
@@ -288,6 +289,12 @@ RUN --mount=type=cache,id=apt,target=/var/cache/apt \
         libcusolver-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} && \
     rm -rf /var/lib/apt/lists/*
 
+# 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 [email protected] && \
+    npm cache clean --force
+
 # Setup git to allow other users to access /workspace. Requires git 2.35.3 or
 # greater. See https://marc.info/?l=git&m=164989570902912&w=2. Only enable for
 # development

tests/conftest.py

@@ -36,9 +36,6 @@
 from _utils.kafka import kafka_consumer_fixture  # noqa: F401 pylint:disable=unused-import
 from _utils.kafka import kafka_topics_fixture  # noqa: F401 pylint:disable=unused-import
 
-CAMOUFLAGE_PKG = "camouflage-server"
-CAMOUFLAGE_VERSION = "0.15"
-
 # Don't let pylint complain about pytest fixtures
 # pylint: disable=redefined-outer-name,unused-argument
 
@@ -610,9 +607,7 @@ def _start_camouflage(
             console_log = os.path.join(root_dir, 'console.log')
             camouflage_log = os.path.join(root_dir, 'camouflage.log')
             console_log_fh = open(console_log, 'w', encoding='utf-8')
-            popen = subprocess.Popen([
-                "npx", f"--package={CAMOUFLAGE_PKG}@{CAMOUFLAGE_VERSION}", "--", "camouflage", "--config", "config.yml"
-            ],
+            popen = subprocess.Popen(["camouflage", "--config", "config.yml"],
                                      cwd=root_dir,
                                      stderr=subprocess.STDOUT,
                                      stdout=console_log_fh,