Skip to content

Commit 36a655e

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/disk-cache
2 parents b20e193 + fd1d335 commit 36a655e

File tree

7 files changed

+210
-156
lines changed

7 files changed

+210
-156
lines changed

.github/workflows/pull-request.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
if: always()
120120

121121
- name: Upload artifacts
122-
uses: actions/upload-artifact@v3
122+
uses: actions/upload-artifact@v4
123123
with:
124124
name: compliance-test
125125
path: artifacts
@@ -148,8 +148,7 @@ jobs:
148148
run: ansible-galaxy collection install -r deployment/requirements.yml
149149

150150
- name: Run Ansible playbook
151-
# GitHub runner already has Docker installed.
152-
run: ansible-playbook -i deployment/inventory deployment/site.yml --skip-tags docker
151+
run: ansible-playbook -i deployment/inventory deployment/site.yml
153152

154153
- name: Install Python client dependencies
155154
run: pip install -r scripts/requirements.txt

deployment/group_vars/reductionist renamed to deployment/group_vars/all

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ reductionist_image: "ghcr.io/stackhpc/reductionist-rs"
1313
reductionist_tag: "latest"
1414
# List of container networks.
1515
reductionist_networks:
16-
- name: host
16+
- host
1717
# Container environment.
1818
reductionist_env:
1919
OTEL_EXPORTER_JAEGER_AGENT_HOST: "{{ hostvars[(groups['jaeger'] | default([]) + [inventory_hostname])[0]].ansible_facts.default_ipv4.address }}"
2020
REDUCTIONIST_ENABLE_JAEGER: "{{ (groups['jaeger'] | default([]) | length > 0) | string | lower }}"
2121
REDUCTIONIST_HTTPS: "true"
2222
REDUCTIONIST_PORT: "8081"
2323
# Path to certificates directory on remote host.
24-
reductionist_remote_certs_path: "{{ ansible_facts.env.HOME }}/.config/reductionist/certs"
24+
reductionist_remote_certs_path: "{{ ansible_facts.env.HOME }}/certs"
2525
# Path to certificates directory in container.
2626
reductionist_container_certs_path: "/root/.config/reductionist/certs"
2727
# List of container volume mounts.

deployment/group_vars/haproxy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# Global max connections.
3-
haproxy_max_connections: 40000
3+
haproxy_max_connections: 20000
44
# Number of threads.
55
haproxy_threads: 1
66
# Default max connections.

deployment/inventory

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ localhost ansible_connection=local
3535
reductionist
3636

3737
# Do not edit.
38-
[docker:children]
38+
[podman:children]
3939
haproxy
4040
jaeger
4141
minio

deployment/requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
---
22
collections:
3-
- community.docker
3+
- containers.podman

0 commit comments

Comments
 (0)