Remove 'auth' dict from jobs
The only thing left in it is the list of secrets; just put that
on the job itself.
Change-Id: I36fb0fe1658de5b776f4843432f1c9965379a2ea
diff --git a/tests/fixtures/config/ansible/git/common-config/zuul.yaml b/tests/fixtures/config/ansible/git/common-config/zuul.yaml
index c70191f..ba6227b 100644
--- a/tests/fixtures/config/ansible/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/ansible/git/common-config/zuul.yaml
@@ -87,9 +87,8 @@
flagpath: '{{zuul._test.test_root}}/{{zuul.build}}.flag'
roles:
- zuul: bare-role
- auth:
- secrets:
- - test_secret
+ secrets:
+ - test_secret
- job:
parent: python27
@@ -106,10 +105,9 @@
vartest_job: vartest_job
vartest_secret: vartest_job
vartest_site: vartest_job
- auth:
- secrets:
- - vartest_site
- - vartest_secret
+ secrets:
+ - vartest_site
+ - vartest_secret
- job:
parent: base-urls
diff --git a/tests/unit/test_model.py b/tests/unit/test_model.py
index 00f2592..9cc7195 100644
--- a/tests/unit/test_model.py
+++ b/tests/unit/test_model.py
@@ -410,11 +410,9 @@
'name': 'trusted-secrets',
'parent': 'base',
'timeout': 40,
- 'auth': {
- 'secrets': [
- 'trusted-secret',
- ]
- }
+ 'secrets': [
+ 'trusted-secret',
+ ]
})
layout.addJob(trusted_secrets_job)
untrusted_secrets_job = configloader.JobParser.fromYaml(
@@ -424,11 +422,9 @@
'name': 'untrusted-secrets',
'parent': 'base',
'timeout': 40,
- 'auth': {
- 'secrets': [
- 'untrusted-secret',
- ]
- }
+ 'secrets': [
+ 'untrusted-secret',
+ ]
})
layout.addJob(untrusted_secrets_job)
trusted_secrets_trusted_child_job = configloader.JobParser.fromYaml(