Commit graph

96 commits

Author SHA1 Message Date
Mike Frysinger 0d1104d04f catalyst-auto: fix preclean logic after snapshot changes
The snapshot generation logic was moved earlier in the build (before
the cleaning logic) which caused the preclean to nuke the freshly
generated cache.  Move all the preclean logic back up before that.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2020-05-31 12:43:59 -04:00
Mike Frysinger cfc55d1712 catalyst-auto: standardize indentation
This file uses tabs in most of it, so migrate the few funcs using
spaces over to tabs.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2020-05-31 12:32:02 -04:00
Matt Turner a09f3dfda4 catalyst-auto: Don't send useless failure email
Signed-off-by: Matt Turner <mattst88@gentoo.org>
2020-05-17 15:29:53 -07:00
Robin H. Johnson 703d2ef0c1
catalyst-auto: print full path to specfile for the email
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2020-05-11 22:47:03 -07:00
Robin H. Johnson 62bfd232bb
catalyst-auto: defer purge until all sets are done
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2020-05-11 22:46:34 -07:00
Ben Kohler 05592ee0b7
catalyst-auto: set DATESTAMP again
This var is still used by some arches' catalyst-auto configs

Signed-off-by: Ben Kohler <bkohler@gentoo.org>
2020-05-11 13:53:55 -05:00
Robin H. Johnson 77b29c8686
tools/catalyst-auto: permit OTHER flags in /etc/resolv.conf
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2020-05-07 21:59:19 -07:00
Matt Turner 51d806875e catalyst-auto: Add fallback for unset storedir
Signed-off-by: Matt Turner <mattst88@gentoo.org>
2020-04-30 16:12:56 -07:00
Matt Turner 943e1a7181 catalyst-auto: Support sqfs snapshots
Signed-off-by: Matt Turner <mattst88@gentoo.org>
2020-04-29 23:04:59 -07:00
Matt Turner 43aa276417 catalyst-auto: Drop unnecessary spec munging
No longer necessary with @TIMESTAMP@.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
2020-04-29 12:37:50 -07:00
Matt Turner 369e27e399 catalyst-auto: Drop setting @DATESTAMP@
Not used in any of the spec files.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
2020-04-28 21:36:06 -07:00
Matt Turner e24e331fa3 catalyst-auto: Ensure 'options edns0' is in /etc/resolv.conf
Signed-off-by: Matt Turner <mattst88@gentoo.org>
2020-04-25 22:23:48 -07:00
Matt Turner e9ea15ab8b Upload stages to releng-incoming.gentoo.org
Most architecture's build systems are hosted at OSUOSL. The place the
stages need to end up is ultimately masterreleases.gentoo.org, also at
OSUOSL. For some unknown reason, instead of rsync'ing from one system to
another in the same building, we were sending the stages first (slowly,
I might add) to nightheron in France, before sending them back to
OSUOSL.

robbat2 has added a releng-incoming.gentoo.org DNS record that currently
points to nightheron. This will allow us to switch the record in the
future and save the stages from needing to circumnavigate the globe
before reaching the mirrors.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
2020-04-25 22:18:34 -07:00
Matt Turner 492aacba77 catalyst-auto: Combine common functions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
2019-09-01 19:04:59 -07:00
Mike Frysinger c63938c5e0 catalyst-auto: run git merge in quiet mode 2018-01-16 11:24:43 -05:00
Mike Frysinger bbca329576 catalyst-auto: log the command in the log file itself
This should make it clear in each log file what is being run, especially
when a phase is run more than once (like post_build).
2018-01-15 22:42:07 -05:00
Mike Frysinger f98bc791e6 catalyst-auto: pass current targets down to post_build
Commit b7e493b4e4 (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.
2018-01-15 20:52:14 -05:00
Mike Frysinger 8f6370f8b3 catalyst-auto: run update_symlinks by default in pre_build
All configs defining update_symlinks run it in pre_build, and all the
other configs will want to do the same.  So make it the default in the
pre_build phase.
2018-01-15 20:42:19 -05:00
Mike Frysinger a8e70e1976 catalyst-auto: move git update into main script
All of our config files are doing this already, so move it into the
common code.
2018-01-15 20:17:43 -05:00
Mike Frysinger 04b56eaab3 catalyst-auto: move container logic into a func too
This lets us put it after command line parsing.
2018-01-15 20:13:59 -05:00
Mike Frysinger b291ea4754 catalyst-auto: move all code into functions
Mixing inline funcs and executable code makes it hard to follow and
shuffle ordering of operations.  Put everything other than variables
into functions.

The delta here is large, but it's almost entirely indentation changes.

This also makes updating the script (like `git pull`) more resilient.
2018-01-15 20:11:44 -05:00
Robin H. Johnson 5d73c6b04a
catalyst-auto: add intermediate verbose, that prints the command, but not the output; -vv has old behavior
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-28 21:32:10 -08:00
Robin H. Johnson af9a181c70
catalyst-auto: fix title.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-15 10:40:07 -08:00
Robin H. Johnson 85bac3a8a2
catalyst-auto: only purge tmpdir+autoresume, not pkgdir.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-14 19:45:09 -08:00
Robin H. Johnson b7e493b4e4
catalyst-auto: run trigger_post_build after every successful spec, to export results sooner.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-14 19:44:41 -08:00
Robin H. Johnson 561af1245f
catalyst-auto/run_cmd: append logs instead of overwrite
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-14 19:44:07 -08:00
Robin H. Johnson ed258c751b
tools/catalyst-auto: change datestamp->timestamp
Prepare for doing multiple automated runs in a single day on
newer/faster build systems.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-07 23:40:38 -08:00
Robin H. Johnson 44b56bd2f8
catalyst: do not use --purge so we can hit binpkgcache.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-06 23:01:35 -08:00
Mike Frysinger 1de39bb16d catalyst-auto: use full system hostname by default 2017-03-22 22:14:42 -04:00
Mike Frysinger e98ae4f69e catalyst-auto: add missing local body in send_email 2016-12-21 20:20:03 -05:00
Mike Frysinger ef83c934a8 catalyst-auto: fix return value passing with run_cmd helper 2016-12-21 20:20:03 -05:00
Mike Frysinger e8186ef489 catalyst-auto: rework run_cmd pass through
Make the logfile the first arg so the rest of the args are the command
to actually run.  This allows us to properly quote arguments.
2016-12-21 20:20:03 -05:00
Mike Frysinger 12b23fa07e catalyst-auto: fix quoting in a number of places 2016-12-21 20:20:03 -05:00
Mike Frysinger 6fd55163c0 catalyst-auto: reject unknown command line arguments 2016-12-21 20:20:03 -05:00
Mike Frysinger d56243723a catalyst-auto: drop unused variables 2016-12-21 20:20:02 -05:00
Robin H. Johnson 3a6d81ff2e
catalyst-auto: do not fail if /usr/bin/time is not present.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-05-30 09:13:32 -07:00
Robin H. Johnson 380990612e
catalyst-auto: datestamp tmpdir for ease of debug.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-05-27 13:43:08 -07:00
Mike Frysinger d97b2662fa catalyst-auto: use local in a few more places 2016-05-23 22:02:22 -04:00
Mike Frysinger b86673c791 catalyst-auto: convert echo -e to printf
Makes the code a bit more robust.
2016-05-23 22:00:31 -04:00
Mike Frysinger d4e6ae0019 convert GITDIR over to REPO_DIR
The variables were representing the same thing, so merge them.
2016-05-19 22:17:41 -04:00
Mike Frysinger 170331ecea catalyst-auto: automatically calculate REPO_DIR
Rather than hardcode it to a path that works on only a few systems,
switch it to the dynamic calculation like we use for GITDIR.
2016-05-19 22:16:14 -04:00
Mike Frysinger 1294da6932 catalyst-auto: try to fix syntax error in previous commits 2016-05-07 16:04:33 -04:00
Robin H. Johnson 56e7e887ec
catalyst-auto: fix whitespace.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-05-06 11:30:25 -07:00
Jorge Manuel B. S. Vicetto (jmbsvicetto) bac6e3a2d7 Move the code to update symlinks to a separate function, call it from pre_build and after each set build.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
2016-05-05 10:07:20 +00:00
Robin H. Johnson a77a4ebce5
catalyst-auto: Record how long the catalyst runs take.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-29 11:20:28 -07:00
Jorge Manuel B. S. Vicetto (jmbsvicetto) 67beeebbdf Stop using hardcoded paths for the releng repo.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
2016-04-26 22:27:56 +00:00
Mike Frysinger 08a69c4392 catalyst-auto: move default email settings to main script 2016-03-27 01:31:30 -04:00
Mike Frysinger bc16472a15 catalyst-auto: allow configs to set BUILD_SRCDIR_BASE
At least the amd64/x86 ones do this via ../config/build.env files.
2016-03-24 01:25:28 -04:00
Mike Frysinger 51b8860d23 catalyst-auto: add an option to hold a lock while running
This makes it easy to put into a cronjob and not worry about a copy
already/still running.
2016-03-23 14:20:52 -04:00
Mike Frysinger fdc39e249c catalyst-auto: minor word smithing 2016-03-22 12:46:36 -04:00