zuul
/
zuul
Code Issues Proposed changes

Merge "Test base job secrets"

This commit is contained in:
Zuul 2018-04-19 17:53:27 +00:00 committed by Gerrit Code Review
parent ee54c532cf 398c3810ec
commit ef1c43b13b
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/fixtures/config/secret-inheritance/git/common-config/playbooks/base-pre.yaml vendored Normal file
View File

@ -0,0 +1,2 @@
- hosts: all
tasks: []

8
tests/fixtures/config/secret-inheritance/git/common-config/zuul.yaml vendored
View File

@ -35,6 +35,9 @@
- job:
name: base
parent: null
pre-run: playbooks/base-pre.yaml
secrets:
- base-secret
- job:
name: trusted-secrets
@ -104,3 +107,8 @@
naHKZYT7nkrJm8AMCgZU0ZArFLpaufKCeiK5ECSsDxic4FIsY1OkWT42qEUfL0Wd+150
AKGNZpPJnnP3QYY4W/MWcKH/zdO400+zWN52WevbSqZy90tqKDJrBkMl1ydqbuw1E4ZH
vIs=
- secret:
name: base-secret
data:
username: base-username

20
tests/unit/test_v3.py
View File

@ -3086,11 +3086,13 @@ class TestSecretInheritance(ZuulTestCase):
secret = {'longpassword': 'test-passwordtest-password',
'password': 'test-password',
'username': 'test-username'}
base_secret = {'username': 'base-username'}
self.assertEqual(
self._getSecrets('trusted-secrets', 'playbooks'),
[{'trusted-secret': secret}])
self.assertEqual(
self._getSecrets('trusted-secrets', 'pre_playbooks'), [])
self._getSecrets('trusted-secrets', 'pre_playbooks'),
[{'base-secret': base_secret}])
self.assertEqual(
self._getSecrets('trusted-secrets', 'post_playbooks'), [])
@ -3099,7 +3101,8 @@ class TestSecretInheritance(ZuulTestCase):
'playbooks'), [{}])
self.assertEqual(
self._getSecrets('trusted-secrets-trusted-child',
'pre_playbooks'), [])
'pre_playbooks'),
[{'base-secret': base_secret}])
self.assertEqual(
self._getSecrets('trusted-secrets-trusted-child',
'post_playbooks'), [])
@ -3109,7 +3112,8 @@ class TestSecretInheritance(ZuulTestCase):
'playbooks'), [{}])
self.assertEqual(
self._getSecrets('trusted-secrets-untrusted-child',
'pre_playbooks'), [])
'pre_playbooks'),
[{'base-secret': base_secret}])
self.assertEqual(
self._getSecrets('trusted-secrets-untrusted-child',
'post_playbooks'), [])
@ -3118,11 +3122,13 @@ class TestSecretInheritance(ZuulTestCase):
secret = {'longpassword': 'test-passwordtest-password',
'password': 'test-password',
'username': 'test-username'}
base_secret = {'username': 'base-username'}
self.assertEqual(
self._getSecrets('untrusted-secrets', 'playbooks'),
[{'untrusted-secret': secret}])
self.assertEqual(
self._getSecrets('untrusted-secrets', 'pre_playbooks'), [])
self._getSecrets('untrusted-secrets', 'pre_playbooks'),
[{'base-secret': base_secret}])
self.assertEqual(
self._getSecrets('untrusted-secrets', 'post_playbooks'), [])
@ -3131,7 +3137,8 @@ class TestSecretInheritance(ZuulTestCase):
'playbooks'), [{}])
self.assertEqual(
self._getSecrets('untrusted-secrets-trusted-child',
'pre_playbooks'), [])
'pre_playbooks'),
[{'base-secret': base_secret}])
self.assertEqual(
self._getSecrets('untrusted-secrets-trusted-child',
'post_playbooks'), [])
@ -3141,7 +3148,8 @@ class TestSecretInheritance(ZuulTestCase):
'playbooks'), [{}])
self.assertEqual(
self._getSecrets('untrusted-secrets-untrusted-child',
'pre_playbooks'), [])
'pre_playbooks'),
[{'base-secret': base_secret}])
self.assertEqual(
self._getSecrets('untrusted-secrets-untrusted-child',
'post_playbooks'), [])