Skip to content

Fix broken slowtest on FreeBSD #58180

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

Closed
krionbsd wants to merge 2 commits into from
Closed

Fix broken slowtest on FreeBSD #58180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bff7ffc
add freebsd pipelines
Jun 8, 2020
1085c51
Fix broken slowtest on FreeBSD
krionbsd Aug 12, 2020
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
17 changes: 17 additions & 0 deletions cicd/jenkins/kitchen-freebsd121-py3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@Library('salt@master-1.7') _

runTestSuite(
ami_image_id: 'ami-097c7303c2c839327',
concurrent_builds: 1,
distro_name: 'freebsd',
distro_version: '121',
env: env,
golden_images_branch: 'master',
jenkins_slave_label: 'kitchen-slave',
nox_env_name: 'runtests-zeromq',
nox_passthrough_opts: '--ssh-tests',
python_version: 'py3',
testrun_timeout: 6,
use_spot_instances: true)

// vim: ft=groovy
20 changes: 20 additions & 0 deletions cicd/jenkins/kitchen-freebsd121-py3-pytest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
@Library('salt@master-1.7') _

runTestSuite(
ami_image_id: 'ami-097c7303c2c839327',
concurrent_builds: 2,
distro_name: 'freebsd',
distro_version: '121',
env: env,
golden_images_branch: 'master',
jenkins_slave_label: 'kitchen-slave',
nox_env_name: 'pytest-zeromq',
nox_passthrough_opts: '--ssh-tests',
python_version: 'py3',
//splits: ['unit', 'integration', 'multimaster'],
testrun_timeout: 6,
use_spot_instances: true,
//fast_slow_staged_testrun: true
)

// vim: ft=groovy
2 changes: 1 addition & 1 deletion tests/integration/files/file/base/issue-30161.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% if grains['os'] == 'Windows' %}
{% set test_false = 'cmd.exe /c exit 1' %}
{% set test_true = 'cmd.exe /c exit 0' %}
{% elif grains['os'] == 'MacOS' %}
{% elif grains['os'] == 'MacOS' or grains['os'] == 'FreeBSD' %}
{% set test_false = '/usr/bin/false' %}
{% set test_true = '/usr/bin/true' %}
{% else %}
Expand Down