From 3d2fd40cf0aa85e35d6e04b94cf2d0c4a0fed16f Mon Sep 17 00:00:00 2001 From: munishchouhan Date: Thu, 3 Oct 2024 18:44:59 +0200 Subject: [PATCH] fixed tests Signed-off-by: munishchouhan --- .../conda/singularityfile-conda-file.txt | 1 - .../seqera/wave/util/DockerHelperTest.groovy | 28 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/wave-utils/src/main/resources/templates/conda/singularityfile-conda-file.txt b/wave-utils/src/main/resources/templates/conda/singularityfile-conda-file.txt index 17d395f..f6f467b 100644 --- a/wave-utils/src/main/resources/templates/conda/singularityfile-conda-file.txt +++ b/wave-utils/src/main/resources/templates/conda/singularityfile-conda-file.txt @@ -10,6 +10,5 @@ From: {{base_image}} cat environment.lock echo "<<<<<<< CONDA_LOCK_END" micromamba clean -a -y - %environment export PATH="$MAMBA_ROOT_PREFIX/bin:$PATH" diff --git a/wave-utils/src/test/groovy/io/seqera/wave/util/DockerHelperTest.groovy b/wave-utils/src/test/groovy/io/seqera/wave/util/DockerHelperTest.groovy index 935e245..fe6adc2 100644 --- a/wave-utils/src/test/groovy/io/seqera/wave/util/DockerHelperTest.groovy +++ b/wave-utils/src/test/groovy/io/seqera/wave/util/DockerHelperTest.groovy @@ -840,6 +840,10 @@ class DockerHelperTest extends Specification { %post micromamba install -y -n base -f /scratch/conda.yml micromamba install -y -n base foo::bar=1.0 + micromamba env export --name base --explicit > environment.lock + echo ">>>>>>> CONDA_LOCK_START" + cat environment.lock + echo "<<<<<<< CONDA_LOCK_END" micromamba clean -a -y %environment export PATH="$MAMBA_ROOT_PREFIX/bin:$PATH" @@ -857,6 +861,10 @@ class DockerHelperTest extends Specification { %post micromamba install -y -n base -f /scratch/conda.yml micromamba install -y -n base conda-forge::procps-ng + micromamba env export --name base --explicit > environment.lock + echo ">>>>>>> CONDA_LOCK_START" + cat environment.lock + echo "<<<<<<< CONDA_LOCK_END" micromamba clean -a -y %environment export PATH="$MAMBA_ROOT_PREFIX/bin:$PATH" @@ -875,6 +883,10 @@ class DockerHelperTest extends Specification { %post micromamba install -y -n base -c conda-forge -c defaults bwa=0.7.15 salmon=1.1.1 micromamba install -y -n base conda-forge::procps-ng + micromamba env export --name base --explicit > environment.lock + echo ">>>>>>> CONDA_LOCK_START" + cat environment.lock + echo "<<<<<<< CONDA_LOCK_END" micromamba clean -a -y %environment export PATH="$MAMBA_ROOT_PREFIX/bin:$PATH" @@ -894,6 +906,10 @@ class DockerHelperTest extends Specification { %post micromamba install -y -n base -c conda-forge -c defaults bwa=0.7.15 salmon=1.1.1 micromamba install -y -n base foo::one bar::two + micromamba env export --name base --explicit > environment.lock + echo ">>>>>>> CONDA_LOCK_START" + cat environment.lock + echo "<<<<<<< CONDA_LOCK_END" micromamba clean -a -y %environment export PATH="$MAMBA_ROOT_PREFIX/bin:$PATH" @@ -912,6 +928,10 @@ class DockerHelperTest extends Specification { %post micromamba install -y -n base -c foo -c bar bwa=0.7.15 salmon=1.1.1 micromamba install -y -n base conda-forge::procps-ng + micromamba env export --name base --explicit > environment.lock + echo ">>>>>>> CONDA_LOCK_START" + cat environment.lock + echo "<<<<<<< CONDA_LOCK_END" micromamba clean -a -y %environment export PATH="$MAMBA_ROOT_PREFIX/bin:$PATH" @@ -931,6 +951,10 @@ class DockerHelperTest extends Specification { %post micromamba install -y -n base -c conda-forge -c defaults bwa=0.7.15 salmon=1.1.1 micromamba install -y -n base conda-forge::procps-ng + micromamba env export --name base --explicit > environment.lock + echo ">>>>>>> CONDA_LOCK_START" + cat environment.lock + echo "<<<<<<< CONDA_LOCK_END" micromamba clean -a -y %environment export PATH="$MAMBA_ROOT_PREFIX/bin:$PATH" @@ -954,6 +978,10 @@ class DockerHelperTest extends Specification { %post micromamba install -y -n base -c conda-forge -c defaults -f https://foo.com/some/conda-lock.yml micromamba install -y -n base conda-forge::procps-ng + micromamba env export --name base --explicit > environment.lock + echo ">>>>>>> CONDA_LOCK_START" + cat environment.lock + echo "<<<<<<< CONDA_LOCK_END" micromamba clean -a -y %environment export PATH="$MAMBA_ROOT_PREFIX/bin:$PATH"