From 39a04df9b0b13cb01a0a9233fa94af2f82f91ce0 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 28 Nov 2016 16:28:03 +0100 Subject: [PATCH] Fix deploy-guide job We cannot mix code and includes, this needs to be separated. Use two include commands and split out the initial content to another file. Change-Id: I04584e301078cc851ae258525dc1c4b662ed6c28 --- jenkins/jobs/include/deploy-guide-pre.sh | 3 +++ jenkins/jobs/manuals-jobs.yaml | 18 ++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100755 jenkins/jobs/include/deploy-guide-pre.sh diff --git a/jenkins/jobs/include/deploy-guide-pre.sh b/jenkins/jobs/include/deploy-guide-pre.sh new file mode 100755 index 0000000000..04089f54d3 --- /dev/null +++ b/jenkins/jobs/include/deploy-guide-pre.sh @@ -0,0 +1,3 @@ +#!/bin/bash -xe +VENV="deploy-guide" +GUIDEDIR="deploy-guide" diff --git a/jenkins/jobs/manuals-jobs.yaml b/jenkins/jobs/manuals-jobs.yaml index 55bedc3848..98b3fa6800 100644 --- a/jenkins/jobs/manuals-jobs.yaml +++ b/jenkins/jobs/manuals-jobs.yaml @@ -102,11 +102,10 @@ - zuul-git-prep-upper-constraints - install-distro-packages - revoke-sudo - - shell: | - #!/bin/bash -xe - VENV="deploy-guide" - GUIDEDIR="deploy-guide" - !include-raw-escape: include/run-deploy-guide.sh + - shell: + !include-raw-escape: + - include/deploy-guide-pre.sh + - include/run-deploy-guide.sh publishers: - scp: @@ -153,11 +152,10 @@ - zuul-git-prep-upper-constraints - install-distro-packages - revoke-sudo - - shell: | - #!/bin/bash -xe - VENV="deploy-guide" - GUIDEDIR="deploy-guide" - !include-raw-escape: include/run-deploy-guide.sh + - shell: + !include-raw-escape: + - include/deploy-guide-pre.sh + - include/run-deploy-guide.sh - add-docs-root-marker: docsrootdir: deploy-guide/build/html/