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
Add AWS credentials config file
[releng/global-jjb.git]
/
jjb
/
lf-macros.yaml
diff --git
a/jjb/lf-macros.yaml
b/jjb/lf-macros.yaml
index
9411345
..
94847dc
100644
(file)
--- a/
jjb/lf-macros.yaml
+++ b/
jjb/lf-macros.yaml
@@
-70,6
+70,15
@@
files:
- file-id: "jenkins-log-archives-settings"
variable: "SETTINGS_FILE"
files:
- file-id: "jenkins-log-archives-settings"
variable: "SETTINGS_FILE"
+ - conditional-step:
+ condition-kind: regex-match
+ regex: "^.*logs-s3.*"
+ label: $S3_BUCKET
+ steps:
+ - config-file-provider:
+ files:
+ - file-id: "jenkins-s3-log-ship"
+ target: $HOME/.aws/credentials
- lf-infra-create-netrc:
server-id: logs
- shell: !include-raw:
- lf-infra-create-netrc:
server-id: logs
- shell: !include-raw:
@@
-78,6
+87,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:
@@
-231,13
+242,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:
@@
-280,7
+284,7
@@
- inject:
properties-content: |
DEFAULT_VERSION={default-version}
- inject:
properties-content: |
DEFAULT_VERSION={default-version}
- - shell: !include-raw: ../shell/rtdv3.sh
+ - shell: !include-raw
-escape
: ../shell/rtdv3.sh
- builder:
name: check-info-votes
- builder:
name: check-info-votes