Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
salt-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
salt-formula
Commits
86b0fa1d
Unverified
Commit
86b0fa1d
authored
3 years ago
by
Imran Iqbal
Browse files
Options
Downloads
Patches
Plain Diff
ci(kitchen+ci): update with latest `3003.2` pre-salted images [skip ci]
* Automated using
https://github.com/myii/ssf-formula/pull/360
parent
42d64870
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+19
-15
19 additions, 15 deletions
.gitlab-ci.yml
.travis.yml
+19
-15
19 additions, 15 deletions
.travis.yml
kitchen.yml
+65
-46
65 additions, 46 deletions
kitchen.yml
with
103 additions
and
76 deletions
.gitlab-ci.yml
+
19
−
15
View file @
86b0fa1d
...
...
@@ -130,21 +130,25 @@ rubocop:
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
v3003-py3-debian-11-3003-1-py3
:
{
extends
:
'
.test_instance_failure_permitted'
}
# v3003-py3-debian-10-3003-1-py3: {extends: '.test_instance'}
# v3003-py3-debian-9-3003-1-py3: {extends: '.test_instance'}
v3003-py3-ubuntu-2004-3003-1-py3
:
{
extends
:
'
.test_instance'
}
# v3003-py3-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
v3003-py3-centos-8-3003-1-py3
:
{
extends
:
'
.test_instance'
}
# v3003-py3-centos-7-3003-1-py3: {extends: '.test_instance'}
v3003-py3-fedora-34-3003-1-py3
:
{
extends
:
'
.test_instance'
}
v3003-py3-fedora-33-3003-1-py3
:
{
extends
:
'
.test_instance'
}
# v3003-py3-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
v3003-py3-amazonlinux-2-3003-1-py3
:
{
extends
:
'
.test_instance'
}
v3003-py3-oraclelinux-8-3003-1-py3
:
{
extends
:
'
.test_instance'
}
# v3003-py3-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
v3003-py3-debian-11-3003-2-py3
:
{
extends
:
'
.test_instance_failure_permitted'
}
# v3003-py3-debian-10-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-debian-9-3003-2-py3: {extends: '.test_instance'}
v3003-py3-ubuntu-2004-3003-2-py3
:
{
extends
:
'
.test_instance'
}
# v3003-py3-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
v3003-py3-centos-8-3003-2-py3
:
{
extends
:
'
.test_instance'
}
# v3003-py3-centos-7-3003-2-py3: {extends: '.test_instance'}
v3003-py3-fedora-34-3003-2-py3
:
{
extends
:
'
.test_instance'
}
v3003-py3-fedora-33-3003-2-py3
:
{
extends
:
'
.test_instance'
}
# v3003-py3-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
v3003-py3-amazonlinux-2-3003-2-py3
:
{
extends
:
'
.test_instance'
}
v3003-py3-oraclelinux-8-3003-2-py3
:
{
extends
:
'
.test_instance'
}
# v3003-py3-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
v3003-py3-almalinux-8-3003-2-py3
:
{
extends
:
'
.test_instance'
}
v3003-py3-arch-base-latest-3003-1-py3
:
{
extends
:
'
.test_instance'
}
v3003-py3-gentoo-stage3-latest-3003-1-py3
:
{
extends
:
'
.test_instance'
}
v3003-py3-gentoo-stage3-systemd-3003-1-py3
:
{
extends
:
'
.test_instance'
}
...
...
This diff is collapsed.
Click to expand it.
.travis.yml
+
19
−
15
View file @
86b0fa1d
...
...
@@ -83,21 +83,25 @@ jobs:
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
-
env
:
INSTANCE=v3003-py3-debian-11-3003-1-py3
# - env: INSTANCE=v3003-py3-debian-10-3003-1-py3
# - env: INSTANCE=v3003-py3-debian-9-3003-1-py3
-
env
:
INSTANCE=v3003-py3-ubuntu-2004-3003-1-py3
# - env: INSTANCE=v3003-py3-ubuntu-1804-3003-1-py3
-
env
:
INSTANCE=v3003-py3-centos-8-3003-1-py3
# - env: INSTANCE=v3003-py3-centos-7-3003-1-py3
-
env
:
INSTANCE=v3003-py3-fedora-34-3003-1-py3
-
env
:
INSTANCE=v3003-py3-fedora-33-3003-1-py3
# - env: INSTANCE=v3003-py3-opensuse-leap-153-3003-1-py3
# - env: INSTANCE=v3003-py3-opensuse-leap-152-3003-1-py3
# - env: INSTANCE=v3003-py3-opensuse-tmbl-latest-3003-1-py3
-
env
:
INSTANCE=v3003-py3-amazonlinux-2-3003-1-py3
-
env
:
INSTANCE=v3003-py3-oraclelinux-8-3003-1-py3
# - env: INSTANCE=v3003-py3-oraclelinux-7-3003-1-py3
-
env
:
INSTANCE=v3003-py3-debian-11-3003-2-py3
# - env: INSTANCE=v3003-py3-debian-10-3003-2-py3
# - env: INSTANCE=v3003-py3-debian-9-3003-2-py3
-
env
:
INSTANCE=v3003-py3-ubuntu-2004-3003-2-py3
# - env: INSTANCE=v3003-py3-ubuntu-1804-3003-2-py3
-
env
:
INSTANCE=v3003-py3-centos-8-3003-2-py3
# - env: INSTANCE=v3003-py3-centos-7-3003-2-py3
-
env
:
INSTANCE=v3003-py3-fedora-34-3003-2-py3
-
env
:
INSTANCE=v3003-py3-fedora-33-3003-2-py3
# - env: INSTANCE=v3003-py3-opensuse-leap-153-3003-2-py3
# - env: INSTANCE=v3003-py3-opensuse-leap-152-3003-2-py3
# - env: INSTANCE=v3003-py3-opensuse-tmbl-latest-3003-2-py3
-
env
:
INSTANCE=v3003-py3-amazonlinux-2-3003-2-py3
-
env
:
INSTANCE=v3003-py3-oraclelinux-8-3003-2-py3
# - env: INSTANCE=v3003-py3-oraclelinux-7-3003-2-py3
# - env: INSTANCE=v3003-py3-arch-base-latest-3003-2-py3
# - env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-2-py3
# - env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-2-py3
-
env
:
INSTANCE=v3003-py3-almalinux-8-3003-2-py3
-
env
:
INSTANCE=v3003-py3-arch-base-latest-3003-1-py3
-
env
:
INSTANCE=v3003-py3-gentoo-stage3-latest-3003-1-py3
-
env
:
INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-1-py3
...
...
This diff is collapsed.
Click to expand it.
kitchen.yml
+
65
−
46
View file @
86b0fa1d
...
...
@@ -142,69 +142,84 @@ platforms:
driver
:
image
:
saltimages/salt-master-py3:rockylinux-8
## SALT `3003.
1
`
-
name
:
debian-11-3003-
1
-py3
## SALT `3003.
2
`
-
name
:
debian-11-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:debian-11
image
:
saltimages/salt-3003.
2
-py3:debian-11
run_command
:
/lib/systemd/systemd
-
name
:
debian-10-3003-
1
-py3
-
name
:
debian-10-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:debian-10
image
:
saltimages/salt-3003.
2
-py3:debian-10
run_command
:
/lib/systemd/systemd
-
name
:
debian-9-3003-
1
-py3
-
name
:
debian-9-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:debian-9
image
:
saltimages/salt-3003.
2
-py3:debian-9
run_command
:
/lib/systemd/systemd
-
name
:
ubuntu-2004-3003-
1
-py3
-
name
:
ubuntu-2004-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:ubuntu-20.04
image
:
saltimages/salt-3003.
2
-py3:ubuntu-20.04
run_command
:
/lib/systemd/systemd
-
name
:
ubuntu-1804-3003-
1
-py3
-
name
:
ubuntu-1804-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:ubuntu-18.04
image
:
saltimages/salt-3003.
2
-py3:ubuntu-18.04
run_command
:
/lib/systemd/systemd
-
name
:
centos-8-3003-
1
-py3
-
name
:
centos-8-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:centos-8
-
name
:
centos-7-3003-
1
-py3
image
:
saltimages/salt-3003.
2
-py3:centos-8
-
name
:
centos-7-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:centos-7
-
name
:
fedora-34-3003-
1
-py3
image
:
saltimages/salt-3003.
2
-py3:centos-7
-
name
:
fedora-34-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:fedora-34
-
name
:
fedora-33-3003-
1
-py3
image
:
saltimages/salt-3003.
2
-py3:fedora-34
-
name
:
fedora-33-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:fedora-33
-
name
:
opensuse-leap-153-3003-
1
-py3
image
:
saltimages/salt-3003.
2
-py3:fedora-33
-
name
:
opensuse-leap-153-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:opensuse-leap-15.3
image
:
saltimages/salt-3003.
2
-py3:opensuse-leap-15.3
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport
:
max_ssh_sessions
:
1
-
name
:
opensuse-leap-152-3003-
1
-py3
-
name
:
opensuse-leap-152-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:opensuse-leap-15.2
image
:
saltimages/salt-3003.
2
-py3:opensuse-leap-15.2
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport
:
max_ssh_sessions
:
1
-
name
:
opensuse-tmbl-latest-3003-
1
-py3
-
name
:
opensuse-tmbl-latest-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:opensuse-tumbleweed-latest
image
:
saltimages/salt-3003.
2
-py3:opensuse-tumbleweed-latest
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport
:
max_ssh_sessions
:
1
-
name
:
amazonlinux-2-3003-1-py3
-
name
:
amazonlinux-2-3003-2-py3
driver
:
image
:
saltimages/salt-3003.2-py3:amazonlinux-2
-
name
:
oraclelinux-8-3003-2-py3
driver
:
image
:
saltimages/salt-3003.2-py3:oraclelinux-8
-
name
:
oraclelinux-7-3003-2-py3
driver
:
image
:
saltimages/salt-3003.2-py3:oraclelinux-7
-
name
:
arch-base-latest-3003-2-py3
driver
:
image
:
saltimages/salt-3003.
1
-py3:a
mazonlinux-2
-
name
:
oraclelinux-8
-3003-
1
-py3
image
:
saltimages/salt-3003.
2
-py3:a
rch-base-latest
-
name
:
gentoo-stage3-latest
-3003-
2
-py3
driver
:
image
:
saltimages/salt-3003.1-py3:oraclelinux-8
-
name
:
oraclelinux-7-3003-1-py3
image
:
saltimages/salt-3003.2-py3:gentoo-stage3-latest
run_command
:
/sbin/init
-
name
:
gentoo-stage3-systemd-3003-2-py3
driver
:
image
:
saltimages/salt-3003.2-py3:gentoo-stage3-systemd
-
name
:
almalinux-8-3003-2-py3
driver
:
image
:
saltimages/salt-3003.1-py3:oraclelinux-7
image
:
saltimages/salt-3003.2-py3:almalinux-8
## SALT `3003.1`
-
name
:
arch-base-latest-3003-1-py3
driver
:
image
:
saltimages/salt-3003.1-py3:arch-base-latest
...
...
@@ -430,21 +445,25 @@ verifier:
suites
:
-
name
:
v3003-py3
includes
:
-
debian-11-3003-1-py3
-
debian-10-3003-1-py3
-
debian-9-3003-1-py3
-
ubuntu-2004-3003-1-py3
-
ubuntu-1804-3003-1-py3
-
centos-8-3003-1-py3
-
centos-7-3003-1-py3
-
fedora-34-3003-1-py3
-
fedora-33-3003-1-py3
-
opensuse-leap-153-3003-1-py3
-
opensuse-leap-152-3003-1-py3
-
opensuse-tmbl-latest-3003-1-py3
-
amazonlinux-2-3003-1-py3
-
oraclelinux-8-3003-1-py3
-
oraclelinux-7-3003-1-py3
-
debian-11-3003-2-py3
-
debian-10-3003-2-py3
-
debian-9-3003-2-py3
-
ubuntu-2004-3003-2-py3
-
ubuntu-1804-3003-2-py3
-
centos-8-3003-2-py3
-
centos-7-3003-2-py3
-
fedora-34-3003-2-py3
-
fedora-33-3003-2-py3
-
opensuse-leap-153-3003-2-py3
-
opensuse-leap-152-3003-2-py3
-
opensuse-tmbl-latest-3003-2-py3
-
amazonlinux-2-3003-2-py3
-
oraclelinux-8-3003-2-py3
-
oraclelinux-7-3003-2-py3
-
arch-base-latest-3003-2-py3
-
gentoo-stage3-latest-3003-2-py3
-
gentoo-stage3-systemd-3003-2-py3
-
almalinux-8-3003-2-py3
-
arch-base-latest-3003-1-py3
-
gentoo-stage3-latest-3003-1-py3
-
gentoo-stage3-systemd-3003-1-py3
...
...
This diff is collapsed.
Click to expand it.
Dennis Ahrens
@ahrensde
mentioned in commit
0f2dbe0f
·
3 years ago
mentioned in commit
0f2dbe0f
mentioned in commit 0f2dbe0fe8780c8fb0778c349b800febbcd738bd
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment