Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add pre-build step to prep vm before build"
[releng/global-jjb.git]
/
jjb
/
lf-macros.yaml
diff --git
a/jjb/lf-macros.yaml
b/jjb/lf-macros.yaml
index
16cd33c
..
5188417
100644
(file)
--- a/
jjb/lf-macros.yaml
+++ b/
jjb/lf-macros.yaml
@@
-48,6
+48,11
@@
builders:
- shell: !include-raw: ../shell/gpg-verify-git-signature.sh
builders:
- shell: !include-raw: ../shell/gpg-verify-git-signature.sh
+- builder:
+ name: lf-infra-pre-build
+ builders:
+ - shell: !include-raw-escape: ../shell/python-tools-install.sh
+
- builder:
name: lf-infra-ship-logs
builders:
- builder:
name: lf-infra-ship-logs
builders:
@@
-58,7
+63,9
@@
- lf-infra-create-netrc:
server-id: logs
- shell: !include-raw:
- lf-infra-create-netrc:
server-id: logs
- shell: !include-raw:
- - ../shell/lftools-install.sh
+ # Ensure python-tools are installed in case job template does not
+ # call the lf-infra-pre-build macro.
+ - ../shell/python-tools-install.sh
- ../shell/logs-deploy.sh
- shell: !include-raw:
- ../shell/logs-clear-credentials.sh
- ../shell/logs-deploy.sh
- shell: !include-raw:
- ../shell/logs-clear-credentials.sh