From 093eceb5663e14931791bc13fd5d365a9dba3c0e Mon Sep 17 00:00:00 2001 From: Greg Arndt Date: Wed, 26 Nov 2014 10:11:37 -0800 Subject: [PATCH] Bug 1095480 - enable mochitests for linux64 mulet r=lightsofapollo,mshal --HG-- extra : rebase_source : b804d42570094df4232011fb5ecc4cb7568e5562 extra : source : 320c6c008bddfb3993c7724ee6d1babcee5591de --- .../mozharness/taskcluster_linux_config.py | 42 +++++++++++++++++++ testing/docker/base/VERSION | 2 +- testing/docker/base/system-setup.sh | 4 ++ testing/docker/builder/Dockerfile | 2 +- testing/docker/builder/VERSION | 2 +- .../docker/builder/bin/build-mulet-linux.sh | 1 + testing/docker/tester/Dockerfile | 6 ++- testing/docker/tester/VERSION | 2 +- .../mozharness_configs/linux_mulet_config.py | 6 +++ .../tasks/tests/mulet_mochitests.yml | 2 +- 10 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 testing/config/mozharness/taskcluster_linux_config.py create mode 100644 testing/docker/tester/mozharness_configs/linux_mulet_config.py diff --git a/testing/config/mozharness/taskcluster_linux_config.py b/testing/config/mozharness/taskcluster_linux_config.py new file mode 100644 index 000000000000..0860181b4c22 --- /dev/null +++ b/testing/config/mozharness/taskcluster_linux_config.py @@ -0,0 +1,42 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "reftest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s" + ], + "mochitest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s", + "--certificate-path=tests/certs", "--autorun", "--close-when-done", + "--console-level=INFO", "--setpref=webgl.force-enabled=true", + "--quiet", "--log-raw=%(raw_log_file)s" + ], + "webapprt_options": [ + "--app=%(app_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s", + "--certificate-path=tests/certs", "--autorun", "--close-when-done", + "--console-level=INFO", "--testing-modules-dir=tests/modules", + "--quiet" + ], + "xpcshell_options": [ + "--symbols-path=%(symbols_path)s", + "--test-plugin-path=%(test_plugin_path)s" + ], + "cppunittest_options": [ + "--symbols-path=%(symbols_path)s", + "--xre-path=%(abs_app_dir)s" + ], + "jittest_options": [ + "tests/bin/js", + "--no-slow", + "--no-progress", + "--tinderbox", + "--tbpl" + ], + "mozbase_options": [ + "-b", "%(binary_path)s" + ], +} diff --git a/testing/docker/base/VERSION b/testing/docker/base/VERSION index bcab45af15a0..81340c7e72d5 100644 --- a/testing/docker/base/VERSION +++ b/testing/docker/base/VERSION @@ -1 +1 @@ -0.0.3 +0.0.4 diff --git a/testing/docker/base/system-setup.sh b/testing/docker/base/system-setup.sh index a2e2c0cad32f..38b4942b2ea4 100755 --- a/testing/docker/base/system-setup.sh +++ b/testing/docker/base/system-setup.sh @@ -71,6 +71,7 @@ yum install -y \ unzip \ uuid \ xorg-x11-server-Xvfb \ + xorg-x11-server-utils \ tcl \ tk \ ; @@ -130,6 +131,9 @@ rpm -ih $base_url/gcc473_0moz1-4.7.3-0moz1.x86_64.rpm # distributing them to workers is wasteful. yum clean all +### Generate machine uuid file +dbus-uuidgen --ensure=/etc/machine-id + # Remove the setup.sh setup, we don't really need this script anymore, deleting # it keeps the image as clean as possible. rm $0; echo "Deleted $0"; diff --git a/testing/docker/builder/Dockerfile b/testing/docker/builder/Dockerfile index fda7838aeca5..f0cc8163dfb3 100644 --- a/testing/docker/builder/Dockerfile +++ b/testing/docker/builder/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/mozilla/base:0.0.3 +FROM quay.io/mozilla/base:0.0.4 MAINTAINER Jonas Finnemann Jensen ENV PATH $PATH:/home/worker/bin/ diff --git a/testing/docker/builder/VERSION b/testing/docker/builder/VERSION index 44517d5188eb..fe04e7f676f5 100644 --- a/testing/docker/builder/VERSION +++ b/testing/docker/builder/VERSION @@ -1 +1 @@ -0.0.19 +0.0.20 diff --git a/testing/docker/builder/bin/build-mulet-linux.sh b/testing/docker/builder/bin/build-mulet-linux.sh index cedeac8dd248..22f2f298bcdd 100755 --- a/testing/docker/builder/bin/build-mulet-linux.sh +++ b/testing/docker/builder/bin/build-mulet-linux.sh @@ -43,5 +43,6 @@ mkdir -p /home/worker/artifacts/ mv *.linux-x86_64.tar.bz2 /home/worker/artifacts/target.linux-x86_64.tar.bz2 mv *.linux-x86_64.json /home/worker/artifacts/target.linux-x86_64.json mv *.tests.zip /home/worker/artifacts/target.tests.zip +mv jsshell-linux-x86_64.zip /home/worker/artifacts/jsshell-linux-x86_64.zip ################################### build.sh ################################### diff --git a/testing/docker/tester/Dockerfile b/testing/docker/tester/Dockerfile index 434f91009210..14c1f9263e53 100644 --- a/testing/docker/tester/Dockerfile +++ b/testing/docker/tester/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/mozilla/base:0.0.2 +FROM quay.io/mozilla/base:0.0.4 MAINTAINER Jonas Finnemann Jensen # Add utilities and configuration @@ -8,13 +8,15 @@ COPY dot-config /home/worker/.config COPY dot-pulse /home/worker/.pulse COPY emulator_automation_config.py /home/worker/emulator_automation_config.py COPY bin /home/worker/bin +COPY mozharness_configs /home/worker/mozharness_configs # Run test setup script USER root RUN ["/tmp/test-setup.sh"] ENV PATH $PATH:/home/worker/bin -USER worker +# TODO Re-enable worker when bug 1093833 lands +#USER worker # Set a default command useful for debugging CMD ["/bin/bash", "--login"] diff --git a/testing/docker/tester/VERSION b/testing/docker/tester/VERSION index 81340c7e72d5..bbdeab6222cb 100644 --- a/testing/docker/tester/VERSION +++ b/testing/docker/tester/VERSION @@ -1 +1 @@ -0.0.4 +0.0.5 diff --git a/testing/docker/tester/mozharness_configs/linux_mulet_config.py b/testing/docker/tester/mozharness_configs/linux_mulet_config.py new file mode 100644 index 000000000000..78bdec47086e --- /dev/null +++ b/testing/docker/tester/mozharness_configs/linux_mulet_config.py @@ -0,0 +1,6 @@ +config = { + # Override buildbot specific exes for python and virtualenv + "exes": {}, + # Use taskcluster specified config until Bug 1099057 lands + "in_tree_config": "config/mozharness/taskcluster_linux_config.py" +} diff --git a/testing/taskcluster/tasks/tests/mulet_mochitests.yml b/testing/taskcluster/tasks/tests/mulet_mochitests.yml index 313695e21a40..755fa33c7926 100644 --- a/testing/taskcluster/tasks/tests/mulet_mochitests.yml +++ b/testing/taskcluster/tasks/tests/mulet_mochitests.yml @@ -22,7 +22,7 @@ task: python ./mozharness/scripts/desktop_unittest.py --no-read-buildbot-config --config-file ./mozharness/configs/unittests/linux_unittest.py - --config-file ./mozharness_tmp/mulet_suite_options_config.py + --config-file ./mozharness_configs/linux_mulet_config.py --installer-url {{build_url}} --test-url {{tests_url}} --download-symbols ondemand