diff --git a/.github/workflows/build_vagrant.yml b/.github/workflows/build_vagrant.yml index 8b757077e2..8e3b12ceab 100644 --- a/.github/workflows/build_vagrant.yml +++ b/.github/workflows/build_vagrant.yml @@ -8,6 +8,11 @@ on: branches: - master +# Cancel existing runs if user makes another push. +concurrency: + group: "${{ github.ref }}" + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + permissions: contents: read @@ -51,6 +56,7 @@ jobs: rm -f id_rsa.pub id_rsa # Copy the machine's ssh key for the VMs to use, after removing prior files ssh-keygen -q -f $PWD/id_rsa -t rsa -N '' + vagrant plugin install vagrant-vbguest vagrant up vagrantPORT=$(vagrant port | grep host | awk '{ print $4 }') rm -f playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx @@ -63,4 +69,4 @@ jobs: - name: Run Ansible Playbook run: | cd ansible - ansible-playbook -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx -u vagrant -b --skip-tags adoptopenjdk,cups playbooks/AdoptOpenJDK_Unix_Playbook/main.yml + ansible-playbook -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx --ssh-common-args='-o StrictHostKeyChecking=no -o HostKeyAlgorithms=ssh-rsa' -u vagrant -b --skip-tags adoptopenjdk,cups playbooks/AdoptOpenJDK_Unix_Playbook/main.yml diff --git a/ansible/vagrant/Vagrantfile.Solaris10 b/ansible/vagrant/Vagrantfile.Solaris10 index bacd859546..94a929d7b3 100644 --- a/ansible/vagrant/Vagrantfile.Solaris10 +++ b/ansible/vagrant/Vagrantfile.Solaris10 @@ -2,7 +2,8 @@ # vi: set ft=ruby : $script = <