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
Fix update to logs-deploy.sh
[releng/global-jjb.git]
/
jjb
/
lf-macros.yaml
diff --git
a/jjb/lf-macros.yaml
b/jjb/lf-macros.yaml
index
01f95fe
..
8961184
100644
(file)
--- a/
jjb/lf-macros.yaml
+++ b/
jjb/lf-macros.yaml
@@
-76,6
+76,10
@@
# Ensure python-tools are installed in case job template does not
# call the lf-infra-pre-build macro.
- ../shell/python-tools-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: !include-raw:
+ - ../shell/sudo-logs.sh
+ - shell: !include-raw:
+ - ../shell/job-cost.sh
- shell: !include-raw:
- ../shell/logs-deploy.sh
- shell: !include-raw:
- shell: !include-raw:
- ../shell/logs-deploy.sh
- shell: !include-raw:
@@
-111,6
+115,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
+148,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:
@@
-223,13
+233,6
@@
- file-id: "{settings-file}"
variable: "SETTINGS_FILE"
- file-id: "{settings-file}"
variable: "SETTINGS_FILE"
-- builder:
- name: lf-pip-install
- builders:
- - inject:
- properties-content: PIP_PACKAGES={pip-packages}
- - shell: !include-raw-escape: ../shell/pip-install.sh
-
- builder:
name: lf-provide-maven-settings-cleanup
builders:
- builder:
name: lf-provide-maven-settings-cleanup
builders:
@@
-260,10
+263,20
@@
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
+- builder:
+ name: lf-rtdv3-build
+ builders:
+ - inject:
+ properties-content: |
+ DEFAULT_VERSION={default-version}
+ - shell: !include-raw-escape: ../shell/rtdv3.sh
+
- builder:
name: check-info-votes
builders:
- builder:
name: check-info-votes
builders:
@@
-324,7
+337,7
@@
sonar-name: Sonar
scanner-name: SonarQubeScanner
task: "{sonar-task}"
sonar-name: Sonar
scanner-name: SonarQubeScanner
task: "{sonar-task}"
- project: "
sonar-project.properties
"
+ project: "
{sonar-project-file}
"
properties: "{sonar-properties}"
java-opts: "{sonar-java-opts}"
additional-arguments: "{sonar-additional-args}"
properties: "{sonar-properties}"
java-opts: "{sonar-java-opts}"
additional-arguments: "{sonar-additional-args}"
@@
-338,7
+351,7
@@
sonar-name: Sonar
scanner-name: SonarQubeScanner
task: "{sonar-task}"
sonar-name: Sonar
scanner-name: SonarQubeScanner
task: "{sonar-task}"
- project: "
sonar-project.properties
"
+ project: "
{sonar-project-file}
"
properties: "{sonar-properties}"
java-opts: "{sonar-java-opts}"
additional-arguments: "{sonar-additional-args}"
properties: "{sonar-properties}"
java-opts: "{sonar-java-opts}"
additional-arguments: "{sonar-additional-args}"
@@
-508,15
+521,22
@@
- string:
name: VERSION
default: ""
- string:
name: VERSION
default: ""
- description: "
This is the tag, E
xample: 1.0.0"
+ description: "
Version to release, for e
xample: 1.0.0"
- string:
- string:
- name:
LOG_DIR
+ name:
GIT_TAG
default: ""
default: ""
- description: "
Log dir, example: project-maven-stage-master/17/
"
+ description: "
Tag to push to git repo; optional, defaults to VERSION
"
- string:
- string:
- name:
DISTRIBUTION_TYPE
+ name:
LOG_DIR
default: ""
default: ""
- description: "Set to maven for build with parametes"
+ description: "Log dir, for example: project-maven-stage-master/17/"
+ - choice:
+ name: DISTRIBUTION_TYPE
+ 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}"