From 322d7e5dfb548d27ef8a35a6122eede842e4f55d Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 15 Jun 2016 10:03:06 -0400 Subject: [PATCH] Ensure console-log is our last publisher This is related to zuulv25, we make sure console-log is the last publisher to ensure zuul-launcher logs are also uploaded. Change-Id: I1616b97fad2b97fb9e977ec14543aab4bc673b58 Signed-off-by: Paul Belanger --- jenkins/jobs/ara.yaml | 2 +- jenkins/jobs/beaker-jobs.yaml | 2 +- jenkins/jobs/bifrost.yaml | 6 ++-- jenkins/jobs/chef-jobs.yaml | 4 +-- jenkins/jobs/deb-openstack-pkg-tools.yaml | 2 +- jenkins/jobs/dragonflow.yaml | 2 +- jenkins/jobs/ec2-api.yaml | 2 +- jenkins/jobs/grenade.yaml | 2 +- jenkins/jobs/groups.yaml | 4 +-- jenkins/jobs/horizon.yaml | 2 +- jenkins/jobs/infra-publish-jobs.yaml | 2 +- jenkins/jobs/infra.yaml | 8 ++--- jenkins/jobs/javascript.yaml | 10 +++--- jenkins/jobs/kolla-kubernetes.yaml | 2 +- jenkins/jobs/kolla.yaml | 2 +- jenkins/jobs/kuryr.yaml | 2 +- jenkins/jobs/manuals-jobs.yaml | 6 ++-- jenkins/jobs/networking-midonet.yaml | 2 +- jenkins/jobs/networking-odl.yaml | 2 +- jenkins/jobs/networking-ovn.yaml | 2 +- jenkins/jobs/neutron-lbaas.yaml | 2 +- jenkins/jobs/neutron-vpnaas.yaml | 2 +- jenkins/jobs/openstack-ansible-jobs.yaml | 2 +- jenkins/jobs/openstackid.yaml | 4 +-- jenkins/jobs/python-jobs.yaml | 6 ++-- jenkins/jobs/rally.yaml | 40 +++++++++++------------ jenkins/jobs/sahara.yaml | 4 +-- jenkins/jobs/storyboard.yaml | 2 +- jenkins/jobs/translation-jobs.yaml | 4 +-- 29 files changed, 66 insertions(+), 66 deletions(-) diff --git a/jenkins/jobs/ara.yaml b/jenkins/jobs/ara.yaml index a0ad4d7035..b289b20784 100644 --- a/jenkins/jobs/ara.yaml +++ b/jenkins/jobs/ara.yaml @@ -15,5 +15,5 @@ timeout: 20 - timestamps publishers: + - devstack-logs - console-log - - devstack-logs \ No newline at end of file diff --git a/jenkins/jobs/beaker-jobs.yaml b/jenkins/jobs/beaker-jobs.yaml index 2b6bde7efc..f1939343a9 100644 --- a/jenkins/jobs/beaker-jobs.yaml +++ b/jenkins/jobs/beaker-jobs.yaml @@ -12,5 +12,5 @@ - exec-rake publishers: - - console-log - coverage-log-ruby + - console-log diff --git a/jenkins/jobs/bifrost.yaml b/jenkins/jobs/bifrost.yaml index ecedd14bee..23ee678061 100644 --- a/jenkins/jobs/bifrost.yaml +++ b/jenkins/jobs/bifrost.yaml @@ -29,8 +29,8 @@ scripts/test-bifrost.sh publishers: - - console-log - devstack-logs + - console-log - job: name: 'gate-bifrost-integration-dibipa-debian-nv' @@ -64,8 +64,8 @@ scripts/test-bifrost-build-images.sh publishers: - - console-log - devstack-logs + - console-log - job: name: 'gate-bifrost-integration-dhcp-nv' @@ -99,5 +99,5 @@ scripts/test-bifrost-inventory-dhcp.sh publishers: - - console-log - devstack-logs + - console-log diff --git a/jenkins/jobs/chef-jobs.yaml b/jenkins/jobs/chef-jobs.yaml index 8d53876aed..0788e09b8f 100644 --- a/jenkins/jobs/chef-jobs.yaml +++ b/jenkins/jobs/chef-jobs.yaml @@ -42,8 +42,8 @@ - chef-rake-integration publishers: - - console-log - devstack-logs + - console-log - job-template: name: periodic-{node}-{name}-chef-rake-integration @@ -64,8 +64,8 @@ - chef-rake-integration publishers: - - console-log - devstack-logs + - console-log - job-group: name: chef-test-jobs diff --git a/jenkins/jobs/deb-openstack-pkg-tools.yaml b/jenkins/jobs/deb-openstack-pkg-tools.yaml index 42724c1bac..0776d101fc 100644 --- a/jenkins/jobs/deb-openstack-pkg-tools.yaml +++ b/jenkins/jobs/deb-openstack-pkg-tools.yaml @@ -50,5 +50,5 @@ pkgos-infra-build-pkg publishers: - - console-log - deb-pkgs + - console-log diff --git a/jenkins/jobs/dragonflow.yaml b/jenkins/jobs/dragonflow.yaml index 429edfe439..20c6d2ce22 100644 --- a/jenkins/jobs/dragonflow.yaml +++ b/jenkins/jobs/dragonflow.yaml @@ -84,8 +84,8 @@ publishers: - test-results - devstack-logs - - console-log - rally-plot + - console-log - job-template: diff --git a/jenkins/jobs/ec2-api.yaml b/jenkins/jobs/ec2-api.yaml index aa662984ea..28e4b650b3 100644 --- a/jenkins/jobs/ec2-api.yaml +++ b/jenkins/jobs/ec2-api.yaml @@ -136,5 +136,5 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log diff --git a/jenkins/jobs/grenade.yaml b/jenkins/jobs/grenade.yaml index fcfed7a301..21f3be1587 100644 --- a/jenkins/jobs/grenade.yaml +++ b/jenkins/jobs/grenade.yaml @@ -32,6 +32,6 @@ envlist: 'docs' publishers: - - console-log - upload-sphinx-draft # TODO(jhesketh): Add job for uploading built docs + - console-log diff --git a/jenkins/jobs/groups.yaml b/jenkins/jobs/groups.yaml index 05edf8d3e1..57aacc9d59 100644 --- a/jenkins/jobs/groups.yaml +++ b/jenkins/jobs/groups.yaml @@ -15,7 +15,6 @@ export PATH=./drush:$PATH sh scripts/dev-build.sh publishers: - - console-log - coverage-log - scp: site: 'static.openstack.org' @@ -24,6 +23,7 @@ source: './reports/**' keep-hierarchy: true copy-after-failure: true + - console-log - job-template: name: 'groups-release-{job-suffix}' @@ -67,7 +67,6 @@ mkdir -p drupal-updates/release-history/groups scripts/release-manifest.php --version=$VERSION --releasetar=groups-$PROJECT_VER.tar.gz --md5=$MD5HASH --outfile=$OUTFILE --manifest-url=$MANIFESTURL --verbose --debug publishers: - - console-log - coverage-log - scp: site: 'static.openstack.org' @@ -88,3 +87,4 @@ source: 'drupal-updates/**' keep-hierarchy: true copy-after-failure: false + - console-log diff --git a/jenkins/jobs/horizon.yaml b/jenkins/jobs/horizon.yaml index 7effd5ac06..0612cab2cd 100644 --- a/jenkins/jobs/horizon.yaml +++ b/jenkins/jobs/horizon.yaml @@ -54,8 +54,8 @@ publishers: - test-results - devstack-logs - - console-log - publish-test-reports + - console-log - publisher: name: publish-test-reports diff --git a/jenkins/jobs/infra-publish-jobs.yaml b/jenkins/jobs/infra-publish-jobs.yaml index 3b6b045f40..4e8ba230ad 100644 --- a/jenkins/jobs/infra-publish-jobs.yaml +++ b/jenkins/jobs/infra-publish-jobs.yaml @@ -11,13 +11,13 @@ - docs publishers: - - console-log - ftp: site: '{doc-publisher-site}' source: 'doc/build/html/**' target: 'infra/{doc-publisher-folder}' remove-prefix: 'doc/build/html' excludes: '' + - console-log - job: name: publish-infra-docs-index diff --git a/jenkins/jobs/infra.yaml b/jenkins/jobs/infra.yaml index 4266414677..5b03968201 100644 --- a/jenkins/jobs/infra.yaml +++ b/jenkins/jobs/infra.yaml @@ -159,7 +159,6 @@ - infra-puppet-apply publishers: - - console-log - scp: site: 'static.openstack.org' files: @@ -167,6 +166,7 @@ source: 'openstack-infra/system-config/applytest/**' keep-hierarchy: false copy-after-failure: true + - console-log - job-template: name: 'gate-openstackci-beaker-{node}' @@ -227,7 +227,6 @@ envlist: 'ical' publishers: - - console-log - scp: site: 'static.openstack.org' files: @@ -253,6 +252,7 @@ - target: 'calendars/' source: 'output/calendars/*' copy-after-failure: false + - console-log - job: name: gate-irc-meetings-tox-ical @@ -279,7 +279,6 @@ # should run on every job regardless of status. onfailure: False onsuccess: False - - console-log - scp: site: 'static.openstack.org' files: @@ -287,6 +286,7 @@ source: 'output/**' keep-hierarchy: false copy-after-failure: true + - console-log - job: name: gate-infra-ansible @@ -372,7 +372,6 @@ mv ~/rpmbuild/RPMS/x86_64 $WORKSPACE/package-afs-centos7 publishers: - - console-log - scp: site: 'tarballs.openstack.org' files: @@ -380,3 +379,4 @@ source: 'package-afs-centos7/**' keep-hierarchy: true copy-after-failure: false + - console-log diff --git a/jenkins/jobs/javascript.yaml b/jenkins/jobs/javascript.yaml index 8b29ba6ddf..0719416423 100644 --- a/jenkins/jobs/javascript.yaml +++ b/jenkins/jobs/javascript.yaml @@ -28,7 +28,6 @@ command: '{command}' - assert-no-extra-files publishers: - - console-log - coverage-log - scp: site: 'static.openstack.org' @@ -45,6 +44,7 @@ source: 'karma.subunit' keep-hierarchy: false copy-after-failure: true + - console-log # Builds and uploads a tarball using NPM. - job-template: @@ -76,7 +76,6 @@ - tarball: project: '{name}' site: '{tarball-site}' - - console-log - scp: site: 'static.openstack.org' files: @@ -84,6 +83,7 @@ source: 'npm-shrinkwrap.json' keep-hierarchy: false copy-after-failure: false + - console-log # Builds and uploads a draft version of the project to docs-draft. - job-template: @@ -117,7 +117,6 @@ mv ./package/{package-dir}/* ./dist/ publishers: - - console-log - coverage-log - scp: site: 'static.openstack.org' @@ -132,6 +131,7 @@ source: 'npm-shrinkwrap.json' keep-hierarchy: false copy-after-failure: false + - console-log # Builds a draft application and uploads it to docs-draft. To use this build, # your Gruntfile must declare a target named "build:draft" @@ -158,7 +158,6 @@ - assert-no-extra-files publishers: - - console-log - coverage-log - scp: site: 'static.openstack.org' @@ -174,6 +173,7 @@ source: 'dist/**' keep-hierarchy: true copy-after-failure: false + - console-log # Builds a release tarball - job-template: @@ -204,7 +204,6 @@ cp {name}-$PROJECT_VER.tar.gz tarballs/{name}-latest.tar.gz mv {name}-$PROJECT_VER.tar.gz tarballs/ publishers: - - console-log - coverage-log - scp: site: 'static.openstack.org' @@ -217,6 +216,7 @@ source: 'tarballs/*.tar.gz' keep-hierarchy: false copy-after-failure: false + - console-log # Uploads a release tarball to npm. - job-template: diff --git a/jenkins/jobs/kolla-kubernetes.yaml b/jenkins/jobs/kolla-kubernetes.yaml index c30272dec8..5c7cf21761 100644 --- a/jenkins/jobs/kolla-kubernetes.yaml +++ b/jenkins/jobs/kolla-kubernetes.yaml @@ -18,5 +18,5 @@ tox -e {action}-{distro}-{type} publishers: - - console-log - devstack-logs + - console-log diff --git a/jenkins/jobs/kolla.yaml b/jenkins/jobs/kolla.yaml index b2dce2d9c1..7fcccb4a70 100644 --- a/jenkins/jobs/kolla.yaml +++ b/jenkins/jobs/kolla.yaml @@ -18,5 +18,5 @@ tox -e {action}-{distro}-{type} publishers: - - console-log - devstack-logs + - console-log diff --git a/jenkins/jobs/kuryr.yaml b/jenkins/jobs/kuryr.yaml index a593356c6a..dd8f3b4d0d 100644 --- a/jenkins/jobs/kuryr.yaml +++ b/jenkins/jobs/kuryr.yaml @@ -127,5 +127,5 @@ publishers: - test-results - devstack-logs - - console-log - rally-plot + - console-log diff --git a/jenkins/jobs/manuals-jobs.yaml b/jenkins/jobs/manuals-jobs.yaml index d6175bbfd0..49058dbfb8 100644 --- a/jenkins/jobs/manuals-jobs.yaml +++ b/jenkins/jobs/manuals-jobs.yaml @@ -33,9 +33,9 @@ - assert-no-extra-files publishers: - - console-log - upload-docs-draft - upload-doc-build-results + - console-log - job-template: name: '{name}-tox-doc-{envlist}' @@ -56,9 +56,9 @@ envlist: '{envlist}' publishers: - - console-log - upload-to-docs-site - upload-doc-build-results + - console-log - job-group: @@ -90,7 +90,6 @@ - shell: "/usr/local/jenkins/slave_scripts/run-install-guide.sh" publishers: - - console-log - scp: site: 'static.openstack.org' files: @@ -98,6 +97,7 @@ source: 'install-guide/build/html/**' keep-hierarchy: true copy-after-failure: true + - console-log - job-template: name: '{name}-install-guide' diff --git a/jenkins/jobs/networking-midonet.yaml b/jenkins/jobs/networking-midonet.yaml index d9b62ccdfd..e4ea88c9fc 100644 --- a/jenkins/jobs/networking-midonet.yaml +++ b/jenkins/jobs/networking-midonet.yaml @@ -206,5 +206,5 @@ publishers: - test-results - devstack-logs - - console-log - rally-plot + - console-log diff --git a/jenkins/jobs/networking-odl.yaml b/jenkins/jobs/networking-odl.yaml index 7e1489b2b7..c550acfe8e 100644 --- a/jenkins/jobs/networking-odl.yaml +++ b/jenkins/jobs/networking-odl.yaml @@ -114,5 +114,5 @@ publishers: - test-results - devstack-logs - - console-log - rally-plot + - console-log diff --git a/jenkins/jobs/networking-ovn.yaml b/jenkins/jobs/networking-ovn.yaml index b8e2d2ae58..14f0979280 100644 --- a/jenkins/jobs/networking-ovn.yaml +++ b/jenkins/jobs/networking-ovn.yaml @@ -208,8 +208,8 @@ publishers: - test-results - devstack-logs - - console-log - rally-plot + - console-log - job-template: name: '{pipeline}-networking-ovn-dsvm-{ovntest}{job-suffix}' diff --git a/jenkins/jobs/neutron-lbaas.yaml b/jenkins/jobs/neutron-lbaas.yaml index 0e23cc713c..d6b806a026 100644 --- a/jenkins/jobs/neutron-lbaas.yaml +++ b/jenkins/jobs/neutron-lbaas.yaml @@ -86,5 +86,5 @@ publishers: - test-results - devstack-logs - - console-log - publish-screenshots + - console-log diff --git a/jenkins/jobs/neutron-vpnaas.yaml b/jenkins/jobs/neutron-vpnaas.yaml index ddff8b995a..8d25dbe16b 100644 --- a/jenkins/jobs/neutron-vpnaas.yaml +++ b/jenkins/jobs/neutron-vpnaas.yaml @@ -84,8 +84,8 @@ publishers: - test-results - devstack-logs - - console-log - rally-plot + - console-log - job-template: name: '{pipeline}-neutron-dsvm-tempest-vpnaas{job-suffix}' diff --git a/jenkins/jobs/openstack-ansible-jobs.yaml b/jenkins/jobs/openstack-ansible-jobs.yaml index 59930f959f..bd4b3fc8af 100644 --- a/jenkins/jobs/openstack-ansible-jobs.yaml +++ b/jenkins/jobs/openstack-ansible-jobs.yaml @@ -14,5 +14,5 @@ - ansible-check-commit publishers: - - console-log - devstack-logs + - console-log diff --git a/jenkins/jobs/openstackid.yaml b/jenkins/jobs/openstackid.yaml index 4d5e63d37e..5ad828cc2e 100644 --- a/jenkins/jobs/openstackid.yaml +++ b/jenkins/jobs/openstackid.yaml @@ -13,7 +13,6 @@ #!/bin/bash -xe /usr/local/jenkins/slave_scripts/php-laravel-build.sh publishers: - - console-log - coverage-log - scp: site: 'static.openstack.org' @@ -22,6 +21,7 @@ source: './reports/**' keep-hierarchy: true copy-after-failure: true + - console-log - job-template: name: 'openstackid-release-{job-suffix}' @@ -53,7 +53,6 @@ cp openstackid-$PROJECT_VER.tar.gz tarballs/openstackid-latest.tar.gz mv openstackid-$PROJECT_VER.tar.gz tarballs/ publishers: - - console-log - coverage-log - scp: site: 'static.openstack.org' @@ -66,3 +65,4 @@ source: 'tarballs/*.tar.gz' keep-hierarchy: false copy-after-failure: false + - console-log diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml index 076a4bff88..8401dfae8c 100644 --- a/jenkins/jobs/python-jobs.yaml +++ b/jenkins/jobs/python-jobs.yaml @@ -16,7 +16,6 @@ env: cover publishers: - - console-log - scp: site: 'static.openstack.org' files: @@ -24,6 +23,7 @@ source: 'cover/**' keep-hierarchy: true copy-after-failure: true + - console-log node: ubuntu-trusty @@ -52,7 +52,6 @@ env: cover publishers: - - console-log - scp: site: 'static.openstack.org' files: @@ -60,6 +59,7 @@ source: 'cover/**' keep-hierarchy: true copy-after-failure: true + - console-log node: ubuntu-trusty @@ -300,8 +300,8 @@ - docs publishers: - - console-log - upload-sphinx-draft + - console-log node: ubuntu-trusty diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml index 88bf30e018..4cb577d3f4 100644 --- a/jenkins/jobs/rally.yaml +++ b/jenkins/jobs/rally.yaml @@ -255,8 +255,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job: @@ -276,8 +276,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - builder: @@ -386,8 +386,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - builder: @@ -445,8 +445,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job-template: @@ -466,8 +466,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job-template: @@ -486,8 +486,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job-template: @@ -507,8 +507,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job-template: @@ -533,8 +533,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job-template: @@ -559,8 +559,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job-template: @@ -585,8 +585,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job-template: @@ -611,8 +611,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job-template: name: 'gate-rally-dsvm-rally-{service}' @@ -636,8 +636,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job-template: name: 'gate-{name}-integrate-dsvm-rally' @@ -653,8 +653,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job: @@ -690,7 +690,6 @@ publishers: - devstack-logs - - console-log - scp: site: 'static.openstack.org' files: @@ -701,6 +700,7 @@ source: 'rally-cli-output-files/**' keep-hierarchy: true copy-after-failure: true + - console-log - job-template: @@ -723,8 +723,8 @@ publishers: - devstack-logs - - console-log - rally-verify + - console-log - builder: name: devstack-rally-verify @@ -809,8 +809,8 @@ publishers: - devstack-logs - - console-log - rally-verify + - console-log - builder: @@ -869,8 +869,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job: name: 'gate-rally-dsvm-keystone-v2api-rally' @@ -894,8 +894,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job-template: name: 'gate-rally-dsvm-senlin-{name}' @@ -919,8 +919,8 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log - job-template: @@ -945,5 +945,5 @@ publishers: - devstack-logs - - console-log - rally-plot + - console-log diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml index 5ac6ba08b1..ad131d41a1 100644 --- a/jenkins/jobs/sahara.yaml +++ b/jenkins/jobs/sahara.yaml @@ -48,8 +48,8 @@ publishers: - test-results - devstack-logs - - console-log - publish-sahara-screenshots + - console-log - publisher: name: publish-sahara-screenshots @@ -124,8 +124,8 @@ - sahara-extra-build publishers: - - console-log - sahara-extra-publish + - console-log - job-template: diff --git a/jenkins/jobs/storyboard.yaml b/jenkins/jobs/storyboard.yaml index 3a46d81167..0cf8da15e0 100644 --- a/jenkins/jobs/storyboard.yaml +++ b/jenkins/jobs/storyboard.yaml @@ -54,7 +54,6 @@ ./openstack-infra/storyboard/tools/destroy_test_backend.sh publishers: - - console-log - coverage-log - scp: site: 'static.openstack.org' @@ -63,3 +62,4 @@ source: 'reports/**' keep-hierarchy: true copy-after-failure: true + - console-log diff --git a/jenkins/jobs/translation-jobs.yaml b/jenkins/jobs/translation-jobs.yaml index 0e65f5f3b3..db0edfe3c9 100644 --- a/jenkins/jobs/translation-jobs.yaml +++ b/jenkins/jobs/translation-jobs.yaml @@ -12,7 +12,6 @@ /usr/local/jenkins/slave_scripts/upstream_translation_update.sh {name} {template-name} publishers: - - console-log - scp: site: 'tarballs.openstack.org' files: @@ -26,6 +25,7 @@ source: 'testrepository.subunit.gz' keep-hierarchy: false copy-after-failure: true + - console-log node: 'proposal' @@ -44,7 +44,6 @@ /usr/local/jenkins/slave_scripts/propose_translation_update.sh {name} {branch} {template-name} publishers: - - console-log - scp: site: 'static.openstack.org' files: @@ -52,6 +51,7 @@ source: 'testrepository.subunit.gz' keep-hierarchy: false copy-after-failure: true + - console-log node: 'proposal'