From ddeebd50f0907a1e629278c680cb7bcdfea2dfde Mon Sep 17 00:00:00 2001 From: David Betancur Date: Tue, 3 Jan 2023 14:28:11 -0500 Subject: [PATCH 1/2] Activating conda environment for currently deployed instances --- .../tools/airflow_environments/env_centos_7_dev.sh | 10 +++++----- .../tools/airflow_environments/env_centos_7_prod.sh | 6 ++++-- .../tools/airflow_environments/env_centos_7_test.sh | 6 ++++-- 3 files changed, 13 insertions(+), 9 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 index 15c101cd..999c3dcd 100644 --- 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 index 65b3d287..b92d2e94 100644 --- 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 index c5e2c86f..2c637e5c 100644 --- 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" From 2b3253181591fbf3be9fcb9624d51612ad593f34 Mon Sep 17 00:00:00 2001 From: David Betancur Date: Wed, 4 Jan 2023 10:33:44 -0500 Subject: [PATCH 2/2] Bump validation tools --- src/ingest-pipeline/submodules/ingest-validation-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ingest-pipeline/submodules/ingest-validation-tools b/src/ingest-pipeline/submodules/ingest-validation-tools index 794967cc..2c3c57ce 160000 --- a/src/ingest-pipeline/submodules/ingest-validation-tools +++ b/src/ingest-pipeline/submodules/ingest-validation-tools @@ -1 +1 @@ -Subproject commit 794967cc503dd07b649fe4608e687a7fc4550cb8 +Subproject commit 2c3c57ce8699b8807cd37ee67a536298d097022f