X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jenkins-admin%2Fcreate_jenkins_clouds_openstack_yaml.py;h=d3424698bfb6d958d1d74afa0e5616142a805ea2;hb=2c01d1c4b9b284118e2854494366e76d41e447f8;hp=ec11f455ecc845ddabcce32af5cc631481e6c390;hpb=9245b69650c0192d8793a3378271237070339be5;p=releng%2Fglobal-jjb.git

diff --git a/jenkins-admin/create_jenkins_clouds_openstack_yaml.py b/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
index ec11f455..d3424698 100755
--- a/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
+++ b/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
@@ -56,14 +56,30 @@ lookuptable = {
     "v2-standard-8": "e6fe2e37-0e38-438c-8fa5-fc2d79d0a7bb",
     "v2-standard-16": "9e4b01cd-6744-4120-aafe-1b5e17584919",
     "v2-standard-360": "f0d27f44-a410-4f0f-9781-d722f5b5489e",
+    "v3-standard-1": "555dff3a-7ec2-437e-bfc7-5a00113a304d",
     "v3-standard-2": "d6906d2a-e83f-42be-b33e-fbaeb5c511cb",
     "v3-standard-4": "5f1eb09f-e764-4642-a16f-a7230ec025e7",
+    "v3-standard-6": "e145dc6b-7560-4633-ab6e-430028fd877f",
     "v3-standard-8": "47d3707a-c6c6-46ea-a15b-095e336b1edc",
     "v3-standard-16": "8587d458-69de-4fc5-be51-c5e671bc35d5",
+    "v3-standard-20": "6baabd68-258c-4fdc-b0ba-5a77c5b89c21",
+    "v3-standard-24": "cec3e6ff-667e-431c-9c14-ba7c1d9b4cc2",
     "v3-standard-32": "3e01b39f-45a9-4b7b-b6dc-14378433dc36",
     "v3-standard-48": "06a0e8b7-949a-439d-a185-208ae9e645b2",
     "v3-standard-64": "402a2759-cc01-481d-a8b7-2c7056f153f7",
-    "v3-standard-96": "883b0564-dec6-4e51-88c7-83d86994fcf0"
+    "v3-standard-96": "883b0564-dec6-4e51-88c7-83d86994fcf0",
+    "v3-starter-1": "4d2a0d31-ebe9-4b99-a6d1-96c075b6c239",
+    "v3-starter-2": "b542cedb-d3b4-4446-a43f-5416711440ee",
+    "v3-starter-4": "5f93acce-e8dc-482b-9118-134728a77aa8",
+    "v3-starter-6": "c5a671a2-2db5-4ffe-b681-ff77ec18bbe5",
+    "v3-starter-8": "35c0ddb3-4dd8-478c-887c-34620851a66a",
+    "v3-starter-16": "595dd716-6c7a-4365-9020-2ff10796e29c",
+    "v3-starter-20": "3e8f788c-50ed-48c5-875e-5dfb3814d1f6",
+    "v3-starter-24": "eb1af7f9-6b54-4780-a7e6-f76813106227",
+    "v3-starter-32": "15949005-7952-4e93-be69-ca89dab5b884",
+    "v3-starter-48": "94eb4cec-3840-4171-ad50-a8bce2757d11",
+    "v3-starter-64": "4a6e52a2-8f64-4632-adde-72f81616d4f9",
+    "v3-starter-96": "8e7205fc-3ec7-456c-bff0-e38609e415c1",
 }
 maintemplate = """\
 ---
@@ -77,9 +93,10 @@ jenkins:
         slaveOptions:
           availabilityZone: {{ availability_zone }}
           bootSource:
-            volumeFromImage:
+            {{ image_type }}:
               name: {{ image_name }}
-              volumeSize: {{ volume_size }}
+{%- if image_type == "volumeFromImage"  %}
+              volumeSize: {{ volume_size }}{% endif %}
           fsRoot: {{ fs_root }}
           hardwareId: {{ hardware_id }}
 {%- if is_sandbox is defined %}
@@ -97,7 +114,7 @@ jenkins:
 """
 machinetemplate = """\
           - labels: {{ labels }}
-            name: {{ name_prefix }}-{{ labels }}
+            name: {{ name_prefix }}-{{ agent_name }}
             slaveOptions:
               bootSource:
                 {{ image_type }}:
@@ -109,7 +126,7 @@ machinetemplate = """\
 {%- if instance_cap %}
               instanceCap: {{ instance_cap }}{% endif %}
 {%- if num_executors %}
-              numExectorts: {{ num_executors }}{% endif %}
+              numExecutors: {{ num_executors }}{% endif %}
 {%- if retention_time %}
               retentionTime: {{ retention_time }}
 {%- else %}
@@ -185,6 +202,11 @@ for index, _ in enumerate(cloud_config_final):
         value = lookuptable[value]
     section_cloud[key] = value
 
+    if "volume_size" not in section_cloud:
+        section_cloud.update(image_type="image")
+    else:
+        section_cloud.update(image_type="volumeFromImage")
+
 j2_template = Template(maintemplate)
 print(j2_template.render(section_cloud))
 
@@ -201,14 +223,19 @@ for section in config_parser_merged.sections():
                 value = lookuptable[value]
             section_all_machines[key] = value
 
-        # Default volume size of 10
         if "volume_size" not in section_all_machines:
             section_all_machines.update(image_type="image")
         else:
             section_all_machines.update(image_type="volumeFromImage")
+
+        # Naming and labels
+        section_all_machines.update(agent_name=section)
         if "labels" not in section_all_machines:
             # "section" is the name of the cloud agent, which is the default label
             section_all_machines.update(labels=section)
+        elif section not in section_all_machines["labels"]:
+            labels = section + " " + section_all_machines["labels"]
+            section_all_machines.update(labels=labels)
 
         j2_template = Template(machinetemplate)
         section_all_machines.update(name_prefix=name_prefix)