Skip to content

Commit 5895cca

Browse files
authored
Merge pull request #1183 from moreati/issue1182
CI: Fix incorrect u=r,g=r,o=rw file permissions on mitogen__has_sudo_pubkey.key
2 parents a35b208 + 43cc937 commit 5895cca

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.ci/ansible_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def pause_if_interactive():
4141

4242
with ci_lib.Fold('job_setup'):
4343
os.chdir(TESTS_DIR)
44-
os.chmod('../data/docker/mitogen__has_sudo_pubkey.key', int('0600', 7))
44+
os.chmod('../data/docker/mitogen__has_sudo_pubkey.key', int('0600', 8))
4545

4646
ci_lib.run("mkdir %s", HOSTS_DIR)
4747
for path in glob.glob(TESTS_DIR + '/hosts/*'):

docs/changelog.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ To avail of fixes in an unreleased version, please download a ZIP file
2121
In progress (unreleased)
2222
------------------------
2323

24+
* :gh:issue:`1182` CI: Fix incorrect world readable/writable file permissions
25+
on SSH key ``mitogen__has_sudo_pubkey.key`` during Ansible tests.
2426

2527

2628
v0.3.16 (2024-11-05)

tests/ansible/integration/ssh/variables.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
-o "ControlPath /tmp/mitogen-ansible-test-{{18446744073709551615|random}}"
1414
1515
tasks:
16-
- name: setup ansible_ssh_private_key_file
17-
shell: chmod 0600 ../data/docker/mitogen__has_sudo_pubkey.key
18-
args:
19-
chdir: ../..
20-
2116
- name: ansible_user, ansible_ssh_private_key_file
2217
shell: >
2318
ANSIBLE_ANY_ERRORS_FATAL=false
@@ -34,6 +29,7 @@
3429
args:
3530
chdir: ../..
3631
register: out
32+
changed_when: false
3733

3834
- name: ansible_user, wrong ansible_ssh_private_key_file
3935
shell: >
@@ -52,6 +48,7 @@
5248
args:
5349
chdir: ../..
5450
register: out
51+
changed_when: false
5552
ignore_errors: true
5653

5754
- assert:

0 commit comments

Comments
 (0)