diff options
| author | Max Nanis | 2026-08-31 08:58:05 -0700 |
|---|---|---|
| committer | Max Nanis | 2026-08-31 08:58:05 -0700 |
| commit | 2b938618f6668fb388813715954d6bd43e11ae0f (patch) | |
| tree | 7f215dde06d9dc617225686ae82685ff33720696 | |
| parent | 92d82a6e381541bc6cee34ffb89d213f0c5cde39 (diff) | |
| download | generalresearch-2b938618f6668fb388813715954d6bd43e11ae0f.tar.gz generalresearch-2b938618f6668fb388813715954d6bd43e11ae0f.zip | |
jenkins p12
| -rw-r--r-- | Jenkinsfile | 1 | ||||
| -rw-r--r-- | test_utils/conftest.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 793b810..942519e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,7 +52,6 @@ pipeline { variable: 'ENV_TEST_FILE')]) { sh 'cp $ENV_TEST_FILE .env.test' } - sh "chmod 600 .env.test" sh "/usr/local/bin/${PYTHON_VERSION} -m venv ${VENV}-${PYTHON_VERSION}" sh "${VENV}-${PYTHON_VERSION}/bin/pip install -U setuptools wheel pip" sh "${VENV}-${PYTHON_VERSION}/bin/pip install -r requirements.txt" diff --git a/test_utils/conftest.py b/test_utils/conftest.py index 256166d..0946209 100644 --- a/test_utils/conftest.py +++ b/test_utils/conftest.py @@ -204,11 +204,11 @@ def gr_repo( _ran[repo_url] = True ssh_cmd = ( - f"ssh -i {git_key_path} " + f'ssh -i "{git_key_path}" ' "-o IdentitiesOnly=yes " "-o StrictHostKeyChecking=no " ) - env = {"GIT_SSH_COMMAND": ssh_cmd} + env = {**os.environ, "GIT_SSH_COMMAND": ssh_cmd} print("SSH ENV", env) if repo_path.exists(): |