Commit graph

246 commits

Author SHA1 Message Date
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
731b5886ad
tools: fix typo of DEST_HARDEND
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-28 11:01:26 -08:00
Jorge Manuel B. S. Vicetto (jmbsvicetto)
93bc214182 Sync amd64 and x86 base and experimental scripts. Add a few missing popd calls to base scripts.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
2017-12-27 01:54:39 -01:00
Jorge Manuel B. S. Vicetto (jmbsvicetto)
0c3d971bfb Fix typo.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
2017-12-22 11:29:30 +00:00
Jorge Manuel B. S. Vicetto (jmbsvicetto)
495425ec6a Drop old set definition.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
2017-12-22 11:22:26 +00:00
Jorge Manuel B. S. Vicetto (jmbsvicetto)
3190fadba2 Use 2 vars for destinations (one for default and another for hardened).
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
2017-12-22 11:02:44 +00: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
0292a7e2b5
tools/catalyst-auto-{x86,amd64}: refactor post_build for remote buildhost.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-14 21:48:20 -08:00
Robin H. Johnson
bcdd88a2d4
tools/catalyst-auto-sparc64: start common post_build refactor
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-14 21:39:40 -08:00
Robin H. Johnson
d9f56a2c95
tools/catalyst-auto-amd64: stage4 builds should be optional.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-14 21:28:22 -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
a5c5c7faad
catalyst-auto-amd64: verbosely update_symlinks.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-14 19:39:33 -08:00
Robin H. Johnson
c19080d5f4
catalyst-auto: tweak timestamp.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-08 00:04:40 -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
Robin H. Johnson
ad4692b02f
Drop more stage4-cloud.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-12-03 13:23:35 -08:00
Matthew Thode
c65a620930
remove stage4 cloud stages from tools/catalyst-auto-amd64.conf 2017-12-03 15:20:03 -06:00
Matthew Thode
1ce3bc7326
arm64 stage building
this is steev's work
2017-12-01 16:53:39 -06:00
Mike Frysinger
16e8a9fdc4 catalyst-auto: scope ppc upload names
Shouldn't impact current builds, but avoids double uploads when we run
ppc & ppc64 builds on the same system.
2017-03-22 22:16:22 -04:00
Mike Frysinger
1de39bb16d catalyst-auto: use full system hostname by default 2017-03-22 22:14:42 -04:00
Mike Frysinger
9444f99d3d update armin keys to same root path as others 2017-03-22 22:12:54 -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
e243f99edf
catalyst-auto: squelch all pushd/popd
Have some sed magic, including a negative match.

git grep -l -e pushd -e popd \
| xargs sed -i -r \
  -e '/(pushd|popd)/{ /null/! { s,$, >/dev/null,g } }'

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-06-14 18:31:06 -07: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
bc049160cb stage_build.sh: punt unused script
No one seems to use it or ask about it, so punt it until someone notices.
2016-05-23 22:27:18 -04: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
Robin H. Johnson
fadbc54d95
tools: Add a config that filters to stage4 only.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2016-04-27 14:34:07 -07:00
Jorge Manuel B. S. Vicetto (jmbsvicetto)
407605789e Change copy logic.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
2016-04-27 01:58:51 +00:00
Jorge Manuel B. S. Vicetto (jmbsvicetto)
11c84ac57d Whitespace. Stop hardcoding the bz2 extension and sync updates to the scripts to the experimental scripts.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
2016-04-26 22:35:19 +00: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
Jorge Manuel B. S. Vicetto (jmbsvicetto)
f5d7bfff3a Whitespace.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
2016-04-26 21:46:07 +00:00