1 |
On Fri, May 15, 2020 at 6:07 AM Ben Kohler <bkohler@g.o> wrote: |
2 |
> |
3 |
> Previously when we were copying locally there was no (major) problem |
4 |
> with wildcarding a long list of files to be transferred after every |
5 |
> single spec finishes. Now that we are transferring to a remote host, |
6 |
> this results in a lot of wasted transfer time & bandwidth. |
7 |
> |
8 |
> I have adjusted the post_build function to only transfer the new files |
9 |
> known to be produced by each spec (which has files meant to be |
10 |
> published). |
11 |
|
12 |
Thanks Ben. Both patches look good to me. Thanks for working on this. |
13 |
|
14 |
Just a couple small comments inline. |
15 |
|
16 |
> Signed-off-by: Ben Kohler <bkohler@g.o> |
17 |
> --- |
18 |
> tools/catalyst-auto-amd64-experimental.conf | 87 ++++++++++++++------- |
19 |
|
20 |
Do we actually use this file in production? It looks like the main |
21 |
difference is TYPE="experimental" vs TYPE="auto" and I don't see TYPE |
22 |
used anywhere. Can we just remove this file? |
23 |
|
24 |
> tools/catalyst-auto-amd64.conf | 86 +++++++++++++------- |
25 |
> 2 files changed, 113 insertions(+), 60 deletions(-) |
26 |
> |
27 |
> diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf |
28 |
> index e7b1ea79..2aa91a03 100644 |
29 |
> --- a/tools/catalyst-auto-amd64-experimental.conf |
30 |
> +++ b/tools/catalyst-auto-amd64-experimental.conf |
31 |
> @@ -26,6 +26,7 @@ SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec" |
32 |
> |
33 |
> SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" |
34 |
> |
35 |
> + |
36 |
|
37 |
Stray newline, but I see that this is to reduce the differences |
38 |
between the experimental and non-experimental versions of the file. I |
39 |
might remove the newline from the other instead, but I don't feel |
40 |
strongly. |
41 |
|
42 |
> SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
43 |
> SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
44 |
> SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec" |
45 |
> @@ -43,7 +44,7 @@ EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]" |
46 |
> update_symlinks() { |
47 |
> # Symlink the latest stages3 to build from |
48 |
> for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do |
49 |
> - pushd $d >/dev/null |
50 |
> + pushd "${d}" >/dev/null || exit |
51 |
> for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do |
52 |
> # 20yymmddThhmmssZ |
53 |
> # 20yymmddhhmmss |
54 |
> @@ -57,11 +58,13 @@ update_symlinks() { |
55 |
> <<<"$f") |
56 |
> ln -svf "$f" "$of" |
57 |
> done |
58 |
> - popd >/dev/null |
59 |
> + popd >/dev/null || exit |
60 |
> done |
61 |
> } |
62 |
> |
63 |
> post_build() { |
64 |
> + local set=$1 spec=$2 |
65 |
> + |
66 |
> cmd=( |
67 |
> rsync |
68 |
|
69 |
This would be a good opportunity to create and use an upload() |
70 |
function like the other conf files have. |