diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2018-01-15 20:52:14 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2018-01-15 20:52:14 -0500 |
| commit | f98bc791e6f6404707475877e4f469fb665c5f49 (patch) | |
| tree | 4d8bc35b24cdf73f91a376a618e6d21e23d4dec6 /tools/catalyst-auto | |
| parent | catalyst-auto: move remaining configs from pre_build to update_symlinks (diff) | |
| download | releng-f98bc791e6f6404707475877e4f469fb665c5f49.tar.gz releng-f98bc791e6f6404707475877e4f469fb665c5f49.tar.bz2 releng-f98bc791e6f6404707475877e4f469fb665c5f49.zip | |
catalyst-auto: pass current targets down to post_build
Commit b7e493b4e4ad6cf6f9367e4b139df042526c21de (run trigger_post_build
after every successful spec) broke a lot of builders. The configs were
written to be called only after everything was done, but by calling it
after the first build (stage1 only), all the other artifacts we expected
did not yet exist.
Change post_build to pass the current set & spec name down so the config
can figure out what is available at that point in time.
Diffstat (limited to 'tools/catalyst-auto')
| -rwxr-xr-x | tools/catalyst-auto | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/catalyst-auto b/tools/catalyst-auto index 750e7047..756bc515 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -111,10 +111,11 @@ catalyst_var() { } trigger_post_build() { - if ! run_cmd "${TMPDIR}/log/post_build.log" post_build; then - send_email "Catalyst build error - post_build" "The post_build function failed" "${TMPDIR}/log/post_build.log" - exit 1 - fi + local set=$1 spec=$2 + if ! run_cmd "${TMPDIR}/log/post_build.log" post_build "${set}" "${spec}"; then + send_email "Catalyst build error - post_build" "The post_build function failed" "${TMPDIR}/log/post_build.log" + exit 1 + fi } parse_args() { @@ -365,7 +366,7 @@ run_catalyst_commands() { send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}" continue 2 else - trigger_post_build + trigger_post_build "${a}" "${i}" fi done @@ -377,7 +378,7 @@ run_catalyst_commands() { send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}" break else - trigger_post_build + trigger_post_build "${a}" "${i}" fi done |