opendev/system-config
Code Issues Proposed changes
7fd495116b
system-config/modules/openstack_project/files/zuul/openstack_functions.py

15 lines
608 B
Python
Raw Normal View History

Switch Zuul/JJB to use LOG_PATH This calculates the full LOG_PATH in the Zuul config and pases it to Jenkins. The new path is similar to the old but with the substitution of a short ZUUL_UUID at the end instead of the Jenkins build number in order to avoid collisions from multiple Jenkins masters. Periodic jobs add a node name to their log path to avoid collisions from multiple masters. Unfortunately, that value is not accessible to the logstash worker. This can be solved by having Zuul trigger periodic jobs. Add the ZUUL_REF to logstash as "build_ref". Requires https://review.openstack.org/#/c/39130/ Change-Id: I40bad59e3ad8ed6b4706762ed8b833fd15c13b0d
2013-07-29 10:46:53 -07:00
def set_log_url(item, job, params):
Set the Zuul/Jenkins base log URL in a function And use that when constructing log paths and URLs. Use a substr of the change id or commit sha when constructing URLs so the log directories are deeper. Make copying the test results a macro (it's used in several places). Update the gearman log client to take advantage of the new parameter. Requires https://review.openstack.org/#/c/36304/ Change-Id: I64faa35eddc4105271efa3de4f83b608b77655c2
2013-07-09 10:53:27 -07:00
if hasattr(item.change, 'refspec'):
path = "%s/%s/%s/%s" % (
params['ZUUL_CHANGE'][-2:], params['ZUUL_CHANGE'],
params['ZUUL_PATCHSET'], params['ZUUL_PIPELINE'])
Support periodic jobs in log custom function Change-Id: Ice4db15fd16e0eea886ddc5f793d49693a0a9986
2013-08-01 15:54:12 -07:00
elif hasattr(item.change, 'ref'):
Set the Zuul/Jenkins base log URL in a function And use that when constructing log paths and URLs. Use a substr of the change id or commit sha when constructing URLs so the log directories are deeper. Make copying the test results a macro (it's used in several places). Update the gearman log client to take advantage of the new parameter. Requires https://review.openstack.org/#/c/36304/ Change-Id: I64faa35eddc4105271efa3de4f83b608b77655c2
2013-07-09 10:53:27 -07:00
path = "%s/%s/%s" % (
params['ZUUL_NEWREV'][:2], params['ZUUL_NEWREV'],
params['ZUUL_PIPELINE'])
Support periodic jobs in log custom function Change-Id: Ice4db15fd16e0eea886ddc5f793d49693a0a9986
2013-08-01 15:54:12 -07:00
else:
path = params['ZUUL_PIPELINE']
Set the Zuul/Jenkins base log URL in a function And use that when constructing log paths and URLs. Use a substr of the change id or commit sha when constructing URLs so the log directories are deeper. Make copying the test results a macro (it's used in several places). Update the gearman log client to take advantage of the new parameter. Requires https://review.openstack.org/#/c/36304/ Change-Id: I64faa35eddc4105271efa3de4f83b608b77655c2
2013-07-09 10:53:27 -07:00
params['BASE_LOG_PATH'] = path
Switch Zuul/JJB to use LOG_PATH This calculates the full LOG_PATH in the Zuul config and pases it to Jenkins. The new path is similar to the old but with the substitution of a short ZUUL_UUID at the end instead of the Jenkins build number in order to avoid collisions from multiple Jenkins masters. Periodic jobs add a node name to their log path to avoid collisions from multiple masters. Unfortunately, that value is not accessible to the logstash worker. This can be solved by having Zuul trigger periodic jobs. Add the ZUUL_REF to logstash as "build_ref". Requires https://review.openstack.org/#/c/39130/ Change-Id: I40bad59e3ad8ed6b4706762ed8b833fd15c13b0d
2013-07-29 10:46:53 -07:00
params['LOG_PATH'] = path + '/%s/%s' % (job.name,
params['ZUUL_UUID'][:7])
Copy Permalink