diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c3a6e26d..2c37c38ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,6 +150,7 @@ rubocop: # default-ubuntu-1804-master-py3: {extends: '.test_instance'} # default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} # default-centos-7-master-py3: {extends: '.test_instance'} +# default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'} # default-fedora-35-master-py3: {extends: '.test_instance'} # default-fedora-34-master-py3: {extends: '.test_instance'} # default-opensuse-leap-153-master-py3: {extends: '.test_instance'} @@ -169,6 +170,7 @@ default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'} # default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'} default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'} # default-centos-7-3004-1-py3: {extends: '.test_instance'} +default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'} default-fedora-35-3004-1-py3: {extends: '.test_instance'} default-fedora-34-3004-1-py3: {extends: '.test_instance'} default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index f34fafaa3..97aa99776 100644 --- a/.travis.yml +++ b/.travis.yml @@ -102,6 +102,7 @@ jobs: # - env: INSTANCE=default-ubuntu-1804-master-py3 # - env: INSTANCE=default-centos-stream8-master-py3 # - env: INSTANCE=default-centos-7-master-py3 + # - env: INSTANCE=default-fedora-36-master-py3 # - env: INSTANCE=default-fedora-35-master-py3 # - env: INSTANCE=default-fedora-34-master-py3 # - env: INSTANCE=default-opensuse-leap-153-master-py3 @@ -121,6 +122,7 @@ jobs: # - env: INSTANCE=default-ubuntu-1804-3004-1-py3 - env: INSTANCE=default-centos-stream8-3004-1-py3 # - env: INSTANCE=default-centos-7-3004-1-py3 + - env: INSTANCE=default-fedora-36-3004-1-py3 - env: INSTANCE=default-fedora-35-3004-1-py3 - env: INSTANCE=default-fedora-34-3004-1-py3 - env: INSTANCE=default-amazonlinux-2-3004-1-py3 diff --git a/AUTHORS.md b/AUTHORS.md index 10da97ca3..6187493bc 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,8 +4,8 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|274 -@aboe76|[@aboe76](https://github.com/aboe76)|101 +@myii|[@myii](https://github.com/myii)|279 +@aboe76|[@aboe76](https://github.com/aboe76)|102 @gravyboat|[@gravyboat](https://github.com/gravyboat)|71 @nmadhok|[@nmadhok](https://github.com/nmadhok)|54 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|43 @@ -114,4 +114,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-04-03. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-04-13. diff --git a/CHANGELOG.md b/CHANGELOG.md index 8280b2e41..b16516b3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [1.10.3](https://github.com/saltstack-formulas/salt-formula/compare/v1.10.2...v1.10.3) (2022-04-13) + + +### Bug Fixes + +* **pkgrepo:** pkgrepo use cmd.shell ([0e4b3bd](https://github.com/saltstack-formulas/salt-formula/commit/0e4b3bdf945d89cc8a4cc614fbe2073426363dff)) + + +### Continuous Integration + +* **kitchen.windows:** fix version number for Salt installation [skip ci] ([37dd068](https://github.com/saltstack-formulas/salt-formula/commit/37dd068d199b4ee049c31807ecf34dfadec0179b)) + + +### Tests + +* **_mapdata:** add verification file for `fedora-36` [skip ci] ([c20deb9](https://github.com/saltstack-formulas/salt-formula/commit/c20deb92d48e26a83732eefa196f2f08d6548bff)) + ## [1.10.2](https://github.com/saltstack-formulas/salt-formula/compare/v1.10.1...v1.10.2) (2022-04-03) diff --git a/FORMULA b/FORMULA index 72ffc1026..cb9cf695a 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: salt os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Oracle, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, FreeBSD, OpenBSD, Windows os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows -version: 1.10.2 +version: 1.10.3 release: 1 minimum_version: 2015.8 summary: Formula for install Saltstack diff --git a/Gemfile.lock b/Gemfile.lock index d85bdc6ee..f8126ba30 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 36118e817641fbc1d4bd9753a77c383e7b20caff + revision: 1821d2dfd3365e8f05b8439845c58fa4d069806b branch: ssf specs: - inspec (5.10.7) + inspec (5.12.2) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.10.7) + inspec-core (= 5.12.2) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.10.7) + inspec-core (5.12.2) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -40,7 +40,7 @@ GIT GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 4e03ca42d98624323c1c2d91ceb39c09a29bbfc8 + revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82 branch: ssf specs: kitchen-docker (2.12.0) @@ -58,14 +58,14 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.571.0) + aws-partitions (1.574.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-amplify (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigateway (1.75.0) + aws-sdk-apigateway (1.76.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.42.0) @@ -125,7 +125,7 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.76.0) + aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-core (3.130.0) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.304.0) + aws-sdk-ec2 (1.305.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -202,7 +202,7 @@ GEM aws-sdk-kms (1.55.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.82.0) + aws-sdk-lambda (1.83.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) @@ -245,7 +245,7 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.62.0) + aws-sdk-securityhub (1.63.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -263,7 +263,7 @@ GEM aws-sdk-simpledb (1.29.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv2 (~> 1.0) - aws-sdk-sms (1.39.0) + aws-sdk-sms (1.40.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-sns (1.53.0) @@ -328,7 +328,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.3.0) erubi (1.10.0) - excon (0.92.1) + excon (0.92.2) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -367,8 +367,9 @@ GEM signet (~> 0.14) gssapi (1.3.1) ffi (>= 1.0.1) - gyoku (1.3.1) + gyoku (1.4.0) builder (>= 2.1.2) + rexml (~> 3.0) hashie (4.1.0) highline (2.0.3) http-cookie (1.0.4) @@ -409,7 +410,7 @@ GEM mixlib-versioning thor mixlib-log (3.0.9) - mixlib-shellout (3.2.5) + mixlib-shellout (3.2.7) chef-utils mixlib-versioning (1.2.12) mongo (2.13.2) @@ -448,7 +449,7 @@ GEM public_suffix (4.0.6) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.2.1) + regexp_parser (2.3.0) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -467,7 +468,7 @@ GEM rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-support (3.11.0) @@ -480,7 +481,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) + rubocop-ast (1.17.0) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) @@ -516,7 +517,7 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.8.9) + train (3.9.2) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -527,7 +528,7 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.8.9) + train-core (= 3.9.2) train-winrm (~> 0.2) train-aws (0.2.24) aws-sdk-alexaforbusiness (~> 1.0) @@ -605,7 +606,7 @@ GEM aws-sdk-synthetics (~> 1.19.0) aws-sdk-transfer (>= 1.26, < 1.35) aws-sdk-waf (~> 1.43.0) - train-core (3.8.9) + train-core (3.9.2) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index b931b9795..3580538fd 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,10 +15,10 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 274 + - 279 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - - 101 + - 102 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 71 @@ -338,4 +338,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2022-04-03. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2022-04-13. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index af0fb533c..9328133b8 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog ========= +`1.10.3 `_ (2022-04-13) +--------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **pkgrepo:** pkgrepo use cmd.shell (\ `0e4b3bd `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen.windows:** fix version number for Salt installation [skip ci] (\ `37dd068 `_\ ) + +Tests +^^^^^ + + +* **_mapdata:** add verification file for ``fedora-36`` [skip ci] (\ `c20deb9 `_\ ) + `1.10.2 `_ (2022-04-03) --------------------------------------------------------------------------------------------------------- diff --git a/kitchen.windows.yml b/kitchen.windows.yml index 6aef85a91..0c78152e9 100644 --- a/kitchen.windows.yml +++ b/kitchen.windows.yml @@ -11,7 +11,7 @@ driver: provisioner: salt_install: bootstrap - salt_bootstrap_options: -pythonVersion 3 -version 3004-3 + salt_bootstrap_options: -pythonVersion 3 -version 3004.1-1 # yamllint disable rule:line-length init_environment: | salt-call --local state.single file.managed ` diff --git a/kitchen.yml b/kitchen.yml index 1d1bcf405..d9acca0ef 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -148,6 +148,12 @@ platforms: verifier: inputs: saltmajorversion: 3004 + - name: fedora-36-master-py3 + driver: + image: saltimages/salt-master-py3:fedora-36 + verifier: + inputs: + saltmajorversion: 3004 - name: fedora-35-master-py3 driver: image: saltimages/salt-master-py3:fedora-35 @@ -278,6 +284,12 @@ platforms: verifier: inputs: saltmajorversion: 3004 + - name: fedora-36-3004-1-py3 + driver: + image: saltimages/salt-3004.1-py3:fedora-36 + verifier: + inputs: + saltmajorversion: 3004 - name: fedora-35-3004-1-py3 driver: image: saltimages/salt-3004.1-py3:fedora-35 diff --git a/salt/pkgrepo/suse/install.sls b/salt/pkgrepo/suse/install.sls index 09eef4da6..3ac8feeee 100644 --- a/salt/pkgrepo/suse/install.sls +++ b/salt/pkgrepo/suse/install.sls @@ -4,7 +4,7 @@ {#- Resorting to this ugly hack since the state doesn't handle if the `baseurl` is already configured under another name, such as used by the `salt-bootstrap` #} -{%- if not salt["cmd.run"]("zypper lr --uri | grep " ~ salt_settings.pkgrepo) %} +{%- if not salt["cmd.shell"]("zypper lr --uri | grep " ~ salt_settings.pkgrepo) %} salt-pkgrepo-install-saltstack-suse: pkgrepo.managed: - name: systemsmanagement_saltstack_products diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml new file mode 100644 index 000000000..77b0ee63c --- /dev/null +++ b/test/integration/default/files/_mapdata/fedora-36.yaml @@ -0,0 +1,117 @@ +# yamllint disable rule:indentation rule:line-length +# Fedora-36 +--- +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 + - saltclass: + - path: /srv/saltclass + 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: python2-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: ''