Skip to content

Commit ec557c8

Browse files
authored
Fix GHA Solaris Playbook Check (#3202)
1 parent 798987b commit ec557c8

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.github/workflows/build_vagrant.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ on:
88
branches:
99
- master
1010

11+
# Cancel existing runs if user makes another push.
12+
concurrency:
13+
group: "${{ github.ref }}"
14+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
15+
1116
permissions:
1217
contents: read
1318

@@ -51,6 +56,7 @@ jobs:
5156
rm -f id_rsa.pub id_rsa
5257
# Copy the machine's ssh key for the VMs to use, after removing prior files
5358
ssh-keygen -q -f $PWD/id_rsa -t rsa -N ''
59+
vagrant plugin install vagrant-vbguest
5460
vagrant up
5561
vagrantPORT=$(vagrant port | grep host | awk '{ print $4 }')
5662
rm -f playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx
@@ -63,4 +69,4 @@ jobs:
6369
- name: Run Ansible Playbook
6470
run: |
6571
cd ansible
66-
ansible-playbook -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx -u vagrant -b --skip-tags adoptopenjdk,cups playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
72+
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

ansible/vagrant/Vagrantfile.Solaris10

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# vi: set ft=ruby :
33

44
$script = <<SCRIPT
5-
sudo /opt/csw/bin/pkgutil -y -i python
5+
# Install Python 2.7
6+
sudo /opt/csw/bin/pkgutil -y -i python27
67
# Put the host machine's IP into the authorised_keys file on the VM
78
if [ -r /vagrant/id_rsa.pub ]; then
89
mkdir -p $HOME/.ssh && cat /vagrant/id_rsa.pub >> $HOME/.ssh/authorized_keys

0 commit comments

Comments
 (0)