mirror of
https://github.com/github/codeql.git
synced 2026-04-24 16:25:15 +02:00
Merge pull request #19252 from github/oscarsj/nice-servers-for-java-tests
Run test servers with `sudo` when running on `macos-15`
This commit is contained in:
@@ -1,10 +1,16 @@
|
||||
import subprocess
|
||||
import os
|
||||
import runs_on
|
||||
|
||||
|
||||
def test(codeql, java, cwd):
|
||||
# This serves the "repo" directory on https://locahost:4443
|
||||
repo_server_process = subprocess.Popen(["python3", "../server.py"], cwd="repo")
|
||||
command = ["python3", "../server.py"]
|
||||
if runs_on.github_actions and runs_on.posix:
|
||||
# On GitHub Actions, we saw the server timing out while running in parallel with other tests
|
||||
# we work around that by running it with higher permissions
|
||||
command = ["sudo"] + command
|
||||
repo_server_process = subprocess.Popen(command, cwd="repo")
|
||||
certspath = cwd / "jdk8_shipped_cacerts_plus_cert_pem"
|
||||
# If we override MAVEN_OPTS, we'll break cross-test maven isolation, so we need to append to it instead
|
||||
maven_opts = os.environ["MAVEN_OPTS"] + f" -Djavax.net.ssl.trustStore={certspath}"
|
||||
|
||||
@@ -6,8 +6,9 @@ def test(codeql, java):
|
||||
# This serves the "repo" directory on http://localhost:9427
|
||||
command = ["python3", "-m", "http.server", "9427", "-b", "localhost"]
|
||||
if runs_on.github_actions and runs_on.posix:
|
||||
# On GitHub Actions, we try to run the server with higher priority
|
||||
command = ["sudo", "nice", "-n", "10"] + command
|
||||
# On GitHub Actions, we saw the server timing out while running in parallel with other tests
|
||||
# we work around that by running it with higher permissions
|
||||
command = ["sudo"] + command
|
||||
repo_server_process = subprocess.Popen(
|
||||
command, cwd="repo"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user