Merge pull request #699 from hubmapconsortium/sunset666/switch_to_con…

…da_env Switch to Conda for all instances
hubmapconsortium · Jan 4, 2023 · 0ca2004 · 0ca2004
2 parents b048365 + 2b32531
commit 0ca2004
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/src/ingest-pipeline/misc/tools/airflow_environments/env_centos_7_dev.sh b/src/ingest-pipeline/misc/tools/airflow_environments/env_centos_7_dev.sh
@@ -2,11 +2,11 @@
 
 # HM_AF_METHOD must be one of venv, module_conda, or conda
 # HM_AF_ENV_NAME must be the name of the conda environment or the full path to the venv dir
-#HM_AF_METHOD='module_conda'
-#HM_AF_METHOD='conda'
-#HM_AF_ENV_NAME='condaEnv_centos_7_python_3.6_dev'
-HM_AF_METHOD='venv'
-HM_AF_ENV_NAME='/hive/users/hive/hubmap/hivevm191-dev/venv'
+# HM_AF_METHOD='module_conda'
+HM_AF_METHOD='conda'
+HM_AF_ENV_NAME='condaEnv_centos_7_python_3.6_dev'
+# HM_AF_METHOD='venv'
+# HM_AF_ENV_NAME='/hive/users/hive/hubmap/hivevm191-dev/venv'
 
 PARENTDIR="$(dirname "$(readlink -f "$0")")"
 . "${PARENTDIR}/airflow_environments/env_dev.sh"

diff --git a/src/ingest-pipeline/misc/tools/airflow_environments/env_centos_7_prod.sh b/src/ingest-pipeline/misc/tools/airflow_environments/env_centos_7_prod.sh
@@ -2,8 +2,10 @@
 
 # HM_AF_METHOD must be one of venv, module_conda, or conda
 # HM_AF_ENV_NAME must be the name of the conda environment or the full path to the venv dir
-HM_AF_METHOD='venv'
-HM_AF_ENV_NAME='/hive/users/hive/hubmap/hivevm193-prod/venv'
+HM_AF_METHOD='conda'
+HM_AF_ENV_NAME='condaEnv_centos_7_python_3.6_prod'
+# HM_AF_METHOD='venv'
+# HM_AF_ENV_NAME='/hive/users/hive/hubmap/hivevm193-prod/venv'
 
 PARENTDIR="$(dirname "$(readlink -f "$0")")"
 . "${PARENTDIR}/airflow_environments/env_prod.sh"

diff --git a/src/ingest-pipeline/misc/tools/airflow_environments/env_centos_7_test.sh b/src/ingest-pipeline/misc/tools/airflow_environments/env_centos_7_test.sh
@@ -2,8 +2,10 @@
 
 # HM_AF_METHOD must be one of venv, module_conda, or conda
 # HM_AF_ENV_NAME must be the name of the conda environment or the full path to the venv dir
-HM_AF_METHOD='venv'
-HM_AF_ENV_NAME='/hive/users/hive/hubmap/hivevm192-test/venv'
+HM_AF_METHOD='conda'
+HM_AF_ENV_NAME='condaEnv_centos_7_python_3.6_test'
+# HM_AF_METHOD='venv'
+# HM_AF_ENV_NAME='/hive/users/hive/hubmap/hivevm192-test/venv'
 
 PARENTDIR="$(dirname "$(readlink -f "$0")")"
 . "${PARENTDIR}/airflow_environments/env_test.sh"

diff --git a/src/ingest-pipeline/submodules/ingest-validation-tools b/src/ingest-pipeline/submodules/ingest-validation-tools