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

ci(freebsd): replace 13.0 with newly released 13.1 box #1836

Merged
merged 3 commits into from
Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/kitchen.vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
fail-fast: false
matrix:
instance:
- py3-git-master-freebsd-130
- py3-git-master-freebsd-131
- py3-git-master-freebsd-123
# - py3-git-master-openbsd-6
- latest-freebsd-130
- latest-freebsd-131
- latest-freebsd-123
- latest-openbsd-6
steps:
Expand Down
20 changes: 11 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ GEM
specs:
bcrypt_pbkdf (1.1.0)
builder (3.2.4)
chef-utils (17.9.52)
chef-utils (17.10.0)
concurrent-ruby
concurrent-ruby (1.1.9)
concurrent-ruby (1.1.10)
ed25519 (1.3.0)
erubi (1.10.0)
ffi (1.15.5)
gssapi (1.3.1)
ffi (>= 1.0.1)
gyoku (1.3.1)
gyoku (1.4.0)
builder (>= 2.1.2)
rexml (~> 3.0)
hashie (5.0.0)
httpclient (2.8.3)
kitchen-salt (0.7.2)
Expand All @@ -33,14 +34,14 @@ GEM
tty-box (~> 0.6)
tty-prompt (~> 0.20)
little-plugger (1.1.4)
logging (2.3.0)
logging (2.3.1)
little-plugger (~> 1.1)
multi_json (~> 1.14)
mixlib-install (3.12.16)
mixlib-install (3.12.19)
mixlib-shellout
mixlib-versioning
thor
mixlib-shellout (3.2.5)
mixlib-shellout (3.2.7)
chef-utils
mixlib-versioning (1.2.12)
multi_json (1.15.0)
Expand All @@ -52,6 +53,7 @@ GEM
nori (2.6.0)
pastel (0.8.0)
tty-color (~> 0.5)
rexml (3.2.5)
rubyntlm (0.6.3)
rubyzip (2.3.2)
strings (0.2.1)
Expand All @@ -74,7 +76,7 @@ GEM
winrm-elevated (~> 1.0)
winrm-fs (~> 1.1)
thor (1.2.1)
tomlrb (2.0.1)
tomlrb (2.0.3)
tty-box (0.7.0)
pastel (~> 0.8)
strings (~> 0.2.0)
Expand Down Expand Up @@ -112,7 +114,7 @@ GEM
wisper (2.0.1)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
kitchen-docker!
Expand All @@ -121,4 +123,4 @@ DEPENDENCIES
test-kitchen (>= 3.2.2)

BUNDLED WITH
2.1.2
2.2.26
4 changes: 2 additions & 2 deletions kitchen.vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ provisioner:
sudo: true

platforms:
- name: freebsd-130
- name: freebsd-131
driver:
box: bento/freebsd-13.0
box: bento/freebsd-13.1
- name: freebsd-123
driver:
box: bento/freebsd-12.3
Expand Down
12 changes: 6 additions & 6 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ suites:
- arch
- gentoo
- gentoo-systemd
- freebsd-130
- freebsd-131
- freebsd-123
- openbsd-6
- name: py3-stable-3003-0
Expand All @@ -141,14 +141,14 @@ suites:
- arch
- gentoo
- gentoo-systemd
- freebsd-130
- freebsd-131
- freebsd-123
- openbsd-6
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-130
- freebsd-131
- freebsd-123
- openbsd-6
- name: py3-stable-3003
Expand All @@ -159,7 +159,7 @@ suites:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-130
- freebsd-131
- freebsd-123
- openbsd-6
- name: py3-stable-3004-0
Expand All @@ -172,7 +172,7 @@ suites:
- arch
- gentoo
- gentoo-systemd
- freebsd-130
- freebsd-131
- freebsd-123
- openbsd-6
- name: py3-stable-3004
Expand All @@ -183,7 +183,7 @@ suites:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-130
- freebsd-131
- freebsd-123
- openbsd-6
- name: py3-git-master
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

@pytest.fixture(scope="session")
def host():
if os.environ.get("RUNNER_OS", "") == "macOS":
if os.environ.get("RUNNER_OS", "") == "macOS" and os.environ.get("KITCHEN_LOCAL_YAML", "") == "kitchen.macos.yml":
# Adjust the `PATH` so that the `salt-call` executable can be found
os.environ["PATH"] = "/opt/salt/bin{}{}".format(os.pathsep, os.environ["PATH"])
return testinfra.get_host("local://", sudo=True)
Expand Down