Merge "Update Google Cloud Storage publisher"

jenkins_jobs/modules/publishers.py

@@ -5291,6 +5291,9 @@ def google_cloud_storage(parser, xml_parent, data):
                       share uploaded artifacts with everyone (default false)
                     * **upload-for-failed-jobs** (`bool`) whether to upload
                       artifacts even if the build fails (default false)
+                    * **show-inline** (`bool`) whether to show uploaded build
+                      log inline in web browsers, rather than forcing it to be
+                      downloaded (default true)
                     * **strip-prefix** (`str`) strip this prefix off the
                       file names (default: not set)
 
@@ -5304,6 +5307,9 @@ def google_cloud_storage(parser, xml_parent, data):
                       share uploaded artifacts with everyone (default false)
                     * **upload-for-failed-jobs** (`bool`) whether to upload
                       artifacts even if the build fails (default false)
+                    * **show-inline** (`bool`) whether to show uploaded
+                      artifacts inline in web browsers, rather than forcing
+                      them to be downloaded (default false)
                     * **strip-prefix** (`str`) strip this prefix off the
                       file names (default: not set)
 
@@ -5366,6 +5372,9 @@ def google_cloud_storage(parser, xml_parent, data):
         XML.SubElement(xml_element, 'forFailedJobs').text = str(
             properties.get('upload-for-failed-jobs', False)).lower()
 
+        XML.SubElement(xml_element, 'showInline').text = str(
+            properties.get('show-inline', True)).lower()
+
         XML.SubElement(xml_element, 'pathPrefix').text = str(
             properties.get('strip-prefix', ''))
 
@@ -5399,6 +5408,9 @@ def google_cloud_storage(parser, xml_parent, data):
         XML.SubElement(xml_element, 'forFailedJobs').text = str(
             properties.get('upload-for-failed-jobs', False)).lower()
 
+        XML.SubElement(xml_element, 'showInline').text = str(
+            properties.get('show-inline', False)).lower()
+
         XML.SubElement(xml_element, 'pathPrefix').text = str(
             properties.get('strip-prefix', ''))
 

tests/publishers/fixtures/google_cloud_storage002.xml

@@ -15,6 +15,7 @@
           <bucketNameWithVars>gs://myBucket</bucketNameWithVars>
           <sharedPublicly>true</sharedPublicly>
           <forFailedJobs>true</forFailedJobs>
+          <showInline>true</showInline>
           <pathPrefix/>
           <module/>
           <logName>console.log</logName>
@@ -23,6 +24,7 @@
           <bucketNameWithVars>gs://myBucket</bucketNameWithVars>
           <sharedPublicly>false</sharedPublicly>
           <forFailedJobs>true</forFailedJobs>
+          <showInline>false</showInline>
           <pathPrefix/>
           <module/>
           <sourceGlobWithVars>target/*.war</sourceGlobWithVars>
@@ -31,6 +33,7 @@
           <bucketNameWithVars>gs://myBucket/artifacts/</bucketNameWithVars>
           <sharedPublicly>true</sharedPublicly>
           <forFailedJobs>false</forFailedJobs>
+          <showInline>false</showInline>
           <pathPrefix>path/to/</pathPrefix>
           <module reference="../../com.google.jenkins.plugins.storage.ClassicUpload/module"/>
           <sourceGlobWithVars>**/build/*.iso</sourceGlobWithVars>

tests/publishers/fixtures/google_cloud_storage003.xml

@@ -15,6 +15,7 @@
           <bucketNameWithVars>gs://myBucket</bucketNameWithVars>
           <sharedPublicly>true</sharedPublicly>
           <forFailedJobs>true</forFailedJobs>
+          <showInline>false</showInline>
           <pathPrefix>path/to/</pathPrefix>
           <module/>
           <logName>console.log</logName>
@@ -23,6 +24,7 @@
           <bucketNameWithVars>gs://myBucket</bucketNameWithVars>
           <sharedPublicly>false</sharedPublicly>
           <forFailedJobs>false</forFailedJobs>
+          <showInline>false</showInline>
           <pathPrefix>path/to/</pathPrefix>
           <module/>
           <sourceGlobWithVars>target/*.war</sourceGlobWithVars>
@@ -38,6 +40,7 @@
           <bucketNameWithVars>gs://myBucket/artifacts/</bucketNameWithVars>
           <sharedPublicly>false</sharedPublicly>
           <forFailedJobs>false</forFailedJobs>
+          <showInline>true</showInline>
           <pathPrefix>path/to/</pathPrefix>
           <module reference="../../com.google.jenkins.plugins.storage.StdoutUpload/module"/>
           <logName>console.log</logName>
@@ -46,6 +49,7 @@
           <bucketNameWithVars>gs://myBucket/artifacts/</bucketNameWithVars>
           <sharedPublicly>true</sharedPublicly>
           <forFailedJobs>true</forFailedJobs>
+          <showInline>true</showInline>
           <pathPrefix>path/to/</pathPrefix>
           <module reference="../../com.google.jenkins.plugins.storage.ClassicUpload/module"/>
           <sourceGlobWithVars>target/*.war</sourceGlobWithVars>

tests/publishers/fixtures/google_cloud_storage003.yaml

@@ -10,6 +10,7 @@ publishers:
                 storage-location: 'gs://myBucket'
                 share-publicly: 'true'
                 upload-for-failed-jobs: 'true'
+                show-inline: 'false'
                 strip-prefix: 'path/to/'
             - classic:
                 file-pattern: 'target/*.war'
@@ -27,4 +28,5 @@ publishers:
                 storage-location: 'gs://myBucket/artifacts/'
                 share-publicly: 'true'
                 upload-for-failed-jobs: 'true'
+                show-inline: 'true'
                 strip-prefix: 'path/to/'