Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ci/python-bench.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,16 @@
local environment(os, arch) = self.environment(os, arch) + {
BENCH_RESULTS_FILE_PATH: "bench-results.json",
PANDAS_REPO_URL: $.overlay_imports.PANDAS_REPO_GIT,
} + if $.overlay_imports.PIP_EXTRA_INDEX_URL != "" then {
PIP_EXTRA_INDEX_URL: $.overlay_imports.PIP_EXTRA_INDEX_URL,
},
} else {},

local pip_index_setup = [
// Use the CI Python's configured base index and overlay-provided GraalPy wheel index.
["set-export", "PIP_INDEX_URL", ["python", "-m", "pip", "config", "get", "global.index-url"]],
] + if $.overlay_imports.PIP_EXTRA_INDEX_URL != "" then [
["set-export", "PIP_EXTRA_INDEX_URL", $.overlay_imports.PIP_EXTRA_INDEX_URL],
] else [],

local packages(os, arch) = self.packages(os, arch) + {
make: ">=3.83",
Expand Down Expand Up @@ -193,7 +201,7 @@
"--pythonjavadriver-vm-config"
else
super.vm_config_name,
setup+: [
setup+: pip_index_setup + [
// NOTE: logic shared with ci/python-gate.libsonnet, keep in sync
// ensure we get graal-enterprise as a hostvm
["git", "clone", $.overlay_imports.GRAAL_ENTERPRISE_GIT, "${BUILD_DIR}/graal-enterprise"],
Expand Down
9 changes: 8 additions & 1 deletion ci/python-gate.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,13 @@
buildslave_ol8: ENVIRONMENT_DIFF_OL8,
},

local pip_index_setup = [
// Use the CI Python's configured base index and overlay-provided GraalPy wheel index.
["set-export", "PIP_INDEX_URL", ["python", "-m", "pip", "config", "get", "global.index-url"]],
] + if $.overlay_imports.PIP_EXTRA_INDEX_URL != "" then [
["set-export", "PIP_EXTRA_INDEX_URL", $.overlay_imports.PIP_EXTRA_INDEX_URL],
] else [],

//------------------------------------------------------------------------------------------------------------------
// packages
//------------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -461,7 +468,7 @@
guard+: {
excludes+: ["**.md", "docs/**", "3rd_party_licenses.txt", "scripts/**"],
},
setup+: [
setup+: pip_index_setup + [
// force imports the main repository to get the right graal commit
["mx"] + self.mx_parameters + ["sforceimports"],
// logging
Expand Down
13 changes: 9 additions & 4 deletions graalpython/com.oracle.graal.python.test/src/tox/leftpad/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ commands =

[testenv:graalpy]
basepython=graalpy
setenv=
PIP_INDEX_URL=https://ol-graal.oraclecorp.com/nexus-cache/repository/pypi-proxy/simple/
PIP_TRUSTED_HOST=ol-graal.oraclecorp.com
passenv = GRAALPY_LEFTPAD_FAIL,GRAAL_PYTHON_ARGS,GRAAL_PYTHON_VM_ARGS
passenv =
GRAALPY_LEFTPAD_FAIL
GRAAL_PYTHON_ARGS
GRAAL_PYTHON_VM_ARGS
PIP_EXTRA_INDEX_URL
PIP_INDEX_URL
PIP_RETRIES
PIP_TIMEOUT
PIP_TRUSTED_HOST
Loading