From f9ff8eab10fe22d6930107cefef4a589b85e81d0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 20 Nov 2021 20:28:08 +0000 Subject: [PATCH 1/2] test(silicon): add pillar and verification files for `3004` --- .../default/files/_mapdata/almalinux-8.yaml | 6 +- .../default/files/_mapdata/amazonlinux-2.yaml | 6 +- .../files/_mapdata/arch-base-latest.yaml | 2 +- .../default/files/_mapdata/centos-7.yaml | 6 +- .../default/files/_mapdata/centos-8.yaml | 6 +- .../default/files/_mapdata/debian-10.yaml | 6 +- .../default/files/_mapdata/debian-11.yaml | 116 ++++++++++++++++++ .../default/files/_mapdata/debian-9.yaml | 6 +- .../default/files/_mapdata/oraclelinux-7.yaml | 6 +- .../default/files/_mapdata/oraclelinux-8.yaml | 6 +- .../default/files/_mapdata/rockylinux-8.yaml | 115 +++++++++++++++++ .../default/files/_mapdata/ubuntu-18.yaml | 8 +- .../default/files/_mapdata/ubuntu-20.yaml | 8 +- test/salt/pillar/v3004-py3.sls | 5 + 14 files changed, 269 insertions(+), 33 deletions(-) create mode 100644 test/integration/default/files/_mapdata/debian-11.yaml create mode 100644 test/integration/default/files/_mapdata/rockylinux-8.yaml create mode 100644 test/salt/pillar/v3004-py3.sls diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml index cb09ac59b..956399a04 100644 --- a/test/integration/default/files/_mapdata/almalinux-8.yaml +++ b/test/integration/default/files/_mapdata/almalinux-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,14 +85,14 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3003' + release: '3004' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index e799cb273..ec71e2ce5 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltproject.io/py3/amazon/2/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/amazon/2/$basearch/3004/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,14 +85,14 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltproject.io/py3/amazon/2/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/amazon/2/$basearch/3004 pkgrepo_humanname: SaltStack repo for Amazon Linux 2 pkgrepo_name: saltstack-amzn-repo py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3003' + release: '3004' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index e14e75caf..8b61ed101 100644 --- a/test/integration/default/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml @@ -91,7 +91,7 @@ values: pyinotify: python2-pyinotify python_dulwich: python-dulwich python_git: python2-gitpython - release: '3003' + release: '3004' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index f8483fa72..27384e123 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,14 +85,14 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3002' + release: '3003' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index 720533a80..48fd71831 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,14 +85,14 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3003' + release: '3004' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index 51288c884..5abb9551f 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -86,14 +86,14 @@ values: parallel: true pin_version: false pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/debian/10/amd64/3002 buster main - pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3002/salt-archive-keyring.gpg + https://repo.saltproject.io/py3/debian/10/amd64/3003 buster main + pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3003/salt-archive-keyring.gpg pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3002' + release: '3003' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml new file mode 100644 index 000000000..b07887c52 --- /dev/null +++ b/test/integration/default/files/_mapdata/debian-11.yaml @@ -0,0 +1,116 @@ +# yamllint disable rule:indentation rule:line-length +# Debian-11 +--- +values: + formulas_settings: + checkout_orig_branch: false + git_opts: + default: + basedir: /srv/formulas + baseurl: https://github.com/saltstack-formulas + options: + output_loglevel: quiet + rev: master + update: false + list: {} + salt_settings: + api_service: salt-api + api_service_details: + enabled: true + state: running + clean_config_d_dir: true + cloud: + template_sources: + maps: salt://salt/files/cloud.maps.d + profiles: salt://salt/files/cloud.profiles.d + providers: salt://salt/files/cloud.providers.d + config_path: /etc/salt + gitfs: + dulwich: + install_from_source: true + gitpython: + install_from_source: false + pygit2: + git: + install_from_package: git + require_state: false + install_from_source: true + libgit2: + build_parent_dir: /usr/src/ + download_hash: 683d1164e361e2a0a8d52652840e2340 + install_from_source: false + version: 0.23.0 + version: 0.22.1 + install_packages: true + libgit2: libgit2-22 + master: + ext_pillar: + - cmd_yaml: cat /etc/salt/yaml + - stack: + - /path/to/stack1.cfg + - /path/to/stack2.cfg + - reclass: + inventory_base_uri: /etc/reclass + file_roots: + base: + - /srv/salt + fileserver_backend: + - rootfs + gitfs_provider: gitpython + pillar_roots: + base: + - /srv/pillar + master_config_use_TOFS: false + master_remove_config: false + master_service: salt-master + master_service_details: + enabled: true + state: running + minion: + file_roots: + base: + - /srv/salt + fileserver_backend: + - rootfs + master: localhost + master_type: str + pillar_roots: + base: + - /srv/pillar + minion_config_use_TOFS: false + minion_remove_config: false + minion_service: salt-minion + minion_service_details: + enabled: true + state: running + parallel: true + pin_version: false + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main + pkgrepo_keyring: https://repo.saltproject.io/py3/debian/11/amd64/3004/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 + py_ver: py3 + pyinotify: python-pyinotify + python_dulwich: python-dulwich + python_git: python-git + release: '3004' + restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true + rootgroup: root + rootuser: root + salt_api: salt-api + salt_cloud: salt-cloud + salt_master: salt-master + salt_master_macos_plist_hash: '' + salt_minion: salt-minion + salt_minion_macos_plist_hash: '' + salt_ssh: salt-ssh + salt_syndic: salt-syndic + ssh_roster: {} + syndic_service: salt-syndic + use_pip: false + version: '' diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index fc83a9f7a..073288ef8 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -86,14 +86,14 @@ values: parallel: true pin_version: false pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/debian/9/amd64/3001 stretch main - pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3001/salt-archive-keyring.gpg + https://repo.saltproject.io/py3/debian/9/amd64/3002 stretch main + pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3002/salt-archive-keyring.gpg pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3001' + release: '3002' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index f95b9eb9c..2d736835c 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/7/$basearch/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/7/$basearch/3003/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,14 +85,14 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/7/$basearch/3002 + pkgrepo: https://repo.saltproject.io/py3/redhat/7/$basearch/3003 pkgrepo_humanname: SaltStack repo for RHEL/CentOS 7 pkgrepo_name: saltstack py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3002' + release: '3003' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index b676d6a25..0e168ebc1 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,14 +85,14 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3003' + release: '3004' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml new file mode 100644 index 000000000..0b68d7c72 --- /dev/null +++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml @@ -0,0 +1,115 @@ +# yamllint disable rule:indentation rule:line-length +# Rocky Linux-8 +--- +values: + formulas_settings: + checkout_orig_branch: false + git_opts: + default: + basedir: /srv/formulas + baseurl: https://github.com/saltstack-formulas + options: + output_loglevel: quiet + rev: master + update: false + list: {} + salt_settings: + api_service: salt-api + api_service_details: + enabled: true + state: running + clean_config_d_dir: true + cloud: + template_sources: + maps: salt://salt/files/cloud.maps.d + profiles: salt://salt/files/cloud.profiles.d + providers: salt://salt/files/cloud.providers.d + config_path: /etc/salt + gitfs: + dulwich: + install_from_source: true + gitpython: + install_from_source: false + pygit2: + git: + install_from_package: git + require_state: false + install_from_source: false + libgit2: + build_parent_dir: /usr/src/ + download_hash: 683d1164e361e2a0a8d52652840e2340 + install_from_source: true + version: 0.23.0 + version: 0.23.0 + install_packages: true + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub + master: + ext_pillar: + - cmd_yaml: cat /etc/salt/yaml + - stack: + - /path/to/stack1.cfg + - /path/to/stack2.cfg + - reclass: + inventory_base_uri: /etc/reclass + file_roots: + base: + - /srv/salt + fileserver_backend: + - rootfs + gitfs_provider: pygit2 + pillar_roots: + base: + - /srv/pillar + master_config_use_TOFS: false + master_remove_config: false + master_service: salt-master + master_service_details: + enabled: true + state: running + minion: + file_roots: + base: + - /srv/salt + fileserver_backend: + - rootfs + master: localhost + master_type: str + pillar_roots: + base: + - /srv/pillar + minion_config_use_TOFS: false + minion_remove_config: false + minion_service: salt-minion + minion_service_details: + enabled: true + state: running + parallel: true + pin_version: false + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 + pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever + pkgrepo_name: saltstack + py_ver: py3 + pygit2: python-pygit2 + python_dulwich: python-dulwich + python_git: GitPython + release: '3004' + restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true + rootgroup: root + rootuser: root + salt_api: salt-api + salt_cloud: salt-cloud + salt_master: salt-master + salt_master_macos_plist_hash: '' + salt_minion: salt-minion + salt_minion_macos_plist_hash: '' + salt_ssh: salt-ssh + salt_syndic: salt-syndic + ssh_roster: {} + syndic_service: salt-syndic + use_pip: false + version: '' diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index cf21ff541..743b9df5c 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -87,15 +87,15 @@ values: parallel: true pin_version: false pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3002 bionic main - pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3002/salt-archive-keyring.gpg + https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003 bionic main + pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003/salt-archive-keyring.gpg pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3002' + release: '3003' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index bec78e2dd..79255fa22 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3004/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -87,15 +87,15 @@ values: parallel: true pin_version: false pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3003 focal main - pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3003/salt-archive-keyring.gpg + https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3004 focal main + pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3004/salt-archive-keyring.gpg pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3003' + release: '3004' restart_via_at: false retry_options: attempts: 5 diff --git a/test/salt/pillar/v3004-py3.sls b/test/salt/pillar/v3004-py3.sls new file mode 100644 index 000000000..2da9cba96 --- /dev/null +++ b/test/salt/pillar/v3004-py3.sls @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +salt: + release: '3004' From 93289f6df12a675eafcf719ced7363e350b9651b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 19 Nov 2021 22:08:25 +0000 Subject: [PATCH 2/2] ci(kitchen+gitlab): adjust matrix to add `3004` * Semi-automated using https://github.com/myii/ssf-formula/pull/385 --- .github/workflows/kitchen.vagrant.yml | 1 - .gitlab-ci.yml | 66 +++++++---- .travis.yml | 56 ++++++--- kitchen.vagrant.yml | 9 -- kitchen.yml | 164 ++++++++++++++++++++++++++ test/salt/pillar/top.sls | 2 + 6 files changed, 251 insertions(+), 47 deletions(-) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index ccb253750..a7aba6ceb 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -19,7 +19,6 @@ jobs: - default-freebsd-130-3003-1-py3 - default-freebsd-122-3003-1-py3 - default-openbsd-69-3002-6-py3 - # - default-openbsd-68-3001-1-py3 - default-windows-10-latest-py3 - default-windows-81-latest-py3 steps: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b14235f1b..b0cfbb1aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,6 +135,7 @@ rubocop: # default-debian-9-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} +# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'} # default-centos-8-tiamat-py3: {extends: '.test_instance'} # default-centos-7-tiamat-py3: {extends: '.test_instance'} # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} @@ -147,13 +148,14 @@ rubocop: # default-debian-9-master-py3: {extends: '.test_instance'} # default-ubuntu-2004-master-py3: {extends: '.test_instance'} # default-ubuntu-1804-master-py3: {extends: '.test_instance'} +# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} # default-centos-8-master-py3: {extends: '.test_instance'} # default-centos-7-master-py3: {extends: '.test_instance'} # default-fedora-34-master-py3: {extends: '.test_instance'} # default-fedora-33-master-py3: {extends: '.test_instance'} # default-opensuse-leap-153-master-py3: {extends: '.test_instance'} # default-opensuse-leap-152-master-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'} # default-amazonlinux-2-master-py3: {extends: '.test_instance'} # default-oraclelinux-8-master-py3: {extends: '.test_instance'} # default-oraclelinux-7-master-py3: {extends: '.test_instance'} @@ -162,45 +164,67 @@ rubocop: # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-almalinux-8-master-py3: {extends: '.test_instance'} # default-rockylinux-8-master-py3: {extends: '.test_instance'} -default-debian-11-3003-3-py3: {extends: '.test_instance_failure_permitted'} -# default-debian-10-3003-3-py3: {extends: '.test_instance'} +default-debian-11-3004-0-py3: {extends: '.test_instance'} +# default-debian-10-3004-0-py3: {extends: '.test_instance'} +# default-debian-9-3004-0-py3: {extends: '.test_instance'} +default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'} +default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'} +default-centos-8-3004-0-py3: {extends: '.test_instance'} +# default-centos-7-3004-0-py3: {extends: '.test_instance'} +# default-fedora-34-3004-0-py3: {extends: '.test_instance'} +# default-fedora-33-3004-0-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'} +default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'} +default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'} +default-arch-base-latest-3004-0-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'} +default-almalinux-8-3004-0-py3: {extends: '.test_instance'} +default-rockylinux-8-3004-0-py3: {extends: '.test_instance'} +# default-debian-11-3003-3-py3: {extends: '.test_instance'} +default-debian-10-3003-3-py3: {extends: '.test_instance'} # default-debian-9-3003-3-py3: {extends: '.test_instance'} -default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} -default-centos-8-3003-3-py3: {extends: '.test_instance'} -# default-centos-7-3003-3-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} +default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} +# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'} +# default-centos-8-3003-3-py3: {extends: '.test_instance'} +default-centos-7-3003-3-py3: {extends: '.test_instance'} default-fedora-34-3003-3-py3: {extends: '.test_instance'} default-fedora-33-3003-3-py3: {extends: '.test_instance'} default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'} -default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'} -default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'} -default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'} +default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'} +# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'} +default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'} # default-arch-base-latest-3003-3-py3: {extends: '.test_instance'} default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'} default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'} -default-almalinux-8-3003-3-py3: {extends: '.test_instance'} -# default-debian-11-3002-7-py3: {extends: '.test_instance_failure_permitted'} -default-debian-10-3002-7-py3: {extends: '.test_instance'} -# default-debian-9-3002-7-py3: {extends: '.test_instance'} +# default-almalinux-8-3003-3-py3: {extends: '.test_instance'} +# default-debian-11-3002-7-py3: {extends: '.test_instance'} +# default-debian-10-3002-7-py3: {extends: '.test_instance'} +default-debian-9-3002-7-py3: {extends: '.test_instance'} # default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} -default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} # default-centos-8-3002-7-py3: {extends: '.test_instance'} -default-centos-7-3002-7-py3: {extends: '.test_instance'} +# default-centos-7-3002-7-py3: {extends: '.test_instance'} # default-fedora-34-3002-7-py3: {extends: '.test_instance'} # default-fedora-33-3002-7-py3: {extends: '.test_instance'} # default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'} # default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'} # default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'} -default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'} # default-arch-base-latest-3002-7-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'} # default-debian-10-3001-8-py3: {extends: '.test_instance'} -default-debian-9-3001-8-py3: {extends: '.test_instance'} +# default-debian-9-3001-8-py3: {extends: '.test_instance'} # default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'} # default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'} # default-centos-8-3001-8-py3: {extends: '.test_instance'} @@ -209,7 +233,7 @@ default-debian-9-3001-8-py3: {extends: '.test_instance'} # default-fedora-33-3001-8-py3: {extends: '.test_instance'} # default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'} # default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'} # default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'} # default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index 44ade7dbb..4a5e68306 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,7 @@ jobs: # - env: INSTANCE=default-debian-9-tiamat-py3 # - env: INSTANCE=default-ubuntu-2004-tiamat-py3 # - env: INSTANCE=default-ubuntu-1804-tiamat-py3 + # - env: INSTANCE=default-centos-stream8-tiamat-py3 # - env: INSTANCE=default-centos-8-tiamat-py3 # - env: INSTANCE=default-centos-7-tiamat-py3 # - env: INSTANCE=default-amazonlinux-2-tiamat-py3 @@ -100,6 +101,7 @@ jobs: # - env: INSTANCE=default-debian-9-master-py3 # - env: INSTANCE=default-ubuntu-2004-master-py3 # - env: INSTANCE=default-ubuntu-1804-master-py3 + # - env: INSTANCE=default-centos-stream8-master-py3 # - env: INSTANCE=default-centos-8-master-py3 # - env: INSTANCE=default-centos-7-master-py3 # - env: INSTANCE=default-fedora-34-master-py3 @@ -115,32 +117,54 @@ jobs: # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 # - env: INSTANCE=default-almalinux-8-master-py3 # - env: INSTANCE=default-rockylinux-8-master-py3 - - env: INSTANCE=default-debian-11-3003-3-py3 - # - env: INSTANCE=default-debian-10-3003-3-py3 + - env: INSTANCE=default-debian-11-3004-0-py3 + # - env: INSTANCE=default-debian-10-3004-0-py3 + # - env: INSTANCE=default-debian-9-3004-0-py3 + - env: INSTANCE=default-ubuntu-2004-3004-0-py3 + # - env: INSTANCE=default-ubuntu-1804-3004-0-py3 + - env: INSTANCE=default-centos-stream8-3004-0-py3 + - env: INSTANCE=default-centos-8-3004-0-py3 + # - env: INSTANCE=default-centos-7-3004-0-py3 + # - env: INSTANCE=default-fedora-34-3004-0-py3 + # - env: INSTANCE=default-fedora-33-3004-0-py3 + # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3 + # - env: INSTANCE=default-opensuse-leap-152-3004-0-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3 + - env: INSTANCE=default-amazonlinux-2-3004-0-py3 + - env: INSTANCE=default-oraclelinux-8-3004-0-py3 + # - env: INSTANCE=default-oraclelinux-7-3004-0-py3 + - env: INSTANCE=default-arch-base-latest-3004-0-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3 + - env: INSTANCE=default-almalinux-8-3004-0-py3 + - env: INSTANCE=default-rockylinux-8-3004-0-py3 + # - env: INSTANCE=default-debian-11-3003-3-py3 + - env: INSTANCE=default-debian-10-3003-3-py3 # - env: INSTANCE=default-debian-9-3003-3-py3 - - env: INSTANCE=default-ubuntu-2004-3003-3-py3 - # - env: INSTANCE=default-ubuntu-1804-3003-3-py3 - - env: INSTANCE=default-centos-8-3003-3-py3 - # - env: INSTANCE=default-centos-7-3003-3-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-3-py3 + - env: INSTANCE=default-ubuntu-1804-3003-3-py3 + # - env: INSTANCE=default-centos-stream8-3003-3-py3 + # - env: INSTANCE=default-centos-8-3003-3-py3 + - env: INSTANCE=default-centos-7-3003-3-py3 - env: INSTANCE=default-fedora-34-3003-3-py3 - env: INSTANCE=default-fedora-33-3003-3-py3 - env: INSTANCE=default-opensuse-leap-153-3003-3-py3 # - env: INSTANCE=default-opensuse-leap-152-3003-3-py3 - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3 - - env: INSTANCE=default-amazonlinux-2-3003-3-py3 - - env: INSTANCE=default-oraclelinux-8-3003-3-py3 - # - env: INSTANCE=default-oraclelinux-7-3003-3-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-3-py3 + # - env: INSTANCE=default-oraclelinux-8-3003-3-py3 + - env: INSTANCE=default-oraclelinux-7-3003-3-py3 # - env: INSTANCE=default-arch-base-latest-3003-3-py3 - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3 - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3 - - env: INSTANCE=default-almalinux-8-3003-3-py3 + # - env: INSTANCE=default-almalinux-8-3003-3-py3 # - env: INSTANCE=default-debian-11-3002-7-py3 - - env: INSTANCE=default-debian-10-3002-7-py3 - # - env: INSTANCE=default-debian-9-3002-7-py3 + # - env: INSTANCE=default-debian-10-3002-7-py3 + - env: INSTANCE=default-debian-9-3002-7-py3 # - env: INSTANCE=default-ubuntu-2004-3002-7-py3 - - env: INSTANCE=default-ubuntu-1804-3002-7-py3 + # - env: INSTANCE=default-ubuntu-1804-3002-7-py3 # - env: INSTANCE=default-centos-8-3002-7-py3 - - env: INSTANCE=default-centos-7-3002-7-py3 + # - env: INSTANCE=default-centos-7-3002-7-py3 # - env: INSTANCE=default-fedora-34-3002-7-py3 # - env: INSTANCE=default-fedora-33-3002-7-py3 # - env: INSTANCE=default-opensuse-leap-153-3002-7-py3 @@ -148,12 +172,12 @@ jobs: # - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3 # - env: INSTANCE=default-amazonlinux-2-3002-7-py3 # - env: INSTANCE=default-oraclelinux-8-3002-7-py3 - - env: INSTANCE=default-oraclelinux-7-3002-7-py3 + # - env: INSTANCE=default-oraclelinux-7-3002-7-py3 # - env: INSTANCE=default-arch-base-latest-3002-7-py3 # - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3 # - env: INSTANCE=default-debian-10-3001-8-py3 - - env: INSTANCE=default-debian-9-3001-8-py3 + # - env: INSTANCE=default-debian-9-3001-8-py3 # - env: INSTANCE=default-ubuntu-2004-3001-8-py3 # - env: INSTANCE=default-ubuntu-1804-3001-8-py3 # - env: INSTANCE=default-centos-8-3001-8-py3 diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index 849eda625..8737e7885 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -53,15 +53,6 @@ platforms: verifier: inputs: saltmajorversion: 3002 - - name: openbsd-68-3001-1-py3 - driver: - box: myii/openbsd-6.8-3001.1-py3 - ssh: - shell: /bin/ksh - synced_folders: [] - verifier: - inputs: - saltmajorversion: 3001 - name: windows-10-latest-py3 driver: box: techneg/win10x64-pro-salt diff --git a/kitchen.yml b/kitchen.yml index 142355f94..3d29b68f1 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -57,6 +57,12 @@ platforms: verifier: inputs: saltmajorversion: 3004 + - name: centos-stream8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:centos-stream8 + verifier: + inputs: + saltmajorversion: 3004 - name: centos-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-8 @@ -136,6 +142,12 @@ platforms: verifier: inputs: saltmajorversion: 3004 + - name: centos-stream8-master-py3 + driver: + image: saltimages/salt-master-py3:centos-stream8 + verifier: + inputs: + saltmajorversion: 3004 - name: centos-8-master-py3 driver: image: saltimages/salt-master-py3:centos-8 @@ -240,6 +252,152 @@ platforms: inputs: saltmajorversion: 3004 + ## SALT `3004.0` + - name: debian-11-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:debian-11 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 + - name: debian-10-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:debian-10 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 + - name: debian-9-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:debian-9 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 + - name: ubuntu-2004-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:ubuntu-20.04 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 + - name: ubuntu-1804-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:ubuntu-18.04 + run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 + - name: centos-stream8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:centos-stream8 + verifier: + inputs: + saltmajorversion: 3004 + - name: centos-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:centos-8 + verifier: + inputs: + saltmajorversion: 3004 + - name: centos-7-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:centos-7 + verifier: + inputs: + saltmajorversion: 3004 + - name: fedora-34-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:fedora-34 + verifier: + inputs: + saltmajorversion: 3004 + - name: fedora-33-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:fedora-33 + verifier: + inputs: + saltmajorversion: 3004 + - name: opensuse-leap-153-3004-0-py3 + driver: + image: saltimages/salt-3004.0-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 + verifier: + inputs: + saltmajorversion: 3004 + - name: opensuse-leap-152-3004-0-py3 + driver: + image: saltimages/salt-3004.0-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 + verifier: + inputs: + saltmajorversion: 3004 + - name: opensuse-tmbl-latest-3004-0-py3 + driver: + image: saltimages/salt-3004.0-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 + verifier: + inputs: + saltmajorversion: 3004 + - name: amazonlinux-2-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:amazonlinux-2 + verifier: + inputs: + saltmajorversion: 3004 + - name: oraclelinux-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:oraclelinux-8 + verifier: + inputs: + saltmajorversion: 3004 + - name: oraclelinux-7-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:oraclelinux-7 + verifier: + inputs: + saltmajorversion: 3004 + - name: arch-base-latest-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:arch-base-latest + verifier: + inputs: + saltmajorversion: 3004 + - name: gentoo-stage3-latest-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:gentoo-stage3-latest + run_command: /sbin/init + verifier: + inputs: + saltmajorversion: 3004 + - name: gentoo-stage3-systemd-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd + verifier: + inputs: + saltmajorversion: 3004 + - name: almalinux-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:almalinux-8 + verifier: + inputs: + saltmajorversion: 3004 + - name: rockylinux-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:rockylinux-8 + verifier: + inputs: + saltmajorversion: 3004 + ## SALT `3003.3` - name: debian-11-3003-3-py3 driver: @@ -276,6 +434,12 @@ platforms: verifier: inputs: saltmajorversion: 3003 + - name: centos-stream8-3003-3-py3 + driver: + image: saltimages/salt-3003.3-py3:centos-stream8 + verifier: + inputs: + saltmajorversion: 3003 - name: centos-8-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:centos-8 diff --git a/test/salt/pillar/top.sls b/test/salt/pillar/top.sls index c41b9abd8..0471b82e4 100644 --- a/test/salt/pillar/top.sls +++ b/test/salt/pillar/top.sls @@ -4,6 +4,8 @@ base: '*': - salt + 'G@saltversioninfo:0:3004 and G@pythonversion:0:3': + - v3004-py3 'G@saltversioninfo:0:3003 and G@pythonversion:0:3': - v3003-py3 'G@saltversioninfo:0:3002 and G@pythonversion:0:3':