From: Kevin Sandi <ksandi@contractor.linuxfoundation.org>
Date: Mon, 25 Oct 2021 23:39:41 +0000 (+0000)
Subject: Merge "Feat: Add Maven SonarCloud verify job"
X-Git-Tag: v0.69.0^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=599b705c033b73a5565027db210960ae7658f9f5;hp=67a03561e61b95229587867d0fd8518489dcf9bf;p=releng%2Fglobal-jjb.git

Merge "Feat: Add Maven SonarCloud verify job"
---

diff --git a/jenkins-admin/create_jenkins_clouds_openstack_yaml.py b/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
index 2b81f345..d3424698 100755
--- a/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
+++ b/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
@@ -93,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 %}
@@ -125,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 %}
@@ -201,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))
 
diff --git a/releasenotes/notes/default_openstack_boot-76a655138ca488b9.yaml b/releasenotes/notes/default_openstack_boot-76a655138ca488b9.yaml
new file mode 100644
index 00000000..a8f7a6cc
--- /dev/null
+++ b/releasenotes/notes/default_openstack_boot-76a655138ca488b9.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    The OpenStack JCasC yaml converter has learned how to properly
+    differentiate between volumeFromImage and image boot sources.
diff --git a/releasenotes/notes/fix_openstack_numExecutors-eb10d4a6c2d8a08c.yaml b/releasenotes/notes/fix_openstack_numExecutors-eb10d4a6c2d8a08c.yaml
new file mode 100644
index 00000000..afe6cd3f
--- /dev/null
+++ b/releasenotes/notes/fix_openstack_numExecutors-eb10d4a6c2d8a08c.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    The JCasC convert for OpenStack was improperly converting executor
+    definitions. The script has learned the proper syntax.
diff --git a/releasenotes/notes/pin-httplib2-dependencies-b29d15d8a674cb43.yaml b/releasenotes/notes/pin-httplib2-dependencies-b29d15d8a674cb43.yaml
new file mode 100644
index 00000000..8d06e03d
--- /dev/null
+++ b/releasenotes/notes/pin-httplib2-dependencies-b29d15d8a674cb43.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Pin pyparsing<3.0.0 which is required by httplib2 0.20.1.
+    A new version of pip 21.3.1 is out that has removed
+    the dependency pyparsing<3,>=2.4.2 as required by httplib2.
diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 7abaed9e..20a63600 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -38,6 +38,7 @@ yq
 # necessary so that future maintainers of this file can make decisions to
 # remove the workarounds in the future.
 importlib-resources<2.0.0  # virtualenv 20.0.21 requires importlib-resources<2.0.0 (RELENG-2993)
+pyparsing<3.0.0 # httplib2 0.20.1 requires pyparsing<3,>=2.4.2
 EOF
 
     #Python 3.5 in Ubuntu 16.04 workaround