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 "Fix rtd merge job to handle new tag uploaded"
[releng/global-jjb.git]
/
jjb
/
lf-macros.yaml
diff --git
a/jjb/lf-macros.yaml
b/jjb/lf-macros.yaml
index
2dd6570
..
452c36a
100644
(file)
--- a/
jjb/lf-macros.yaml
+++ b/
jjb/lf-macros.yaml
@@
-76,6
+76,8
@@
# 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/logs-deploy.sh
- shell: !include-raw:
- shell: !include-raw:
- ../shell/logs-deploy.sh
- shell: !include-raw:
@@
-272,6
+274,15
@@
- 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-rtdv2-build
+ 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
+
- builder:
name: check-info-votes
builders:
- builder:
name: check-info-votes
builders:
@@
-332,7
+343,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}"
@@
-346,7
+357,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}"
@@
-521,10
+532,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}"