From bb14394d5c800a6bfa030b7831b3c4b45768ff82 Mon Sep 17 00:00:00 2001 From: Yaroslav Bulatov Date: Mon, 29 Jul 2019 11:40:04 -0700 Subject: [PATCH] Address #85 --- ncluster/__init__.py | 2 +- ncluster/util.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ncluster/__init__.py b/ncluster/__init__.py index 89e832b..6a4e6f0 100644 --- a/ncluster/__init__.py +++ b/ncluster/__init__.py @@ -25,6 +25,6 @@ print(f"ncluster version {__version__}") -if not util.is_set('NCLUSTER_DISABLE_PDB_HANDLER'): +if not util.is_set('NCLUSTER_DISABLE_PDB_HANDLER') and not util.is_set('NCLUSTER_RUNNING_UNDER_CIRCLECI'): util.install_pdb_handler() # CTRL+\ drops into pdb diff --git a/ncluster/util.py b/ncluster/util.py index fd6a030..96ee840 100644 --- a/ncluster/util.py +++ b/ncluster/util.py @@ -26,6 +26,7 @@ 'NCLUSTER_AWS_FAST_ROOTDISK', # request $1/hour high performance AWS disk 'NCLUSTER_AWS_PLACEMENT_GROUP', # name of placement group to use, use when adding machines to a previous launched job 'NCLUSTER_DISABLE_PDB_HANDLER', # don't intercept pdb exception by default + 'NCLUSTER_RUNNING_UNDER_CIRCLECI', # special settings for non-interactive CircleCI integration test env # 'NCLUSTER_IMAGE', 'NCLUSTER_SSH_USERNAME', # used as workaround when Amazon Linux detection fails 'NCLUSTER_ZONE', # zone spec for when automatic zone fails (p3dn's + spot instances) @@ -296,7 +297,11 @@ def setup_local_ssh_keys() -> str: assert os.path.exists(ID_RSA), f"Public key {ID_RSA_PUB} exists but private key {ID_RSA} not found, delete {ID_RSA_PUB} and run again to regenerate pair" log(f"Found local keypair {ID_RSA}") elif os.path.exists(ID_RSA): - assert os.path.exists(ID_RSA_PUB), f"Private key {ID_RSA} exists but public key {ID_RSA_PUB} not found, delete {ID_RSA} and run again to regenerate pair" + if not os.path.exists(ID_RSA_PUB): + if is_set('NCLUSTER_RUNNING_UNDER_CIRCLECI'): + pass + else: + assert os.path.exists(ID_RSA_PUB), f"Private key {ID_RSA} exists but public key {ID_RSA_PUB} not found, delete {ID_RSA} and run again to regenerate pair" log(f"Found local keypair {ID_RSA}") else: log(f"Generating keypair {ID_RSA}")