aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Nanis2026-08-31 08:39:29 -0700
committerMax Nanis2026-08-31 08:39:29 -0700
commit10de61a8d3e2fcc687616ab8cc794bafe442cdf5 (patch)
treec9313c2d5b27ba92f65ad64cd898f5b0a011a0d9
parent0f3c5b3939bdfc21ac1e60938261a85bf4b4e6b9 (diff)
downloadgeneralresearch-10de61a8d3e2fcc687616ab8cc794bafe442cdf5.tar.gz
generalresearch-10de61a8d3e2fcc687616ab8cc794bafe442cdf5.zip
jenkins p10
-rw-r--r--Jenkinsfile1
-rw-r--r--test_utils/conftest.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 6bcc1f3..79d1f2c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -52,6 +52,7 @@ 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 fcff1b0..256166d 100644
--- a/test_utils/conftest.py
+++ b/test_utils/conftest.py
@@ -172,6 +172,7 @@ def git_key_path(
# We are using the tmp_path_factory because unlike the tmp_path (which
# is function scoped), this is session scoped.
+ print("GIT CREDS", settings.git_creds)
assert settings.git_creds, "Must define key to download alternative models"
fn = tmp_path_factory.mktemp("keys") / "git_creds"
fn.write_text(settings.git_creds, encoding="utf-8")
@@ -208,6 +209,7 @@ def gr_repo(
"-o StrictHostKeyChecking=no "
)
env = {"GIT_SSH_COMMAND": ssh_cmd}
+ print("SSH ENV", env)
if repo_path.exists():
subprocess.run(["git", "-C", str(repo_path), "pull"], check=True, env=env)