Skip to content
Merged
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
15 changes: 4 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -583,11 +583,7 @@ jobs:
permissions:
id-token: write
contents: read
# Pinned: ubuntu-latest rolled to Ubuntu 26.04 on 2026-11-04, where this job's
# nginx apt-key import fails before any test runs (gpg 2.4.8 aborts with
# "/home/runner/.gnupg: directory does not exist"). Re-validate on 26.04
# before unpinning.
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
strategy:
matrix:
registry:
Expand Down Expand Up @@ -886,6 +882,7 @@ jobs:
sudo apt-get install --yes --no-install-recommends postgresql-client
if [ "${{ matrix.registry }}" = "test/registry" ]; then
sudo apt-get install -y curl gnupg2 ca-certificates lsb-release ubuntu-keyring
install -d -m 700 "$HOME/.gnupg"
curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \
| sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
gpg --dry-run --quiet --no-keyring --import --import-options import-show /usr/share/keyrings/nginx-archive-keyring.gpg
Expand Down Expand Up @@ -1874,10 +1871,7 @@ jobs:
name: ${{ matrix.job_name }}
needs:
- dockerbuild
# Pinned: ubuntu-latest rolled to Ubuntu 26.04 on 2026-11-04; its newer Docker
# Compose writes container progress lines into the output the robot tests
# capture, failing 33 exact-output assertions. Re-validate on 26.04 before unpinning.
runs-on: ${{ matrix.platform == 'linux/arm64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
runs-on: ${{ matrix.platform == 'linux/arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
timeout-minutes: ${{ vars.DEFAULT_JOB_TIMEOUT_MIN == '' && 120 || vars.DEFAULT_JOB_TIMEOUT_MIN }}
strategy:
fail-fast: false
Expand Down Expand Up @@ -2196,8 +2190,7 @@ jobs:
name: Docker Test Shard Verification
needs:
- dockertest
# Pinned with dockertest (see the note there).
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
timeout-minutes: ${{ vars.DEFAULT_SHORT_JOB_TIMEOUT_MIN == '' && 15 || vars.DEFAULT_SHORT_JOB_TIMEOUT_MIN }}
steps:

Expand Down
4 changes: 4 additions & 0 deletions test/python/stackql_test_tooling/StackQLInterfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,8 @@ def _run_stackql_exec_command_docker(
docker_args = (
"docker",
"compose",
"--progress",
"quiet",
"-p",
"execrun",
"run",
Expand Down Expand Up @@ -471,6 +473,8 @@ def _run_stackql_shell_command_docker(
start_cmd = [
"docker",
"compose",
"--progress",
"quiet",
"-p",
"stackqlshell",
"run",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ def verify_caller_access(self, executable, backend="{}", execution_platform="nat
import psycopg
dsn = cfg["dsn"]
if docker:
subprocess.run(["docker", "compose", "-p", "execrun", "up", "-d", "postgres_stackql"], capture_output=True, check=True, timeout=120)
result = subprocess.run(["docker", "compose", "-p", "execrun", "port", "postgres_stackql", "5432"], capture_output=True, text=True, check=True, timeout=30)
subprocess.run(["docker", "compose", "--progress", "quiet", "-p", "execrun", "up", "-d", "postgres_stackql"], capture_output=True, check=True, timeout=120)
result = subprocess.run(["docker", "compose", "--progress", "quiet", "-p", "execrun", "port", "postgres_stackql", "5432"], capture_output=True, text=True, check=True, timeout=30)
published = result.stdout.strip().splitlines()[0].rsplit(":", 1)[1]
url = urlsplit(dsn)
credentials = url.netloc.rsplit("@", 1)[0]
Expand Down Expand Up @@ -254,7 +254,7 @@ def token(subject="reader", updates=None, remove=(), signer=None, kid="local"):
signature = (signer or key).sign(message)
return (message + b"." + base64.urlsafe_b64encode(signature).rstrip(b"=")).decode()

prefix = (["docker", "compose", "-p", "execrun", "run", "--rm", "--no-deps", "-T", "--user", f"{os.getuid()}:{os.getgid()}", "--workdir", str(root), "-v", str(root) + ":" + str(root), "-e", "STACKQL_CALLER_TOKEN", "--entrypoint", "stackql", "stackqlsrv"]
prefix = (["docker", "compose", "--progress", "quiet", "-p", "execrun", "run", "--rm", "--no-deps", "-T", "--user", f"{os.getuid()}:{os.getgid()}", "--workdir", str(root), "-v", str(root) + ":" + str(root), "-e", "STACKQL_CALLER_TOKEN", "--entrypoint", "stackql", "stackqlsrv"]
if docker else [shutil.which(executable) or str(pathlib.Path(executable).resolve())])
base = prefix + ["--approot", str(root), "--sqlBackend", json.dumps(cfg), "--registry", json.dumps({"localDocRoot": str(root), "verifyConfig": {"nopVerify": True}}), "--preview", '{"unstable":true}', "--output", "json"]

Expand Down
4 changes: 2 additions & 2 deletions test/python/stackql_test_tooling/web_service_keywords.py
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ def reset_changing_firewalls(self, execution_platform: str, port: int = 1080) ->
# host aliases are not addresses the Robot runner can necessarily resolve.
command = [sys.executable]
if execution_platform == 'docker':
command = ['docker', 'compose', '-f', 'docker-compose-testing.yml',
command = ['docker', 'compose', '--progress', 'quiet', '-f', 'docker-compose-testing.yml',
'exec', '-T', 'google_mockserver', 'python']
program = (
"import ssl; from urllib.request import Request, urlopen; "
Expand All @@ -458,7 +458,7 @@ def start_all_webservers(self, port_dict: Optional[dict] = None) -> None:
# if system has docker installed and also has docker compose file, use that to run mock servers
if os.system('which docker >/dev/null 2>&1') == 0 and os.path.exists('docker-compose-testing.yml'):
## inherits env vars from parent process so IS_DOCKER env var is passed along
cmd = 'docker compose -f docker-compose-testing.yml up -d --build --force-recreate'
cmd = 'docker compose --progress quiet -f docker-compose-testing.yml up -d --build --force-recreate'
rv = os.system(cmd)
if rv != 0: # debug failures
os.system('docker compose -f docker-compose-testing.yml ps || true')
Expand Down
2 changes: 1 addition & 1 deletion test/robot/functional/ProviderSessionLibrary.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def do_GET(self):
dsn = self.backend["dsn"]
if execution_platform == "docker":
subprocess.run(["docker", "--log-level", "error", "compose", "--progress", "quiet", "-p", "execrun", "up", "-d", "postgres_stackql"], capture_output=True, check=True, timeout=120)
published = subprocess.check_output(["docker", "compose", "-p", "execrun", "port", "postgres_stackql", "5432"], text=True).strip().splitlines()[0].rsplit(":", 1)[1]
published = subprocess.check_output(["docker", "--log-level", "error", "compose", "--progress", "quiet", "-p", "execrun", "port", "postgres_stackql", "5432"], text=True).strip().splitlines()[0].rsplit(":", 1)[1]
url = urlsplit(dsn)
dsn = urlunsplit((url.scheme, url.netloc.rsplit("@", 1)[0] + "@127.0.0.1:" + published, url.path, url.query, url.fragment))
for attempt in range(100):
Expand Down
Loading