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.

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

Vagrant: Update Vagrant Host Playbook & Introduce 2 new Azure vagrant hosts for VPC / QEMU #3704

Merged
merged 19 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
2 changes: 2 additions & 0 deletions ansible/inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
ubuntu2204-x64-1: {ip: 172.187.163.163, user: adoptopenjdk, description: infra-wazuh-server}
ubuntu2204-x64-2: {ip: 20.90.182.165, description: trss.adoptium.net}
ubuntu2204-x64-3: {ip: 172.187.93.97, description: awx.adoptium.net}
ubuntu2204-vagrant-x64-1: {ip: 172.203.178.157, description: VPC-Qemu-1 }

Check failure on line 18 in ansible/inventory.yml

View workflow job for this annotation

GitHub Actions / Ansible Lint

yaml[braces]

Too many spaces inside braces

Check failure on line 18 in ansible/inventory.yml

View workflow job for this annotation

GitHub Actions / Yamllint

18:82 [braces] too many spaces inside braces
ubuntu2204-vagrant-x64-2: {ip: 48.217.96.46, description: VPC-Qemu-2 }

Check failure on line 19 in ansible/inventory.yml

View workflow job for this annotation

GitHub Actions / Ansible Lint

yaml[braces]

Too many spaces inside braces

Check failure on line 19 in ansible/inventory.yml

View workflow job for this annotation

GitHub Actions / Yamllint

19:79 [braces] too many spaces inside braces

- digitalocean:
ubuntu2004-x64-1: {ip: 178.62.115.224, description: bastillion.adoptopenjdk.net}
Expand Down
10 changes: 8 additions & 2 deletions ansible/pbTestScripts/vagrantPlaybookCheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,13 @@ startVMPlaybook()
sed -i -e "s/.*hosts:.*/ hosts: all/g" playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
awk '{print}/^\[defaults\]$/{print "private_key_file = id_rsa"; print "remote_tmp = $HOME/.ansible/tmp"; print "timeout = 60"}' < ansible.cfg > ansible.cfg.tmp && mv ansible.cfg.tmp ansible.cfg

ansible-playbook $verbosity -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx -u vagrant -b --skip-tags adoptopenjdk,jenkins${skipFullSetup} playbooks/AdoptOpenJDK_Unix_Playbook/main.yml 2>&1 | tee $WORKSPACE/adoptopenjdkPBTests/logFiles/$gitFork.$newGitBranch.$OS.log
if [ "$OS" == "Solaris10" ]; then
steelhead31 marked this conversation as resolved.
Show resolved Hide resolved
## Run The Playbook With ssh-rsa algorithms for Solaris 10 Only
ansible-playbook $verbosity -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx -u vagrant -b --ssh-extra-args='-o PubkeyAcceptedKeyTypes=ssh-rsa -o HostKeyAlgorithms=ssh-rsa' --skip-tags adoptopenjdk,jenkins${skipFullSetup} playbooks/AdoptOpenJDK_Unix_Playbook/main.yml 2>&1 | tee $WORKSPACE/adoptopenjdkPBTests/logFiles/$gitFork.$newGitBranch.$OS.log
else
ansible-playbook $verbosity -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx -u vagrant -b --skip-tags adoptopenjdk,jenkins${skipFullSetup} playbooks/AdoptOpenJDK_Unix_Playbook/main.yml 2>&1 | tee $WORKSPACE/adoptopenjdkPBTests/logFiles/$gitFork.$newGitBranch.$OS.log
steelhead31 marked this conversation as resolved.
Show resolved Hide resolved
fi

echo The playbook finished at : `date +%T`
if ! grep -q 'unreachable=0.*failed=0' $pbLogPath; then
echo PLAYBOOK FAILED
Expand All @@ -286,7 +292,7 @@ startVMPlaybook()
# Remove IP from known_hosts as the playbook installs an
# alternate sshd which regenerates the host key infra#2244
ssh-keygen -R $(cat playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx)
ssh_args="$ssh_args -o StrictHostKeyChecking=no"
ssh_args="$ssh_args -o StrictHostKeyChecking=no -o PubkeyAcceptedKeyTypes=ssh-rsa -o HostKeyAlgorithms=ssh-rsa"
fi

if [[ "$testNativeBuild" = true ]]; then
Expand Down
Loading
Loading