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 "Show details and detect errors in tox-run.sh"
[releng/global-jjb.git]
/
jjb
/
lf-release-jobs.yaml
diff --git
a/jjb/lf-release-jobs.yaml
b/jjb/lf-release-jobs.yaml
index
4d4a9ca
..
398a53e
100644
(file)
--- a/
jjb/lf-release-jobs.yaml
+++ b/
jjb/lf-release-jobs.yaml
@@
-226,7
+226,8
@@
submodule-disable: true
submodule-recursive: false
submodule-timeout: 10
submodule-disable: true
submodule-recursive: false
submodule-timeout: 10
- choosing-strategy: default
+ # release merge jobs build from commit not tip
+ choosing-strategy: gerrit
triggers:
- gerrit:
triggers:
- gerrit:
@@
-308,6
+309,10
@@
name: LOG_DIR
default: ""
description: "The partial path of logs from the PyPI merge job."
name: LOG_DIR
default: ""
description: "The partial path of logs from the PyPI merge job."
+ - string:
+ name: GIT_TAG
+ default: ""
+ description: "Tag to push to git repo; optional, defaults to VERSION."
- string:
name: PYPI_PROJECT
default: ""
- string:
name: PYPI_PROJECT
default: ""
@@
-368,6
+373,7
@@
submodule-recursive: "{submodule-recursive}"
submodule-timeout: "{submodule-timeout}"
submodule-disable: "{submodule-disable}"
submodule-recursive: "{submodule-recursive}"
submodule-timeout: "{submodule-timeout}"
submodule-disable: "{submodule-disable}"
+ # release merge jobs build from commit not tip
choosing-strategy: gerrit
triggers:
choosing-strategy: gerrit
triggers:
@@
-538,10
+544,20
@@
- lf-infra-pre-build
- config-file-provider:
files:
- lf-infra-pre-build
- config-file-provider:
files:
+ - file-id: sigul-config
+ variable: SIGUL_CONFIG
+ - file-id: sigul-password
+ variable: SIGUL_PASSWORD
+ - file-id: sigul-pki
+ variable: SIGUL_PKI
+ - file-id: signing-pubkey
+ variable: SIGNING_PUBKEY
- file-id: "packagecloud_api"
target: "$HOME/packagecloud_api"
- file-id: packagecloud-account
variable: ACCOUNT_NAME_FILE
- file-id: "packagecloud_api"
target: "$HOME/packagecloud_api"
- file-id: packagecloud-account
variable: ACCOUNT_NAME_FILE
+ - shell: !include-raw-escape: ../shell/sigul-configuration.sh
+ - shell: !include-raw-escape: ../shell/sigul-install.sh
- lf-release
- job-template:
- lf-release
- job-template:
@@
-613,7
+629,8
@@
submodule-disable: true
submodule-recursive: false
submodule-timeout: 10
submodule-disable: true
submodule-recursive: false
submodule-timeout: 10
- choosing-strategy: default
+ # release merge jobs build from commit not tip
+ choosing-strategy: gerrit
triggers:
- gerrit:
triggers:
- gerrit: