Use DefinedNets fancy new netbsd10 vagrant box for smokes (#1711)

This commit is contained in:
Nate Brown
2026-05-07 10:30:29 -05:00
committed by GitHub
parent 5f920fdd7d
commit 1ada3d4dd9
2 changed files with 33 additions and 17 deletions

View File

@@ -14,10 +14,18 @@ on:
- 'go.sum' - 'go.sum'
jobs: jobs:
smoke-extra: smoke-extra-libvirt:
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'smoke-test-extra') if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'smoke-test-extra')
name: Run extra smoke tests name: ${{ matrix.target }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
target:
- freebsd-amd64
- openbsd-amd64
- netbsd-amd64
- linux-amd64-ipv6disable
env: env:
VAGRANT_DEFAULT_PROVIDER: libvirt VAGRANT_DEFAULT_PROVIDER: libvirt
steps: steps:
@@ -40,28 +48,36 @@ jobs:
sudo chmod 666 /var/run/libvirt/libvirt-sock sudo chmod 666 /var/run/libvirt/libvirt-sock
vagrant plugin install vagrant-libvirt vagrant plugin install vagrant-libvirt
- name: freebsd-amd64 - name: ${{ matrix.target }}
run: make smoke-vagrant/freebsd-amd64 run: make smoke-vagrant/${{ matrix.target }}
- name: openbsd-amd64 timeout-minutes: 30
run: make smoke-vagrant/openbsd-amd64
- name: netbsd-amd64 # linux-386 needs VirtualBox, which conflicts with KVM/libvirt -- isolated job.
run: make smoke-vagrant/netbsd-amd64 smoke-extra-virtualbox:
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'smoke-test-extra')
name: linux-386
runs-on: ubuntu-latest
env:
VAGRANT_DEFAULT_PROVIDER: virtualbox
steps:
- name: linux-amd64-ipv6disable - uses: actions/checkout@v6
run: make smoke-vagrant/linux-amd64-ipv6disable
# linux-386 runs last because it requires disabling KVM to use VirtualBox, - uses: actions/setup-go@v6
# which prevents libvirt (used by the other tests) from working after this point. with:
- name: install virtualbox for i386 test go-version: '1.25'
check-latest: true
- name: add hashicorp source
run: wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg && echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
- name: install vagrant and virtualbox
run: | run: |
sudo apt-get install -y virtualbox sudo apt-get update && sudo apt-get install -y vagrant virtualbox
sudo rmmod kvm_amd kvm_intel kvm 2>/dev/null || true sudo rmmod kvm_amd kvm_intel kvm 2>/dev/null || true
- name: linux-386 - name: linux-386
env:
VAGRANT_DEFAULT_PROVIDER: virtualbox
run: make smoke-vagrant/linux-386 run: make smoke-vagrant/linux-386
timeout-minutes: 30 timeout-minutes: 30

View File

@@ -1,7 +1,7 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = "generic/netbsd9" config.vm.box = "DefinedNet/netbsd10"
config.vm.synced_folder "../build", "/nebula", type: "rsync" config.vm.synced_folder "../build", "/nebula", type: "rsync"
end end