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
Resolve shellcheck SC219[67] ?grep non-standard
[releng/global-jjb.git]
/
jjb
/
lf-macros.yaml
diff --git
a/jjb/lf-macros.yaml
b/jjb/lf-macros.yaml
index
452c36a
..
6d192bf
100644
(file)
--- a/
jjb/lf-macros.yaml
+++ b/
jjb/lf-macros.yaml
@@
-78,6
+78,8
@@
- ../shell/python-tools-install.sh
- shell: !include-raw:
- ../shell/sudo-logs.sh
- ../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:
@@
-275,13
+277,12
@@
- shell: !include-raw-escape: ../shell/rtd-verify.sh
- builder:
- shell: !include-raw-escape: ../shell/rtd-verify.sh
- builder:
- name: lf-rtdv
2
-build
+ name: lf-rtdv
3
-build
builders:
builders:
- - lf-infra-pre-build
- - lf-infra-tox-install:
- python-version: "python3"
- - shell: !include-raw: ../shell/tox-run.sh
- - shell: !include-raw: ../shell/rtdv2.sh
+ - inject:
+ properties-content: |
+ DEFAULT_VERSION={default-version}
+ - shell: !include-raw-escape: ../shell/rtdv3.sh
- builder:
name: check-info-votes
- builder:
name: check-info-votes
@@
-527,11
+528,15
@@
- string:
name: VERSION
default: ""
- string:
name: VERSION
default: ""
- description: "This is the tag, Example: 1.0.0"
+ description: "Version to release, for example: 1.0.0"
+ - string:
+ name: GIT_TAG
+ default: ""
+ description: "Tag to push to git repo; optional, defaults to VERSION"
- string:
name: LOG_DIR
default: ""
- string:
name: LOG_DIR
default: ""
- description: "Log dir, example: project-maven-stage-master/17/"
+ description: "Log dir,
for
example: project-maven-stage-master/17/"
- choice:
name: DISTRIBUTION_TYPE
choices:
- choice:
name: DISTRIBUTION_TYPE
choices: