1167255 - Add the ability to pass in multiple mozharness configs to the TC desktop-builder

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Morgan Phillips [:mrrrgn]]

We need to be able to do things like:

mozharness.py --config /builds/foo.py --config /builds/sub_build/bar.py

Comment 1

[Morgan Phillips [:mrrrgn]]

TC run using this, showing that it works.

Comment 2

[Morgan Phillips [:mrrrgn]]

Attachment: multiconfig.diff

Comment 3

[Dustin J. Mitchell [:dustin] (he/him)]

Comment on attachment 8609321 [details] [diff] [review]
multiconfig.diff

Review of attachment 8609321 [details] [diff] [review]:
-----------------------------------------------------------------

Minor bits, but otherwise good to go.

::: testing/docker/desktop-build/bin/build.sh
@@ +50,5 @@
>  # Ensure that in tree libraries can be found
>  export LIBRARY_PATH=$LIBRARY_PATH:$WORKSPACE/src/obj-firefox:$WORKSPACE/src/gcc/lib64
>  
> +# test required parameters are supplied; -z is preferred over "test" because
> +# it doesn't fail on variables with spaces in them.

Quoting the variables lets test work with space:

dustin@euclid ~ $ var="foo bar"
dustin@euclid ~ $ test $var; echo $?
bash: test: foo: unary operator expected
2
dustin@euclid ~ $ test "$var"; echo $?
0
dustin@euclid ~ $ var=
dustin@euclid ~ $ test $var; echo $?
1
dustin@euclid ~ $ test "$var"; echo $?
1

(I don't mind either approach, but you may want to trim the comment -- it's helpful for review, not necessarily helpful for someone reading later)

@@ +116,5 @@
>  
> +# support multiple, space delimited, config files
> +config_cmds=""
> +for cfg in $MOZHARNESS_CONFIG; do
> +  echo PRINTING $cfg

debug echo

Comment 4

[Morgan Phillips [:mrrrgn]]

Attachment: multiconfig.diff

Comment 5

[Morgan Phillips [:mrrrgn]]

Attachment: multiconfig.diff

Comment 6

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/a08fecd24405

Comment 7

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/a08fecd24405