diff options
author | 2017-03-22 11:29:21 +0100 | |
---|---|---|
committer | 2017-03-22 11:31:24 +0100 | |
commit | 68eb2ba33f9467d856838c61dc8e9c9d1cb35ded (patch) | |
tree | 67a760337e10b842cba3bc5985e005f4573a9392 /jjb | |
parent | 94015c8da50dc231942e3a237652f92d0bc3de3d (diff) |
xci: Logging, naming, and job updates
- adjust build blockers in daily jobs.
- explicity set SLAVE_LABEL for provision, deploy, and functest jobs
so they run on correct nodes even if they are started manually.
- rename files and update scripts accordingly.
osa_deploy.sh -> osa-deploy.sh
targethost_configuration.yml -> configure-targethosts.yml
jumphost_configuration.yml -> configure-xcimaster.yml
- add/fix console logging in osa-deploy.sh.
- add license header to osa-deploy.sh.
Change-Id: I57a37dccaa4bcda554ef79969e5d288b49937807
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/xci/xci-daily-jobs.yml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml index c685aa974..65da308ae 100644 --- a/jjb/xci/xci-daily-jobs.yml +++ b/jjb/xci/xci-daily-jobs.yml @@ -78,12 +78,12 @@ concurrent: false properties: - - logrotate-default - build-blocker: use-build-blocker: true blocking-jobs: - - 'xci-os-.*?-{pod}-daily-.*' + - '^xci-os.*' block-level: 'NODE' + - logrotate-default parameters: - string: @@ -137,14 +137,14 @@ concurrent: false properties: - - logrotate-default - build-blocker: use-build-blocker: true blocking-jobs: - - 'xci-provision-.*?-{pod}-daily-.*' - - 'xci-deploy-.*?-{pod}-daily-.*' - - 'xci-functest-.*?-{pod}-daily-.*' + - '^xci-provision.*' + - '^xci-deploy.*' + - '^xci-functest.*' block-level: 'NODE' + - logrotate-default parameters: - string: @@ -177,6 +177,9 @@ - string: name: CLEAN_DIB_IMAGES default: 'true' + - label: + name: SLAVE_LABEL + default: '{slave-label}' builders: - description-setter: |