zuul/zuul
Code Issues Proposed changes

Merge "Launcher: move key-name in test fixtures"

Browse Source
This commit is contained in:
Zuul
2025-02-10 09:17:59 +00:00
committed by Gerrit Code Review
parent a6f1002253 5dc2b41793
commit 22a32bf8c5
7 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/fixtures/config/launcher-min-ready/git/common-config/zuul.yaml vendored
View File

@@ -107,8 +107,7 @@
launch-attempts: 2
object-storage:
bucket-name: zuul
# TODO
# key-name: zuul
key-name: zuul
flavors:
- name: normal
instance-type: t3.medium
@@ -151,10 +150,6 @@
section: aws-us-east-1
labels:
- name: debian-normal
key-name: zuul
- name: debian-large
key-name: zuul
- name: debian-dedicated
key-name: zuul
- name: debian-invalid
key-name: zuul

2
tests/fixtures/config/launcher-min-ready/git/org_project1/zuul.yaml vendored
View File

@@ -10,14 +10,12 @@
section: aws-eu-central-1
labels:
- name: debian-emea
key-name: zuul
- provider:
name: aws-ca-central-1-main
section: aws-ca-central-1
labels:
- name: debian-normal
key-name: zuul
- project:
check:

4
tests/fixtures/layouts/nodepool-empty-nodeset.yaml vendored
View File

@@ -72,8 +72,7 @@
launch-attempts: 2
object-storage:
bucket-name: zuul
# TODO
# key-name: zuul
key-name: zuul
flavors:
- name: normal
instance-type: t3.medium
@@ -95,4 +94,3 @@
section: aws-us-east-1
labels:
- name: debian-normal
key-name: zuul

3
tests/fixtures/layouts/nodepool-image.yaml vendored
View File

@@ -156,6 +156,7 @@
launch-timeout: 600
object-storage:
bucket-name: zuul
key-name: zuul
flavors:
- name: normal
instance-type: t3.medium
@@ -177,6 +178,4 @@
section: aws-us-east-1
labels:
- name: debian-normal
key-name: zuul
- name: debian-local-normal
key-name: zuul

7
tests/fixtures/layouts/nodepool-missing-connection.yaml vendored
View File

@@ -130,8 +130,7 @@
launch-attempts: 2
object-storage:
bucket-name: zuul
# TODO
# key-name: zuul
key-name: zuul
flavors:
- name: normal
instance-type: t3.medium
@@ -156,10 +155,6 @@
section: aws-us-east-1
labels:
- name: debian-normal
key-name: zuul
- name: debian-large
key-name: zuul
- name: debian-dedicated
key-name: zuul
- name: debian-invalid
key-name: zuul

7
tests/fixtures/layouts/nodepool-nodescan.yaml vendored
View File

@@ -130,8 +130,7 @@
launch-attempts: 2
object-storage:
bucket-name: zuul
# TODO
# key-name: zuul
key-name: zuul
flavors:
- name: normal
instance-type: t3.medium
@@ -160,15 +159,11 @@
section: aws-us-east-1
labels:
- name: debian-normal
key-name: zuul
volume-type: gp3
volume-size: 40
# Change iops and omit throughput to test label overriding the
# flavor
iops: 1000
- name: debian-large
key-name: zuul
- name: debian-dedicated
key-name: zuul
- name: debian-invalid
key-name: zuul

7
tests/fixtures/layouts/nodepool.yaml vendored
View File

@@ -130,8 +130,7 @@
launch-attempts: 2
object-storage:
bucket-name: zuul
# TODO
# key-name: zuul
key-name: zuul
flavors:
- name: normal
instance-type: t3.medium
@@ -160,15 +159,11 @@
section: aws-us-east-1
labels:
- name: debian-normal
key-name: zuul
volume-type: gp3
volume-size: 40
# Change iops and omit throughput to test label overriding the
# flavor
iops: 1000
- name: debian-large
key-name: zuul
- name: debian-dedicated
key-name: zuul
- name: debian-invalid
key-name: zuul