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
Lift PyPI templates to Global-JJB from Acumos
[releng/global-jjb.git]
/
jjb
/
lf-macros.yaml
diff --git
a/jjb/lf-macros.yaml
b/jjb/lf-macros.yaml
index
01f95fe
..
6a2ea52
100644
(file)
--- a/
jjb/lf-macros.yaml
+++ b/
jjb/lf-macros.yaml
@@
-111,6
+111,7
@@
PACKER_PLATFORM={platform}
PACKER_TEMPLATE={template}
PACKER_VERSION={packer-version}
PACKER_PLATFORM={platform}
PACKER_TEMPLATE={template}
PACKER_VERSION={packer-version}
+ UPDATE_CLOUD_IMAGE={update-cloud-image}
- shell: !include-raw-escape:
- ../shell/packer-install.sh
- ../shell/packer-build.sh
- shell: !include-raw-escape:
- ../shell/packer-install.sh
- ../shell/packer-build.sh
@@
-143,6
+144,11
@@
- shell: !include-raw:
- ../shell/packer-clear-credentials.sh
- shell: !include-raw:
- ../shell/packer-clear-credentials.sh
+- builder:
+ name: lf-infra-update-packer-images
+ builders:
+ - shell: !include-raw: ../shell/update-cloud-images.sh
+
- builder:
name: lf-infra-push-gerrit-patch
builders:
- builder:
name: lf-infra-push-gerrit-patch
builders:
@@
-260,7
+266,9
@@
name: lf-rtd-verify
builders:
- inject:
name: lf-rtd-verify
builders:
- inject:
- properties-content: DOC_DIR={doc-dir}
+ properties-content: |
+ DOC_DIR={doc-dir}
+ PYTHON={python-version}
- shell: !include-raw-escape: ../shell/tox-install.sh
- shell: !include-raw-escape: ../shell/rtd-verify.sh
- shell: !include-raw-escape: ../shell/tox-install.sh
- shell: !include-raw-escape: ../shell/rtd-verify.sh
@@
-513,10
+521,13
@@
name: LOG_DIR
default: ""
description: "Log dir, example: project-maven-stage-master/17/"
name: LOG_DIR
default: ""
description: "Log dir, example: project-maven-stage-master/17/"
- -
string
:
+ -
choice
:
name: DISTRIBUTION_TYPE
name: DISTRIBUTION_TYPE
- default: ""
- description: "Set to maven for build with parametes"
+ choices:
+ - None
+ - container
+ - maven
+ description: "Set to maven for build with parameters"
- bool:
name: USE_RELEASE_FILE
default: "{use-release-file}"
- bool:
name: USE_RELEASE_FILE
default: "{use-release-file}"