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

Salt Shaker: Fix testsuite path and add GPG keys for SLMicro60 #1587

Merged
merged 2 commits into from
May 17, 2024
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
21 changes: 21 additions & 0 deletions salt/default/gpg_keys/saltstack.key
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)

mQENBFspGl8BCADC0Lmh3GGIaWI4FvekwxbCqsRlqWQhdtSgQiFXlzjKVPl5kPSt
oYvvIVV5M33SaHK1s2/i2dbiL6vmw+NazQueOcHw//uAikugssmvwK1iYhbwl/TW
EZDVfW0pW33XR9IHzhbONV2293pjwScemmcEYghrN7TDw6cwcMs14ju0Jbh03+jN
lW+Ryrazeb7O9lkdeaA/Fq4c3miw156uWqdgKr7kPnp0GjMWRSBVIeUK936PJyNV
ibcwsvP1K2sqF9TtbDzRMdqw5GOdHIUd0Ml0Tb8Sg+kSxdhkhgBUslZW77FrEWMS
HJD1rw77VUL+v7BzKBKl7mLXlfaNpmfkXWJTABEBAAG0RHN5c3RlbXNtYW5hZ2Vt
ZW50IE9CUyBQcm9qZWN0IDxzeXN0ZW1zbWFuYWdlbWVudEBidWlsZC5vcGVuc3Vz
ZS5vcmc+iQE+BBMBCAAoBQJlcECTAhsDBQkOZdY0BgsJCAcDAgYVCAIJCgsEFgID
AQIeAQIXgAAKCRCsqpz35uWiE9NYCAC4BiV/CV/9QzWbwUup/pmLOD84JPo72C15
Z+FARqk2LS5JhfxZRFaG13S2/+Ua3gN4RG0WqOxRaA6oKPs2V81X3I3ysq9660MW
4qPbhGVZaBzPLat+9Q6MaRaqu9G3sEePGDWR1sR3s/d3pJl0kRK2fyQILnUx65zb
r77ErCox/kwAB5bu5Nv9d4YuwS7oY+b1Nw1vvmmBu8z8acd6iNX5inIX+Oy06WTE
lO0gh54GjVWIK1WlJYcV73GIu2jUBQJhP3GAaf9kp2Mtv/W9+D2XxGaFslZShiMp
/FBcmYQeJAfh8WmxdWFZRlvbpqNbC6Gxmb/+euIZz43U6B1qQhRgiEYEExECAAYF
AlspGl8ACgkQOzARt2udZSOfAACdEKhSoziJSqKEvrsGEBq0QNc4CwcAniYQosXY
+OdtQPCAY1lf4oqKOLpD
=/8kX
-----END PGP PUBLIC KEY BLOCK-----
4 changes: 2 additions & 2 deletions salt/salt_testenv/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,11 @@ install_salt_bundle_testsuite:
{% if grains['os_family'] == 'Suse' and grains['osfullname'] == 'SL-Micro' %}
copy_salt_classic_testsuite:
cmd.run:
- name: transactional-update -c run cp -r /usr/lib/python3.{{ grains["pythonversion"][1] }}/site-packages/salt-testsuite /var/tmp/salt-testsuite-classic
- name: transactional-update -c run cp -r /usr/lib/python3.{{ grains["pythonversion"][1] }}/site-packages/salt-testsuite /opt/salt-testsuite-classic

copy_salt_bundle_testsuite:
cmd.run:
- name: transactional-update -c run cp -r /usr/lib/venv-salt-minion/lib/python3.{{ grains["pythonversion"][1] }}/site-packages/salt-testsuite /var/tmp/salt-testsuite-bundle
- name: transactional-update -c run cp -r /usr/lib/venv-salt-minion/lib/python3.{{ grains["pythonversion"][1] }}/site-packages/salt-testsuite /opt/salt-testsuite-bundle

reboot_transactional_system:
module.run:
Expand Down
Loading