openstack/project-config
Code Issues Proposed changes

Fix deploy-guide job

Browse Source 
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
This commit is contained in:
Andreas Jaeger 2016-11-28 16:28:03 +01:00
parent a6b87d74d1
commit 39a04df9b0
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins/jobs/include/deploy-guide-pre.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash -xe
VENV="deploy-guide"
GUIDEDIR="deploy-guide"

18
jenkins/jobs/manuals-jobs.yaml
View File

@ -102,11 +102,10 @@
- zuul-git-prep-upper-constraints - zuul-git-prep-upper-constraints
- install-distro-packages - install-distro-packages
- revoke-sudo - revoke-sudo
- shell: | - shell:
#!/bin/bash -xe !include-raw-escape:
VENV="deploy-guide" - include/deploy-guide-pre.sh
GUIDEDIR="deploy-guide" - include/run-deploy-guide.sh
!include-raw-escape: include/run-deploy-guide.sh
publishers: publishers:
- scp: - scp:
@ -153,11 +152,10 @@
- zuul-git-prep-upper-constraints - zuul-git-prep-upper-constraints
- install-distro-packages - install-distro-packages
- revoke-sudo - revoke-sudo
- shell: | - shell:
#!/bin/bash -xe !include-raw-escape:
VENV="deploy-guide" - include/deploy-guide-pre.sh
GUIDEDIR="deploy-guide" - include/run-deploy-guide.sh
!include-raw-escape: include/run-deploy-guide.sh
- add-docs-root-marker: - add-docs-root-marker:
docsrootdir: deploy-guide/build/html/ docsrootdir: deploy-guide/build/html/