diff --git a/core-services/prow/02_config/_boskos.yaml b/core-services/prow/02_config/_boskos.yaml index 626cd817354f7..48954e116966a 100644 --- a/core-services/prow/02_config/_boskos.yaml +++ b/core-services/prow/02_config/_boskos.yaml @@ -1,15 +1,378 @@ # generated with generate-boskos.py; do not edit directly resources: -- max-count: 150 - min-count: 150 +- names: + - us-east-1--00 + - us-east-1--01 + - us-east-1--02 + - us-east-1--03 + - us-east-1--04 + - us-east-1--05 + - us-east-1--06 + - us-east-1--07 + - us-east-1--08 + - us-east-1--09 + - us-east-1--10 + - us-east-1--11 + - us-east-1--12 + - us-east-1--13 + - us-east-1--14 + - us-east-1--15 + - us-east-1--16 + - us-east-1--17 + - us-east-1--18 + - us-east-1--19 + - us-east-1--20 + - us-east-1--21 + - us-east-1--22 + - us-east-1--23 + - us-east-1--24 + - us-east-1--25 + - us-east-1--26 + - us-east-1--27 + - us-east-1--28 + - us-east-1--29 + - us-east-1--30 + - us-east-1--31 + - us-east-1--32 + - us-east-1--33 + - us-east-1--34 + - us-east-1--35 + - us-east-1--36 + - us-east-1--37 + - us-east-1--38 + - us-east-1--39 + - us-east-1--40 + - us-east-1--41 + - us-east-1--42 + - us-east-1--43 + - us-east-1--44 + - us-east-1--45 + - us-east-1--46 + - us-east-1--47 + - us-east-1--48 + - us-east-1--49 + - us-east-2--00 + - us-east-2--01 + - us-east-2--02 + - us-east-2--03 + - us-east-2--04 + - us-east-2--05 + - us-east-2--06 + - us-east-2--07 + - us-east-2--08 + - us-east-2--09 + - us-east-2--10 + - us-east-2--11 + - us-east-2--12 + - us-east-2--13 + - us-east-2--14 + - us-east-2--15 + - us-east-2--16 + - us-east-2--17 + - us-east-2--18 + - us-east-2--19 + - us-east-2--20 + - us-east-2--21 + - us-east-2--22 + - us-east-2--23 + - us-east-2--24 + - us-east-2--25 + - us-east-2--26 + - us-east-2--27 + - us-east-2--28 + - us-east-2--29 + - us-east-2--30 + - us-east-2--31 + - us-east-2--32 + - us-east-2--33 + - us-east-2--34 + - us-east-2--35 + - us-east-2--36 + - us-east-2--37 + - us-east-2--38 + - us-east-2--39 + - us-east-2--40 + - us-east-2--41 + - us-east-2--42 + - us-east-2--43 + - us-east-2--44 + - us-east-2--45 + - us-east-2--46 + - us-east-2--47 + - us-east-2--48 + - us-east-2--49 + - us-west-1--00 + - us-west-1--01 + - us-west-1--02 + - us-west-1--03 + - us-west-1--04 + - us-west-1--05 + - us-west-1--06 + - us-west-1--07 + - us-west-1--08 + - us-west-1--09 + - us-west-1--10 + - us-west-1--11 + - us-west-1--12 + - us-west-1--13 + - us-west-1--14 + - us-west-1--15 + - us-west-1--16 + - us-west-1--17 + - us-west-1--18 + - us-west-1--19 + - us-west-1--20 + - us-west-1--21 + - us-west-1--22 + - us-west-1--23 + - us-west-1--24 + - us-west-1--25 + - us-west-1--26 + - us-west-1--27 + - us-west-1--28 + - us-west-1--29 + - us-west-1--30 + - us-west-1--31 + - us-west-1--32 + - us-west-1--33 + - us-west-1--34 + - us-west-1--35 + - us-west-1--36 + - us-west-1--37 + - us-west-1--38 + - us-west-1--39 + - us-west-1--40 + - us-west-1--41 + - us-west-1--42 + - us-west-1--43 + - us-west-1--44 + - us-west-1--45 + - us-west-1--46 + - us-west-1--47 + - us-west-1--48 + - us-west-1--49 + - us-west-2--00 + - us-west-2--01 + - us-west-2--02 + - us-west-2--03 + - us-west-2--04 + - us-west-2--05 + - us-west-2--06 + - us-west-2--07 + - us-west-2--08 + - us-west-2--09 + - us-west-2--10 + - us-west-2--11 + - us-west-2--12 + - us-west-2--13 + - us-west-2--14 + - us-west-2--15 + - us-west-2--16 + - us-west-2--17 + - us-west-2--18 + - us-west-2--19 + - us-west-2--20 + - us-west-2--21 + - us-west-2--22 + - us-west-2--23 + - us-west-2--24 + - us-west-2--25 + - us-west-2--26 + - us-west-2--27 + - us-west-2--28 + - us-west-2--29 + - us-west-2--30 + - us-west-2--31 + - us-west-2--32 + - us-west-2--33 + - us-west-2--34 + - us-west-2--35 + - us-west-2--36 + - us-west-2--37 + - us-west-2--38 + - us-west-2--39 + - us-west-2--40 + - us-west-2--41 + - us-west-2--42 + - us-west-2--43 + - us-west-2--44 + - us-west-2--45 + - us-west-2--46 + - us-west-2--47 + - us-west-2--48 + - us-west-2--49 state: free type: aws-quota-slice -- max-count: 30 - min-count: 30 +- names: + - centralus--00 + - centralus--01 + - centralus--02 + - centralus--03 + - centralus--04 + - centralus--05 + - centralus--06 + - centralus--07 + - centralus--08 + - centralus--09 + - centralus--10 + - centralus--11 + - centralus--12 + - centralus--13 + - centralus--14 + - centralus--15 + - eastus1--0 + - eastus1--1 + - eastus1--2 + - eastus1--3 + - eastus1--4 + - eastus1--5 + - eastus1--6 + - eastus1--7 + - eastus1--8 + - eastus1--9 + - eastus2--0 + - eastus2--1 + - eastus2--2 + - eastus2--3 + - eastus2--4 + - eastus2--5 + - eastus2--6 + - eastus2--7 + - eastus2--8 + - eastus2--9 + - westus--0 + - westus--1 + - westus--2 + - westus--3 + - westus--4 + - westus--5 + - westus--6 + - westus--7 + - westus--8 + - westus--9 state: free type: azure4-quota-slice -- max-count: 120 - min-count: 120 +- names: + - us-east1--000 + - us-east1--001 + - us-east1--002 + - us-east1--003 + - us-east1--004 + - us-east1--005 + - us-east1--006 + - us-east1--007 + - us-east1--008 + - us-east1--009 + - us-east1--010 + - us-east1--011 + - us-east1--012 + - us-east1--013 + - us-east1--014 + - us-east1--015 + - us-east1--016 + - us-east1--017 + - us-east1--018 + - us-east1--019 + - us-east1--020 + - us-east1--021 + - us-east1--022 + - us-east1--023 + - us-east1--024 + - us-east1--025 + - us-east1--026 + - us-east1--027 + - us-east1--028 + - us-east1--029 + - us-east1--030 + - us-east1--031 + - us-east1--032 + - us-east1--033 + - us-east1--034 + - us-east1--035 + - us-east1--036 + - us-east1--037 + - us-east1--038 + - us-east1--039 + - us-east1--040 + - us-east1--041 + - us-east1--042 + - us-east1--043 + - us-east1--044 + - us-east1--045 + - us-east1--046 + - us-east1--047 + - us-east1--048 + - us-east1--049 + - us-east1--050 + - us-east1--051 + - us-east1--052 + - us-east1--053 + - us-east1--054 + - us-east1--055 + - us-east1--056 + - us-east1--057 + - us-east1--058 + - us-east1--059 + - us-east1--060 + - us-east1--061 + - us-east1--062 + - us-east1--063 + - us-east1--064 + - us-east1--065 + - us-east1--066 + - us-east1--067 + - us-east1--068 + - us-east1--069 + - us-east1--070 + - us-east1--071 + - us-east1--072 + - us-east1--073 + - us-east1--074 + - us-east1--075 + - us-east1--076 + - us-east1--077 + - us-east1--078 + - us-east1--079 + - us-east1--080 + - us-east1--081 + - us-east1--082 + - us-east1--083 + - us-east1--084 + - us-east1--085 + - us-east1--086 + - us-east1--087 + - us-east1--088 + - us-east1--089 + - us-east1--090 + - us-east1--091 + - us-east1--092 + - us-east1--093 + - us-east1--094 + - us-east1--095 + - us-east1--096 + - us-east1--097 + - us-east1--098 + - us-east1--099 + - us-east1--100 + - us-east1--101 + - us-east1--102 + - us-east1--103 + - us-east1--104 + - us-east1--105 + - us-east1--106 + - us-east1--107 + - us-east1--108 + - us-east1--109 + - us-east1--110 + - us-east1--111 + - us-east1--112 + - us-east1--113 + - us-east1--114 + - us-east1--115 + - us-east1--116 + - us-east1--117 + - us-east1--118 + - us-east1--119 state: free type: gcp-quota-slice - names: diff --git a/core-services/prow/02_config/generate-boskos.py b/core-services/prow/02_config/generate-boskos.py index dfc39c4507afc..e23d88d5d36ec 100755 --- a/core-services/prow/02_config/generate-boskos.py +++ b/core-services/prow/02_config/generate-boskos.py @@ -5,13 +5,23 @@ CONFIG = { 'aws-quota-slice': { - 'default': 150, + # Wild guesses. We'll see when we hit quota issues + 'us-east-1': 50, + 'us-east-2': 50, + 'us-west-1': 50, + 'us-west-2': 50, }, 'azure4-quota-slice': { - 'default': 30, + # Cannot create more than 50 public IP addresses for this subscription in this region. + # and each cluster needs three of public IPs: https://docs.openshift.com/container-platform/4.5/installing/installing_azure/installing-azure-account.html#installation-azure-limits_installing-azure-account + 'centralus': 16, + # Wild guesses. We'll see when we hit quota issues + 'eastus1': 10, + 'eastus2': 10, + 'westus': 10 }, 'gcp-quota-slice': { - 'default': 120, + 'us-east1': 120, }, 'libvirt-s390x-quota-slice': {}, 'libvirt-ppc64le-quota-slice': {}, @@ -67,7 +77,13 @@ else: resource['names'] = [] for name, count in sorted(data.items()): - resource['names'].extend([name]*count) + if '--' in name: + raise ValueError('double-dashes are used internally, so {!r} is invalid'.format(name)) + if count > 1: + width = len(str(count-1)) + resource['names'].extend(['{name}--{i:0>{width}}'.format(name=name, i=i, width=width) for i in range(count)]) + else: + resource['names'].append(name) config['resources'].append(resource) with open('_boskos.yaml', 'w') as f: