-
Notifications
You must be signed in to change notification settings - Fork 2.1k
core-services/prow/02_config/generate-boskos: For spitting out lots of names #11752
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
Merged
openshift-merge-robot
merged 2 commits into
openshift:master
from
wking:per-region-leases
Oct 8, 2020
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| approvers: | ||
| - dptp | ||
| - wking |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,78 +1,78 @@ | ||
| --- | ||
| # generated with generate-boskos.py; do not edit directly | ||
| resources: | ||
| - type: aws-quota-slice | ||
| state: free | ||
| - max-count: 150 | ||
| min-count: 150 | ||
| max-count: 150 | ||
| - type: azure4-quota-slice | ||
| state: free | ||
| type: aws-quota-slice | ||
| - max-count: 30 | ||
| min-count: 30 | ||
| max-count: 30 | ||
| - type: gcp-quota-slice | ||
| state: free | ||
| type: azure4-quota-slice | ||
| - max-count: 120 | ||
| min-count: 120 | ||
| max-count: 120 | ||
| - type: libvirt-s390x-quota-slice | ||
| state: free | ||
| names: | ||
| - "libvirt-s390x-0-0" | ||
| - "libvirt-s390x-0-1" | ||
| - "libvirt-s390x-0-2" | ||
| - "libvirt-s390x-0-3" | ||
| - "libvirt-s390x-0-4" | ||
| - type: libvirt-ppc64le-quota-slice | ||
| type: gcp-quota-slice | ||
| - names: | ||
| - libvirt-ppc64le-0-0 | ||
| - libvirt-ppc64le-0-1 | ||
| - libvirt-ppc64le-0-2 | ||
| - libvirt-ppc64le-0-3 | ||
| - libvirt-ppc64le-1-0 | ||
| - libvirt-ppc64le-1-1 | ||
| - libvirt-ppc64le-1-2 | ||
| - libvirt-ppc64le-1-3 | ||
| state: free | ||
| names: | ||
| - "libvirt-ppc64le-0-0" | ||
| - "libvirt-ppc64le-0-1" | ||
| - "libvirt-ppc64le-0-2" | ||
| - "libvirt-ppc64le-0-3" | ||
| - "libvirt-ppc64le-1-0" | ||
| - "libvirt-ppc64le-1-1" | ||
| - "libvirt-ppc64le-1-2" | ||
| - "libvirt-ppc64le-1-3" | ||
| - type: metal-quota-slice | ||
| type: libvirt-ppc64le-quota-slice | ||
| - names: | ||
| - libvirt-s390x-0-0 | ||
| - libvirt-s390x-0-1 | ||
| - libvirt-s390x-0-2 | ||
| - libvirt-s390x-0-3 | ||
| - libvirt-s390x-0-4 | ||
| state: free | ||
| type: libvirt-s390x-quota-slice | ||
| - max-count: 1000 | ||
| min-count: 1000 | ||
| max-count: 1000 | ||
| - type: openstack-quota-slice | ||
| state: free | ||
| type: metal-quota-slice | ||
| - names: | ||
| - openstack-osuosl-ppc64le-01 | ||
| - openstack-osuosl-ppc64le-02 | ||
| - openstack-osuosl-ppc64le-03 | ||
| - openstack-osuosl-ppc64le-04 | ||
| state: free | ||
| type: openstack-osuosl-ppc64le-quota-slice | ||
| - names: | ||
| - openstack-ppc64le-00 | ||
| - openstack-ppc64le-01 | ||
| - openstack-ppc64le-02 | ||
| - openstack-ppc64le-03 | ||
| state: free | ||
| type: openstack-ppc64le-quota-slice | ||
| - max-count: 7 | ||
| min-count: 7 | ||
| max-count: 7 | ||
| - type: openstack-vexxhost-quota-slice | ||
| state: free | ||
| type: openstack-quota-slice | ||
| - max-count: 3 | ||
| min-count: 3 | ||
| max-count: 3 | ||
| - type: openstack-ppc64le-quota-slice | ||
| state: free | ||
| names: | ||
| - "openstack-ppc64le-00" | ||
| - "openstack-ppc64le-01" | ||
| - "openstack-ppc64le-02" | ||
| - "openstack-ppc64le-03" | ||
| - type: openstack-osuosl-ppc64le-quota-slice | ||
| type: openstack-vexxhost-quota-slice | ||
| - names: | ||
| - ovirt-10 | ||
| - ovirt-11 | ||
| - ovirt-12 | ||
| - ovirt-13 | ||
| - ovirt-14 | ||
| - ovirt-15 | ||
| - ovirt-16 | ||
| - ovirt-17 | ||
| state: free | ||
| names: | ||
| - "openstack-osuosl-ppc64le-01" | ||
| - "openstack-osuosl-ppc64le-02" | ||
| - "openstack-osuosl-ppc64le-03" | ||
| - "openstack-osuosl-ppc64le-04" | ||
| - type: vsphere-quota-slice | ||
| type: ovirt-quota-slice | ||
| - max-count: 20 | ||
| min-count: 20 | ||
| state: free | ||
| type: packet-quota-slice | ||
| - max-count: 10 | ||
| min-count: 10 | ||
| max-count: 10 | ||
| - type: ovirt-quota-slice | ||
| state: free | ||
| names: | ||
| - "ovirt-10" | ||
| - "ovirt-11" | ||
| - "ovirt-12" | ||
| - "ovirt-13" | ||
| - "ovirt-14" | ||
| - "ovirt-15" | ||
| - "ovirt-16" | ||
| - "ovirt-17" | ||
| - type: packet-quota-slice | ||
| state: free | ||
| min-count: 20 | ||
| max-count: 20 | ||
| type: vsphere-quota-slice |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| #!/usr/bin/env python3 | ||
|
|
||
| import yaml | ||
|
|
||
|
|
||
| CONFIG = { | ||
| 'aws-quota-slice': { | ||
| 'default': 150, | ||
| }, | ||
| 'azure4-quota-slice': { | ||
| 'default': 30, | ||
| }, | ||
| 'gcp-quota-slice': { | ||
| 'default': 120, | ||
| }, | ||
| 'libvirt-s390x-quota-slice': {}, | ||
| 'libvirt-ppc64le-quota-slice': {}, | ||
| 'metal-quota-slice': { | ||
| # Wild guesses. We'll see when we hit quota issues | ||
| 'default': 1000, | ||
| }, | ||
| 'openstack-osuosl-ppc64le-quota-slice': {}, | ||
| 'openstack-quota-slice': { | ||
| 'default': 7, | ||
| }, | ||
| 'openstack-vexxhost-quota-slice': { | ||
| 'default': 3, | ||
| }, | ||
| 'openstack-ppc64le-quota-slice': {}, | ||
| 'ovirt-quota-slice': {}, | ||
| 'packet-quota-slice': { | ||
| 'default': 20, | ||
| }, | ||
| 'vsphere-quota-slice': { | ||
| 'default': 10, | ||
| }, | ||
| } | ||
|
|
||
| for i in range(1): | ||
| for j in range(5): | ||
| CONFIG['libvirt-s390x-quota-slice']['libvirt-s390x-{}-{}'.format(i, j)] = 1 | ||
|
|
||
| for i in range(2): | ||
| for j in range(4): | ||
| CONFIG['libvirt-ppc64le-quota-slice']['libvirt-ppc64le-{}-{}'.format(i, j)] = 1 | ||
|
|
||
| for i in range(1, 5): | ||
| CONFIG['openstack-osuosl-ppc64le-quota-slice']['openstack-osuosl-ppc64le-{0:0>2}'.format(i)] = 1 | ||
|
|
||
| for i in range(4): | ||
| CONFIG['openstack-ppc64le-quota-slice']['openstack-ppc64le-{0:0>2}'.format(i)] = 1 | ||
|
|
||
| for i in range(10, 18): | ||
| CONFIG['ovirt-quota-slice']['ovirt-{}'.format(i)] = 1 | ||
|
|
||
| config = { | ||
| 'resources': [], | ||
| } | ||
|
|
||
| for typeName, data in sorted(CONFIG.items()): | ||
| resource = { | ||
| 'type': typeName, | ||
| 'state': 'free', | ||
| } | ||
| if set(data.keys()) == {'default'}: | ||
| resource['min-count'] = resource['max-count'] = data['default'] | ||
| else: | ||
| resource['names'] = [] | ||
| for name, count in sorted(data.items()): | ||
| resource['names'].extend([name]*count) | ||
| config['resources'].append(resource) | ||
|
|
||
| with open('_boskos.yaml', 'w') as f: | ||
| f.write('# generated with generate-boskos.py; do not edit directly\n') | ||
| yaml.dump(config, f, default_flow_style=False) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| #!/bin/bash | ||
|
|
||
| # This script ensures that the Boskos configuration checked into git is up-to-date | ||
| # with the generator. If it is not, re-generate the configuration to update it. | ||
|
|
||
| set -o errexit | ||
| set -o nounset | ||
| set -o pipefail | ||
|
|
||
| base_dir=. | ||
|
|
||
| cd "${base_dir}/core-services/prow/02_config" | ||
| ORIGINAL="$(cat _boskos.yaml)" | ||
| ./generate-boskos.py | ||
| DIFF="$(diff -u <(echo "${ORIGINAL}") _boskos.yaml || true)" | ||
| if test -n "${DIFF}" | ||
| then | ||
| cat << EOF | ||
| ERROR: This check enforces that the Boskos configuration is generated | ||
| ERROR: correctly. We have automation in place that updates the configuration and | ||
| ERROR: new changes to the configuration should be followed with a re-generation. | ||
|
|
||
| ERROR: Run the following command to re-generate the Boskos configuration: | ||
| ERROR: $ make boskos-config | ||
|
|
||
| ERROR: The following errors were found: | ||
|
|
||
| EOF | ||
| echo "${DIFF}" | ||
| exit 1 | ||
| fi |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
code golf:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fine with me. File a PR?