Skip to content

beaker: Make vagrant installation optional #63

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

Merged
merged 1 commit into from
Aug 20, 2024
Merged

beaker: Make vagrant installation optional #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 1 deletion .github/workflows/beaker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ on:
default: docker
required: false
type: string
install_vagrant_dependencies:
description: When true and beaker_hypervisor==vagrant_libvirt, we will install vagrant + libvirt
default: true
required: false
type: boolean
beaker_facter:
description: Expand the Beaker matrix based on a fact
default: 'false'
Expand Down Expand Up @@ -163,7 +168,7 @@ jobs:
sudo apt-get update
sudo apt-get install -y ${{ inputs.additional_packages }}
- name: Setup libvirt for Vagrant
if: ${{ inputs.beaker_hypervisor == 'vagrant_libvirt' }}
if: ${{ inputs.beaker_hypervisor == 'vagrant_libvirt' && inputs.install_vagrant_dependencies == true }}
run: |
sudo add-apt-repository ppa:evgeni/vagrant
sudo apt-get update
Expand All @@ -176,6 +181,7 @@ jobs:
bundler-cache: true
cache-version: ${{ inputs.cache-version }}
working-directory: ${{ inputs.working-directory }}
self-hosted: ${{ inputs.acceptance_runs_on != 'ubuntu-24.04' }}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my other idea was to match on the name of self-hosted runner, instead of a negative match on the github runners. But we already have two different self-hosted runner groups and maybe more in the future, so the negative match is easier.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the auto-detection in https://github.com/ruby/setup-ruby/blob/a6e6f86333f0a2523ece813039b8b4be04560854/common.js#L165-L176 work for that already?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one would think! Basically: If the OS of the self-hosted runner doesn't look like the OS GitHub uses, auto-detection works. The CERN-provided runners are on EL9, so that works. Now this time I wanted to be smart and thought 'it is easier to configure the runner software if my OS is the same as GitHub uses', so our new runners are... Ubuntu 24.04. And that breaks auto-detection :sadface:

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦‍♀️

okay!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my problem with this is that if anyone decides to set acc_runs_on to anything but 24.04, it will trigger, even if it's not really a self-hosted runner.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self-hosted: ${{ inputs.acceptance_runs_on != 'ubuntu-24.04' }}
self-hosted: ${{ ! startsWith(inputs.acceptance_runs_on, 'ubuntu-') }}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will test it and provide a PR if it works

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works: #64

- name: Run tests
run: bundle exec rake beaker
env: ${{ matrix.env }}
Expand Down