Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PSI/e2e infra updates #570

Merged
merged 5 commits into from
Jan 10, 2024
Merged

PSI/e2e infra updates #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50a4cfb
ansible: Support setting first machine in PSI deploy script
martinpitt Jan 9, 2024
556b236
ansible: Adjust deploy script to new parallel CLI
martinpitt Jan 9, 2024
2237708
ansible: Change PSI network to shared_net_2
martinpitt Jan 9, 2024
3be6fda
ansible: Run image cache playbook in PSI deploy script with more para…
martinpitt Jan 9, 2024
f6c73e3
ansible: Configure local image S3 store in e2e
martinpitt Jan 9, 2024
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
8 changes: 8 additions & 0 deletions ansible/e2e/setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@
- install-secrets-dir
- tasks-systemd

tasks:
- name: Create local image store config
copy:
dest: /var/cache/cockpit-tasks/image-stores
mode: 0644
content: |
https://{{ groups.e2e_s3[0]}}/images/

- name: Set up image server
hosts: e2e_s3
gather_facts: false
Expand Down
7 changes: 5 additions & 2 deletions ansible/psi/deploy-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ set -eu
# cd to ansible/
cd "$(dirname $(dirname $(realpath $0)))"

# first instance name; can be set by env
FIRST=${FIRST:-1}

# number of instances; limited by quota
NUM=35

seq $NUM | parallel --line-buffer -j4 ansible-playbook -i inventory/ -e instance_name='rhos-01-{}' psi/launch-tasks.yml
parallel -i -j4 ansible-playbook -i inventory/ -e instance_name='rhos-01-{}' psi/launch-tasks.yml -- $(seq $FIRST $NUM)

ansible-playbook -i inventory/ psi/image-cache.yml
ansible-playbook --forks 20 -i inventory/ psi/image-cache.yml
2 changes: 1 addition & 1 deletion ansible/psi/psi_defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ psi_image: "Fedora-Cloud-Base-39-latest"
psi_user: "fedora"
# 16 VCPUs, 32 GiB RAM, 160 GB disk
psi_flavor: "ci.standard.xxxl"
psi_network: "shared_net_7"
psi_network: "shared_net_2"