Before, test.sh (duplicated between the desktop-test and
desktop1604-test images) was dropping permissions, creating a workspace,
and executing test-linux.sh. This is functionality now provided by
run-task.
So, convert the test tasks to use run-task.
One thing run-task isn't doing is created the workspace. So this
functionality has been moved into test-ubuntu1204.sh and
test-ubuntu1604.sh.
Since the test.sh files are no longer used after this change, they have
been deleted. The desktop-test image no longer has any files in the
bin/ directory, so the Dockerfile entry to copy those files has been
removed.
MozReview-Commit-ID: 1BiskrMs6xW
--HG--
extra : rebase_source : 264efc9b30e62927dece848b9b1eab7542cf2cba
extra : source : 8335aa40265b1d17421d06d9e9a180eb8419fe47
extra : histedit_source : a5ae54a810718d446ded8bab510e6cd605562737
Previously, the code performed a "hidden" assignment to
worker['command'] when creating the "command" variable. This
tripped me up when reading the code because relying on variable
references isn't exactly obvious.
We now defer the assignment to worker['command'] until the end,
making the code a little easier to understand.
MozReview-Commit-ID: 23qH4Z3RKY4
--HG--
extra : rebase_source : 52605d7091c73fc47da753bbb298b242f7a3a2ae
extra : histedit_source : 78eb25f963c940956c65fefb2509669a59f78160
Before, we `curl`d these files at task run time. Why, I'm not sure.
Probably the easiest way to do things before we could add files outside
the directory of the Dockerfile to the image build context. Since that
is no longer a restriction, we just include the file as part of the
built image.
This does mean we rebuild the Docker image if the scripts change. I'm
fine with that.
It's worth noting that both test.sh files look very similar. I
anticipate consolidation in the future...
MozReview-Commit-ID: 48dinmxy6G0
--HG--
extra : rebase_source : 418f11ada7aaf16f3a4c3522f014b42690d44295
extra : histedit_source : df27ba0c3bbff1721d8b278ff65c127e6332cc28
Without this, we potentially mix unicode literals and str and have
implicit type coercion, leading to UnicodeDecodeError or some such.
Oh, the joys of Python.
MozReview-Commit-ID: IeXRjs5Fnj7
--HG--
extra : rebase_source : cba8b13ae845dfaf41a718ba8e60061b8bcffccd
And with indentation so it is easier for humans to read.
MozReview-Commit-ID: Kkd6vmfLNUf
--HG--
extra : rebase_source : 9f2b4ad2223f361dd6dd1ec9cdda71bd5a8560e3
The install-mercurial.sh script takes care of installing a global hgrc.
If we want Mercurial settings, that's where they should be defined.
A number of Docker images had redundantly maintained versions of
/home/worker/.hgrc. We've deleted some instances of these hgrc files
because I thought they were cargo culted. It turns out that the config
was added to support one-click loaners (see bug 1250904).
Since there is little harm in enabling extensions globally, we just do
that in the shared install-mercurial.sh script and do away with the
custom hgrc.
It's worth noting that the CA path defined in the custom hgrc is not
needed because the Mercurial package installed by install-mercurial.sh
configures this correctly.
MozReview-Commit-ID: bk4ek99X4z
--HG--
extra : rebase_source : 6ae90f698af05a8814cdb08cf672db470a5a227a
We're giving the same treatment to the Ubuntu 12.04 test image that we
did to the Ubuntu 16.04 image in bug 1293686.
As of this commit, the image can be fully regenerated from changes in
tree: no Docker Hub pushes necessary.
A downside is would could get bit by lack of determinism in image
building. But that's already a problem.
Since the ubuntu1204-test and ubuntu1204-test-upd images are no longer
used, they have been deleted.
MozReview-Commit-ID: 55DwqHOmVM5
--HG--
extra : rebase_source : 222bb9ec096705f1be3f8ab7309a24ac640683f3
In preparation for deleting this image.
MozReview-Commit-ID: Iu9vifGgGE0
--HG--
rename : testing/docker/ubuntu1204-test/system-setup.sh => testing/docker/recipes/ubuntu1204-test-system-setup.sh
extra : rebase_source : a9fb795382766b3d9862b3fd211e97a6281f2c7f
