From Barak Korren <bkorren(a)redhat.com>:
Barak Korren has submitted this change and it was merged.
Change subject: Fix standard-ci artifact collection
......................................................................
Fix standard-ci artifact collection
When a project's standard CI scripts run, they place artifacts in the
exported-artifacts directory under the project's git clone directory.
Jenkins, however, collects artifactes from the exported-artifacts
directory under $WORKSPACE.
To bridge this gap, there was some code in the standard_*.sh scripts
(That are in-charge of invoking mock_runner.sh itself) to move stuff
from the project's directory to the worspace directory.
That code only ran if mock_runner.sh (And hence the project's own CI
script) was successful.
This meant that artifact colection in case of failure was impossible.
This patch:
- Moves the artifact collection to a new script that is run as a
post-build step.
- Removes the catch-all log collection code from cleanup.sh as that was
probably an attempt to work-around the issue explained here.
- Made mock_runner.sh log to a path under exported-artifacts so its logs
get collected
- Consolidates all standard-CI publishers into one standard-publisher
- Removed the unneeded extra publisher for the YAML DIFF jobs
Change-Id: Ife10ed15afb02333c9fbb92b362b376eafa0c047
Jira-Ticket:
https://ovirt-jira.atlassian.net/browse/OVIRT-988
Signed-off-by: Barak Korren <bkorren(a)redhat.com>
---
M automation/jenkins_check_yaml.sh
A jobs/confs/shell-scripts/collect_artifacts.sh
M jobs/confs/shell-scripts/mock_cleanup.sh
M jobs/confs/shell-scripts/standard_build_artifacts.sh
M jobs/confs/shell-scripts/standard_build_artifacts_manual.sh
M jobs/confs/shell-scripts/standard_check_merged.sh
M jobs/confs/shell-scripts/standard_check_patch.sh
M jobs/confs/yaml/publishers/exported-artifacts.yaml
D jobs/confs/yaml/publishers/html-reports.yaml
D jobs/confs/yaml/publishers/mock-cleanup.yaml
A jobs/confs/yaml/publishers/standard.yaml
M jobs/confs/yaml/templates/create-rpms_mock.yaml
M jobs/confs/yaml/templates/install-rpm-sanity.yaml
M jobs/confs/yaml/templates/repos-check-closure.yaml
M jobs/confs/yaml/templates/standard-stage.yaml
M mock_configs/mock_runner.sh
16 files changed, 88 insertions(+), 140 deletions(-)
Approvals:
Eyal Edri: Looks good to me
Barak Korren: Verified; Looks good to me, approved; Ready for merge
Gil Shinar: Looks good to me
Jenkins CI: Passed CI tests
--
To view, visit
https://gerrit.ovirt.org/69194
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife10ed15afb02333c9fbb92b362b376eafa0c047
Gerrit-PatchSet: 6
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: Barak Korren <bkorren(a)redhat.com>
Gerrit-Reviewer: Anton Marchukov <amarchuk(a)redhat.com>
Gerrit-Reviewer: Barak Korren <bkorren(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: David Caro <david(a)dcaro.es>
Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com>
Gerrit-Reviewer: Gil Shinar <gshinar(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nadav Goldin <ngoldin(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Shlomo Ben David <sbendavi(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>