diff --git a/jenkins_jobs/defaults.py b/jenkins_jobs/defaults.py index 227f20ae5..4255d2a05 100644 --- a/jenkins_jobs/defaults.py +++ b/jenkins_jobs/defaults.py @@ -117,6 +117,8 @@ view_contents_keys = { "allow-manual-triggers", "allow-pipeline-start", "allow-rebuild", + "embedded-css", + "full-screen-css", "link-relative", "link-to-console-log", "max-number-of-visible-pipelines", diff --git a/jenkins_jobs/modules/view_delivery_pipeline.py b/jenkins_jobs/modules/view_delivery_pipeline.py index fbabe598f..6dd37ead5 100644 --- a/jenkins_jobs/modules/view_delivery_pipeline.py +++ b/jenkins_jobs/modules/view_delivery_pipeline.py @@ -48,6 +48,8 @@ Requires the Jenkins :jenkins-plugins:`Delivery Pipeline Plugin the delivery pipeline view. (default false) * **allow-rebuild** (`bool`): Allow rerunning a task from the delivery pipeline view. (default false) + * **embedded-css** (`str`): URL for custom CSS file (default '') + * **full-screen-css** (`str`): URL for custom CSS file for full screen (default '') * **link-relative** (`bool`): Use relative links for jobs in this pipeline view to allow for easier navigation. (default false) * **link-to-console-log** (`bool`): Changes behaviour of task link in @@ -134,6 +136,8 @@ class DeliveryPipeline(jenkins_jobs.modules.base.Base): ("allow-manual-triggers", "allowManualTriggers", False), ("allow-pipeline-start", "allowPipelineStart", False), ("allow-rebuild", "allowRebuild", False), + ("embedded-css", "embeddedCss", ""), + ("full-screen-css", "fullScreenCss", ""), ("link-relative", "linkRelative", False), ("link-to-console-log", "linkToConsoleLog", False), ("max-number-of-visible-pipelines", "maxNumberOfVisiblePipelines", -1), diff --git a/tests/views/fixtures/view_delivery_pipeline-full.xml b/tests/views/fixtures/view_delivery_pipeline-full.xml index 031d1e61f..10e9970f6 100644 --- a/tests/views/fixtures/view_delivery_pipeline-full.xml +++ b/tests/views/fixtures/view_delivery_pipeline-full.xml @@ -8,6 +8,8 @@ true true true + foo + bar false true -1 diff --git a/tests/views/fixtures/view_delivery_pipeline-full.yaml b/tests/views/fixtures/view_delivery_pipeline-full.yaml index 1e404681e..59185030a 100644 --- a/tests/views/fixtures/view_delivery_pipeline-full.yaml +++ b/tests/views/fixtures/view_delivery_pipeline-full.yaml @@ -12,5 +12,7 @@ show-total-build-time: yes allow-rebuild: yes allow-pipeline-start: yes allow-abort: yes +embedded-css: foo +full-screen-css: bar paging-enabled: yes link-to-console-log: yes diff --git a/tests/views/fixtures/view_delivery_pipeline-minimal.xml b/tests/views/fixtures/view_delivery_pipeline-minimal.xml index be3426805..79ceb48fa 100644 --- a/tests/views/fixtures/view_delivery_pipeline-minimal.xml +++ b/tests/views/fixtures/view_delivery_pipeline-minimal.xml @@ -8,6 +8,8 @@ false false false + + false false -1