opendev/system-config
Code Issues Proposed changes

Set the Zuul/Jenkins base log URL in a function

Browse Source 
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
This commit is contained in:
James E. Blair 2013-07-09 10:53:27 -07:00
parent 013d82b3e8
commit f7f2760fe0
22 changed files with 107 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/site.pp
View File

@ -305,7 +305,7 @@ node 'zuul.openstack.org' {
gerrit_server => 'review.openstack.org',
gerrit_user => 'jenkins',
zuul_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
url_pattern => 'http://logs.openstack.org/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}',
url_pattern => 'http://logs.openstack.org/{build.parameters[BASE_LOG_PATH]}/{job.name}/{build.number}',
sysadmins => hiera('sysadmins'),
statsd_host => 'graphite.openstack.org',
gearman_workers => [
@ -320,7 +320,7 @@ node 'zuul-dev.openstack.org' {
gerrit_server => 'review.openstack.org',
gerrit_user => 'zuul-dev',
zuul_ssh_private_key => hiera('zuul_dev_ssh_private_key_contents'),
url_pattern => 'http://logs.openstack.org/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}',
url_pattern => 'http://logs.openstack.org/{build.parameters[BASE_LOG_PATH]}/{job.name}/{build.number}',
sysadmins => hiera('sysadmins'),
statsd_host => 'graphite.openstack.org',
gearman_workers => [

28
modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
View File

@ -31,7 +31,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'openstack-api-programming/target/docbkx/webhelp/openstack-api-programming/admin/**'
@ -58,7 +58,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'api-quick-start/target/docbkx/webhelp/api-quick-start-onepager/**'
@ -86,7 +86,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: api.openstack.org
source: 'api-ref/target/docbkx/html/**'
@ -113,7 +113,7 @@
target: ''
remove-prefix: 'www/'
excludes: ''
- console-log-post
- console-log
- job:
name: image-api-v2.0
@ -146,7 +146,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'openstack-image-service-api/src/markdown/target/docbkx/webhelp/api/openstack-image-service/2.0/**'
@ -174,7 +174,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/target/docbkx/webhelp/api/openstack-network/1.0/**'
@ -199,7 +199,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/target/docbkx/webhelp/api/openstack-network/2.0/**'
@ -225,7 +225,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'openstack-object-storage-dev/target/docbkx/webhelp/**'
@ -251,7 +251,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'openstack-compute-api-2/target/docbkx/webhelp/api/openstack-compute/2/**'
@ -275,7 +275,7 @@
target: 'api/openstack-compute/2/wadl/'
remove-prefix: 'target/'
excludes: '**/*.xml,**/null*'
- console-log-post
- console-log
- job:
name: block-api-v2.0
@ -295,7 +295,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'v2/target/docbkx/webhelp/api/openstack-block-storage/2.0/**'
@ -322,7 +322,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'openstack-identity-api/v2.0/target/docbkx/webhelp/api/openstack-identity-service/2.0/**'
@ -361,7 +361,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'openstack-identity-api/v3/markdown/target/docbkx/webhelp/api/openstack-identity-service/3/**'
@ -389,7 +389,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'openstack-image-service-api/target/docbkx/webhelp/api/openstack-image-service/1.1/**'

2
modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml
View File

@ -89,4 +89,4 @@
site: 'tarballs.openstack.org'
warfile: 'gerrit-war/target/gerrit*.war'
target: 'tarballs/ci/'
- console-log-post
- console-log

20
modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml
View File

@ -27,23 +27,5 @@
- assert-no-extra-files
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: '**/*nose_results.html'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: '**/*testr_results.html.gz'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: '.testrepository/tmp*'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: '**/*subunit_log.txt.gz'
keep-hierarchy: false
copy-after-failure: true
- test-results
- console-log

4
modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml
View File

@ -14,7 +14,7 @@
target: 'infra/publications/$ZUUL_BRANCH/'
remove-prefix: ''
excludes: ''
- console-log-post
- console-log
- job:
name: infra-publications-publish-index
@ -36,4 +36,4 @@
target: 'infra/publications/'
remove-prefix: 'output/'
excludes: ''
- console-log-post
- console-log

4
modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
View File

@ -59,7 +59,7 @@
site: 'tarballs.openstack.org'
warfile: 'target/{name}-${{PROJECT_VER}}.hpi'
target: 'tarballs/ci/{name}'
- console-log-post
- console-log
- job-template:
name: '{name}-jenkinsci-upload'
@ -81,7 +81,7 @@
/usr/local/jenkins/slave_scripts/maven-upload.sh {name} $JENKINSCI_REPO $JENKINSCI_REPO_CREDS
publishers:
- console-log-post
- console-log
- job-group:
name: jenkins-plugin-jobs

2
modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml
View File

@ -16,7 +16,7 @@
- target: 'ci/jenkins-job-builder'
source: 'doc/build/html/**/*'
keep-hierarchy: true
- console-log-post
- console-log
- job:
name: jenkins-job-builder-compare-xml

46
modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
View File

@ -187,10 +187,8 @@
builders:
- shell: |
#!/bin/sh
if test "$ZUUL_CHANGE" ; then
echo "Detailed logs: http://logs.openstack.org/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER/"
elif test "$ZUUL_SHORT_NEWREV" ; then
echo "Detailed logs: http://logs.openstack.org/$ZUUL_SHORT_NEWREV/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER/"
if test "$BASE_LOG_PATH" ; then
echo "Detailed logs: http://logs.openstack.org/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER/"
else
echo "Detailed logs: http://logs.openstack.org/periodic/$JOB_NAME/$BUILD_NUMBER/"
fi
@ -235,17 +233,7 @@
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
copy-console: true
copy-after-failure: true
- publisher:
name: console-log-post
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_SHORT_NEWREV/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
- target: 'logs/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER'
copy-console: true
copy-after-failure: true
@ -265,15 +253,15 @@
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
- target: 'logs/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
- target: 'logs/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER'
source: '**/testr_results.html.gz'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
- target: 'logs/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER'
source: '**/subunit_log.txt.gz'
keep-hierarchy: false
copy-after-failure: true
@ -315,18 +303,30 @@
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
- target: 'logs/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER'
source: 'cover/**'
keep-hierarchy: true
copy-after-failure: true
- publisher:
name: coverage-log-post
name: test-results
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_SHORT_NEWREV/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'cover/**'
keep-hierarchy: true
- target: 'logs/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER'
source: '**/*nose_results.html'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER'
source: '**/*testr_results.html.gz'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER'
source: '.testrepository/tmp*'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER'
source: '**/*subunit_log.txt.gz'
keep-hierarchy: false
copy-after-failure: true

34
modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
View File

@ -19,7 +19,7 @@
- scp:
site: 'static.openstack.org'
files:
- target: 'docs-draft/$JOB_NAME/$ZUUL_PIPELINE/$BUILD_NUMBER/cli/quick-start'
- target: 'docs-draft/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER/cli/quick-start'
source: 'doc/src/docbkx/cli-guide/target/docbkx/webhelp/cli-guide/**'
keep-hierarchy: true
copy-after-failure: true
@ -45,7 +45,7 @@
- scp:
site: 'static.openstack.org'
files:
- target: 'docs-draft/$JOB_NAME/$ZUUL_PIPELINE/$BUILD_NUMBER/ops/'
- target: 'docs-draft/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER/ops/'
source: 'doc/src/docbkx/openstack-ops/target/docbkx/webhelp/**'
keep-hierarchy: true
copy-after-failure: true
@ -78,7 +78,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/cli-guide/target/docbkx/webhelp/cli-guide/**'
@ -108,7 +108,7 @@
goals: '-Doperating.system=yum -Dprofile.os=centos;fedora;rhel -Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/basic-install/target/docbkx/webhelp/**'
@ -141,7 +141,7 @@
goals: '-Doperating.system=apt -Dprofile.os=ubuntu;debian -Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/basic-install/target/docbkx/webhelp/**'
@ -171,7 +171,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/openstack-block-storage-admin/target/docbkx/webhelp/**'
@ -196,7 +196,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/common/glossary/target/docbkx/webhelp/openstack-glossary/**'
@ -227,7 +227,7 @@
goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/openstack-image/target/docbkx/webhelp/**'
@ -258,7 +258,7 @@
goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/openstack-compute-admin/target/docbkx/webhelp/**'
@ -289,7 +289,7 @@
goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/openstack-network-connectivity-admin/target/docbkx/webhelp/**'
@ -320,7 +320,7 @@
goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/openstack-object-storage-admin/target/docbkx/webhelp/**'
@ -344,7 +344,7 @@
target: ''
remove-prefix: 'www/'
excludes: ''
- console-log-post
- console-log
# in zuul/layout.yaml specified to only run against master branch.
# The old jenkins config polled github every 5 minutes and was also triggered
@ -377,7 +377,7 @@
goals: 'clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/openstack-ha/target/docbkx/webhelp/trunk/**'
@ -408,7 +408,7 @@
goals: '-Doperating.system=yum -Dprofile.os=centos;fedora;rhel -Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/openstack-install/target/docbkx/webhelp/**'
@ -439,7 +439,7 @@
goals: '-Doperating.system=apt -Dprofile.os=ubuntu -Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/openstack-install/target/docbkx/webhelp/**'
@ -470,7 +470,7 @@
goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/openstack-ops/target/docbkx/webhelp/**'
@ -501,7 +501,7 @@
goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources'
publishers:
- console-log-post
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/openstack-security/target/docbkx/webhelp/**'

4
modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml
View File

@ -36,7 +36,7 @@
publishers:
- link-logs
- console-log-post
- console-log
- job:
@ -77,4 +77,4 @@
publishers:
- link-logs
- console-log-post
- console-log

2
modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
View File

@ -40,4 +40,4 @@
- target: 'ci'
source: 'doc/build/html/**/*'
keep-hierarchy: true
- console-log-post
- console-log

2
modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml
View File

@ -15,7 +15,7 @@
target: 'developer/{name}'
remove-prefix: 'doc/build/html'
excludes: ''
- console-log-post
- console-log
- job-group:

2
modules/openstack_project/files/jenkins_job_builder/config/openstack-qa.yaml
View File

@ -17,4 +17,4 @@
- target: 'qa'
source: 'build/sphinx/html/**/*'
keep-hierarchy: true
- console-log-post
- console-log

2
modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml
View File

@ -35,7 +35,7 @@
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
- target: 'logs/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER'
source: '**/pip.log'
keep-hierarchy: false
copy-after-failure: true

2
modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml
View File

@ -17,7 +17,7 @@
/usr/local/jenkins/slave_scripts/pypi-upload.sh {name}
publishers:
- console-log-post
- console-log
- job-group:

50
modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
View File

@ -14,8 +14,8 @@
project: '{name}'
publishers:
- coverage-log-post
- console-log-post
- coverage-log
- console-log
node: '{node}'
@ -67,25 +67,7 @@
- assert-no-extra-files
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: '**/*nose_results.html'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: '**/*testr_results.html.gz'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: '.testrepository/tmp*'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: '**/*subunit_log.txt.gz'
keep-hierarchy: false
copy-after-failure: true
- test-results
- console-log
node: centos6
@ -113,25 +95,7 @@
- assert-no-extra-files
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: '**/*nose_results.html'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: '**/*testr_results.html.gz'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: '.testrepository/tmp*'
keep-hierarchy: false
copy-after-failure: true
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: '**/*subunit_log.txt.gz'
keep-hierarchy: false
copy-after-failure: true
- test-results
- console-log
node: '{node}'
@ -150,7 +114,7 @@
- scp:
site: 'static.openstack.org'
files:
- target: 'docs-draft/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER/'
- target: 'docs-draft/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER/'
source: 'doc/build/html/**'
keep-hierarchy: true
copy-after-failure: true
@ -186,7 +150,7 @@
- tarball:
project: '{name}'
site: '{tarball-site}'
- console-log-post
- console-log
- job-template:
@ -209,7 +173,7 @@
- tarball:
project: '{name}'
site: '{tarball-site}'
- console-log-post
- console-log
- job-template:

4
modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
View File

@ -9,7 +9,7 @@
/usr/local/jenkins/slave_scripts/upstream_translation_update.sh {name}
publishers:
- console-log-post
- console-log
node: 'tx'
@ -47,7 +47,7 @@
/usr/local/jenkins/slave_scripts/upstream_translation_update_manuals.sh
publishers:
- console-log-post
- console-log
node: 'tx'

2
modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
View File

@ -16,7 +16,7 @@
- target: 'ci/zuul'
source: 'doc/build/html/**/*'
keep-hierarchy: true
- console-log-post
- console-log
- job:
name: 'dev-zuul-coverage'

22
modules/openstack_project/files/logstash/log-gearman-client.py
View File

@ -74,19 +74,13 @@ class EventProcessor(threading.Thread):
except:
logging.exception("Exception submitting job to Gearman.")
log_dirs = {
'check': "/{build_change}/{build_patchset}/{build_queue}/"
"{build_name}/{build_number}/",
'gate': "/{build_change}/{build_patchset}/{build_queue}/"
"{build_name}/{build_number}/",
'post': "/{build_shortref}/{build_queue}/{build_name}/"
"{build_number}/",
'pre-release': "/{build_shortref}/{build_queue}/{build_name}/"
"{build_number}/",
'release': "/{build_shortref}/{build_queue}/{build_name}/"
"{build_number}/",
'UNKNOWN': "/periodic/{build_name}/{build_number}/",
}
def _get_log_dir(self, event):
parameters = event["build"].get("parameters", {})
base = parameters.get('BASE_LOG_PATH', '/periodic')
base += '/{name}/{number}/'.format(
name=event.get("name", "UNKNOWN"),
number=event["build"].get("number", "UNKNOWN"))
return base
def _parse_fields(self, event, filename):
fields = {}
@ -107,7 +101,7 @@ class EventProcessor(threading.Thread):
def _parse_event(self, event, fileopts):
fields = self._parse_fields(event, fileopts['name'])
log_dir = self.log_dirs.get(fields["build_queue"], "").format(**fields)
log_dir = self._get_log_dir(event)
source_url = fileopts.get('source-url', self.source_url) + \
log_dir + fileopts['name']
out_event = {}

6
modules/openstack_project/files/zuul/layout-dev.yaml
View File

@ -12,6 +12,8 @@ pipelines:
jobs:
- name: ^.*$
parameter-function: set_log_url
- name: gate-tempest-devstack-vm-cinder
branch: stable/folsom
- name: gate-tempest-devstack-vm-smoke
@ -56,9 +58,9 @@ jobs:
- name: openstack-ha-guide
branch: ^master$
- name: gate-openstack-cli-guide
success-pattern: http://docs-draft.openstack.org/{job.name}/{pipeline.name}/{build.number}/cli/quick-start
success-pattern: http://docs-draft.openstack.org/{build.parameters[BASE_LOG_PATH]}/{build.number}/cli/quick-start
- name: ^gate-.*-docs$
success-pattern: http://docs-draft.openstack.org/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}/doc/build/html/
success-pattern: http://docs-draft.openstack.org/{build.parameters[BASE_LOG_PATH]}/{job.name}/{build.number}/doc/build/html/
- name: ^gate-.*-requirements$
failure-message: Incompatible requirement found; see https://wiki.openstack.org/wiki/Requirements
branch: ^(?!stable/(folsom|grizzly)).*$

6
modules/openstack_project/files/zuul/layout.yaml
View File

@ -69,6 +69,8 @@ pipelines:
jobs:
- name: ^.*$
parameter-function: set_log_url
- name: gate-tempest-devstack-vm-cinder
branch: stable/folsom
- name: gate-tempest-devstack-vm-smoke
@ -139,9 +141,9 @@ jobs:
- name: openstack-security-guide
branch: ^master$
- name: gate-openstack-cli-guide
success-pattern: http://docs-draft.openstack.org/{job.name}/{pipeline.name}/{build.number}/cli/quick-start
success-pattern: http://docs-draft.openstack.org/{build.parameters[BASE_LOG_PATH]}/{job.name}/{build.number}/cli/quick-start
- name: ^gate-.*-docs$
success-pattern: http://docs-draft.openstack.org/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}/doc/build/html/
success-pattern: http://docs-draft.openstack.org/{build.parameters[BASE_LOG_PATH]}/{job.name}/{build.number}/doc/build/html/
- name: infra-publications-publish
branch: ^(?!master).*$
- name: ^gate-.*-requirements$

11
modules/openstack_project/files/zuul/openstack_functions.py
View File

@ -1 +1,10 @@
# No content currently. In repo for ease of future use.
def set_log_url(item, params):
if hasattr(item.change, 'refspec'):
path = "%s/%s/%s/%s" % (
params['ZUUL_CHANGE'][-2:], params['ZUUL_CHANGE'],
params['ZUUL_PATCHSET'], params['ZUUL_PIPELINE'])
else:
path = "%s/%s/%s" % (
params['ZUUL_NEWREV'][:2], params['ZUUL_NEWREV'],
params['ZUUL_PIPELINE'])
params['BASE_LOG_PATH'] = path