specify libnetcdf=*=mpi_mpich_* for test runs with libnetcdf mpich

CDAT · May 7, 2020 · 77c0b23 · 77c0b23
1 parent 626d0a1
commit 77c0b23
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -38,10 +38,6 @@ aliases:
     command: |
        source $WORKDIR/miniconda/etc/profile.d/conda.sh
        conda activate base
-       if [[ $LIBNETCDF == "libnetcdf=*=mpich_*" ]]; then
-          echo "conda config --set channel_priority false"
-          conda config --set channel_priority false
-       fi
        #conda create -y -n test_cdms --use-local $CHANNELS "$CONDA_PY_VER" $PKG_NAME $PKGS $COVERAGE_PKGS
        echo "conda create -y -n test_cdms --use-local $CHANNELS \"$CONDA_PY_VER\" $PKG_NAME $PKGS $COVERAGE_PKGS \"$LIBNETCDF\""
        conda create -y -n test_cdms --use-local $CHANNELS "$CONDA_PY_VER" $PKG_NAME $PKGS $COVERAGE_PKGS "$LIBNETCDF"
@@ -289,7 +285,7 @@ jobs:
          ENV_NAME: "test_cdms"
          CONDA_PY_VER: "python>=3.6,<3.7"
          BUILD_VARIANT_VER: "3.6"
-         LIBNETCDF: "libnetcdf=*=mpich_*"
+         LIBNETCDF: "libnetcdf=*=mpi_mpich_*"
       steps:
          - checkout
          - attach_workspace:
@@ -315,7 +311,7 @@ jobs:
          ENV_NAME: "test_cdms"
          CONDA_PY_VER: "python>=3.7,<3.8"
          BUILD_VARIANT_VER: "3.7"
-         LIBNETCDF: "libnetcdf=*=mpich_*"
+         LIBNETCDF: "libnetcdf=*=mpi_mpich_*"
       steps:
          - checkout
          - attach_workspace:
@@ -341,7 +337,7 @@ jobs:
          ENV_NAME: "test_cdms"
          CONDA_PY_VER: "python>=3.8,<3.9"
          BUILD_VARIANT_VER: "3.8"
-         LIBNETCDF: "libnetcdf=*=mpich_*"
+         LIBNETCDF: "libnetcdf=*=mpi_mpich_*"
       steps:
          - checkout
          - attach_workspace:
@@ -367,7 +363,7 @@ jobs:
          ENV_NAME: "test_cdms"
          CONDA_PY_VER: "python>=3.6,<3.7"
          BUILD_VARIANT_VER: "3.6"
-         LIBNETCDF: "libnetcdf=*=mpich_*"
+         LIBNETCDF: "libnetcdf=*=mpi_mpich_*"
       steps:
          - checkout
          - attach_workspace:
@@ -395,7 +391,7 @@ jobs:
          BUILD_VARIANT_VER: "3.7"
          COVERAGE: "-c /home/circleci/project/tests/coverage.json"
          COVERAGE_PKGS: "coverage coveralls"
-         LIBNETCDF: "libnetcdf=*=mpich_*"
+         LIBNETCDF: "libnetcdf=*=mpi_mpich_*"
       steps:
          - checkout
          - attach_workspace:
@@ -422,7 +418,7 @@ jobs:
          ENV_NAME: "test_cdms"
          CONDA_PY_VER: "python>=3.8,<3.9"
          BUILD_VARIANT_VER: "3.8"
-         LIBNETCDF: "libnetcdf=*=mpich_*"
+         LIBNETCDF: "libnetcdf=*=mpi_mpich_*"
       steps:
          - checkout
          - attach_workspace: